Skip to content

Commit a1ddfc7

Browse files
Merge pull request #150 from TheDragonCode/4.x
Added Laravel 11 support
2 parents 6d3142c + f33675d commit a1ddfc7

File tree

6 files changed

+21
-16
lines changed

6 files changed

+21
-16
lines changed

.github/workflows/phpunit.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: true
1111
matrix:
1212
php: [ "8.0", "8.1", "8.2", "8.3" ]
13-
laravel: [ "7.0", "8.0", "9.0", "10.0" ]
13+
laravel: [ "7.0", "8.0", "9.0", "10.0", "11.0" ]
1414
exclude:
1515
- laravel: "7.0"
1616
php: "8.1"
@@ -30,6 +30,12 @@ jobs:
3030
- laravel: "10.0"
3131
php: "8.0"
3232

33+
- laravel: "11.0"
34+
php: "8.0"
35+
36+
- laravel: "11.0"
37+
php: "8.1"
38+
3339
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
3440

3541
steps:
@@ -41,7 +47,7 @@ jobs:
4147
with:
4248
php-version: ${{ matrix.php }}
4349
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
44-
coverage: none
50+
coverage: xdebug
4551

4652
- name: Install dependencies
4753
run: composer require --dev laravel/framework:^${{ matrix.laravel }}

composer.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@
4545
"dragon-code/laravel-support": "^3.5",
4646
"dragon-code/simple-dto": "^2.5.1",
4747
"dragon-code/support": "^6.6",
48-
"illuminate/console": "^7.30.6 || ^8.75 || ^9.0 || ^10.0",
49-
"illuminate/container": "^7.30.6 || ^8.75 || ^9.0 || ^10.0",
50-
"illuminate/database": "^7.30.6 || ^8.75 || ^9.0 || ^10.0",
51-
"illuminate/support": "^7.30.6 || ^8.75 || ^9.0 || ^10.0",
52-
"symfony/console": "^5.3 || ^6.0"
48+
"illuminate/console": "^7.30.6 || ^8.75 || ^9.0 || ^10.0 || ^11.0",
49+
"illuminate/container": "^7.30.6 || ^8.75 || ^9.0 || ^10.0 || ^11.0",
50+
"illuminate/database": "^7.30.6 || ^8.75 || ^9.0 || ^10.0 || ^11.0",
51+
"illuminate/support": "^7.30.6 || ^8.75 || ^9.0 || ^10.0 || ^11.0",
52+
"symfony/console": "^5.3 || ^6.0 || ^7.0"
5353
},
5454
"require-dev": {
5555
"mockery/mockery": "^1.3.1",
56-
"nesbot/carbon": "^2.62.1",
57-
"orchestra/testbench": "^5.20 || ^6.25 || ^7.9 || ^8.0",
58-
"phpunit/phpunit": "^9.6",
56+
"nesbot/carbon": "^2.62.1 || ^3.0",
57+
"orchestra/testbench": "^5.20 || ^6.25 || ^7.9 || ^8.0 || ^9.0",
58+
"phpunit/phpunit": "^9.6 || ^10.0",
5959
"ramsey/uuid": "^3.7 || ^4.0"
6060
},
6161
"conflict": {

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
"url": "git+ssh://git@github.com/TheDragonCode/laravel-actions.git"
1818
},
1919
"devDependencies": {
20-
"@vuepress/plugin-theme-data": "2.0.0-beta.54",
20+
"@vuepress/plugin-theme-data": "2.0.0-rc.8",
2121
"@vueuse/core": "^7.5.5",
2222
"dotenv": "^15.0.0",
23-
"vuepress": "2.0.0-beta.54"
23+
"vuepress": "2.0.0-rc.8"
2424
},
2525
"engines": {
2626
"node": ">=16.16"

phpunit.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
bootstrap="vendor/autoload.php"
88
colors="true"
99
convertErrorsToExceptions="true"
10-
convertNoticesToExceptions="true"
11-
convertWarningsToExceptions="true"
10+
convertNoticesToExceptions="false"
11+
convertWarningsToExceptions="false"
1212
processIsolation="false"
1313
stopOnError="false"
1414
stopOnFailure="false"

tests/Concerns/Database.php

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ protected function setDatabase($app): void
2424

2525
protected function freshDatabase(): void
2626
{
27-
$this->refreshDatabase();
2827
$this->loadMigrations();
2928

3029
$this->artisan('migrate')->run();

tests/TestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected function getPackageProviders($app): array
3535
return [ServiceProvider::class];
3636
}
3737

38-
protected function getEnvironmentSetUp($app)
38+
protected function getEnvironmentSetUp($app): void
3939
{
4040
parent::getEnvironmentSetUp($app);
4141

0 commit comments

Comments
 (0)