Merge pull request #150 from TheDragonCode/4.x

Added Laravel 11 support
TheDragonCode · Mar 14, 2024 · a1ddfc7 · a1ddfc7
2 parents 6d3142c + f33675d
commit a1ddfc7
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -10,7 +10,7 @@ jobs:
             fail-fast: true
             matrix:
                 php: [ "8.0", "8.1", "8.2", "8.3" ]
-                laravel: [ "7.0", "8.0", "9.0", "10.0" ]
+                laravel: [ "7.0", "8.0", "9.0", "10.0", "11.0" ]
                 exclude:
                     -   laravel: "7.0"
                         php: "8.1"
@@ -30,6 +30,12 @@ jobs:
                     -   laravel: "10.0"
                         php: "8.0"
 
+                    -   laravel: "11.0"
+                        php: "8.0"
+
+                    -   laravel: "11.0"
+                        php: "8.1"
+
         name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
 
         steps:
@@ -41,7 +47,7 @@ jobs:
                 with:
                     php-version: ${{ matrix.php }}
                     extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
-                    coverage: none
+                    coverage: xdebug
 
             -   name: Install dependencies
                 run: composer require --dev laravel/framework:^${{ matrix.laravel }}

diff --git a/composer.json b/composer.json
@@ -45,17 +45,17 @@
         "dragon-code/laravel-support": "^3.5",
         "dragon-code/simple-dto": "^2.5.1",
         "dragon-code/support": "^6.6",
-        "illuminate/console": "^7.30.6 || ^8.75 || ^9.0 || ^10.0",
-        "illuminate/container": "^7.30.6 || ^8.75 || ^9.0 || ^10.0",
-        "illuminate/database": "^7.30.6 || ^8.75 || ^9.0 || ^10.0",
-        "illuminate/support": "^7.30.6 || ^8.75 || ^9.0 || ^10.0",
-        "symfony/console": "^5.3 || ^6.0"
+        "illuminate/console": "^7.30.6 || ^8.75 || ^9.0 || ^10.0 || ^11.0",
+        "illuminate/container": "^7.30.6 || ^8.75 || ^9.0 || ^10.0 || ^11.0",
+        "illuminate/database": "^7.30.6 || ^8.75 || ^9.0 || ^10.0 || ^11.0",
+        "illuminate/support": "^7.30.6 || ^8.75 || ^9.0 || ^10.0 || ^11.0",
+        "symfony/console": "^5.3 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.1",
-        "nesbot/carbon": "^2.62.1",
-        "orchestra/testbench": "^5.20 || ^6.25 || ^7.9 || ^8.0",
-        "phpunit/phpunit": "^9.6",
+        "nesbot/carbon": "^2.62.1 || ^3.0",
+        "orchestra/testbench": "^5.20 || ^6.25 || ^7.9 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^9.6 || ^10.0",
         "ramsey/uuid": "^3.7 || ^4.0"
     },
     "conflict": {

diff --git a/package.json b/package.json
@@ -17,10 +17,10 @@
         "url": "git+ssh://[email protected]/TheDragonCode/laravel-actions.git"
     },
     "devDependencies": {
-        "@vuepress/plugin-theme-data": "2.0.0-beta.54",
+        "@vuepress/plugin-theme-data": "2.0.0-rc.8",
         "@vueuse/core": "^7.5.5",
         "dotenv": "^15.0.0",
-        "vuepress": "2.0.0-beta.54"
+        "vuepress": "2.0.0-rc.8"
     },
     "engines": {
         "node": ">=16.16"

diff --git a/phpunit.xml b/phpunit.xml
@@ -7,8 +7,8 @@
         bootstrap="vendor/autoload.php"
         colors="true"
         convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
+        convertNoticesToExceptions="false"
+        convertWarningsToExceptions="false"
         processIsolation="false"
         stopOnError="false"
         stopOnFailure="false"

diff --git a/tests/Concerns/Database.php b/tests/Concerns/Database.php
@@ -24,7 +24,6 @@ protected function setDatabase($app): void
 
     protected function freshDatabase(): void
     {
-        $this->refreshDatabase();
         $this->loadMigrations();
 
         $this->artisan('migrate')->run();

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -35,7 +35,7 @@ protected function getPackageProviders($app): array
         return [ServiceProvider::class];
     }
 
-    protected function getEnvironmentSetUp($app)
+    protected function getEnvironmentSetUp($app): void
     {
         parent::getEnvironmentSetUp($app);