Merge pull request #19 from TheDragonCode/1.x

Added Laravel 11 support
TheDragonCode · Mar 13, 2024 · dfed4fd · dfed4fd
2 parents 12b773c + 5332ece
commit dfed4fd
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -9,14 +9,25 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "8.0", "8.1", "8.2" ]
-                laravel: [ "8.0", "9.0", "10.0" ]
-                dragon: [ "5.8", "6.0" ]
+                php: [ "8.0", "8.1", "8.2", "8.3" ]
+                laravel: [ "8.0", "9.0", "10.0", "11.0" ]
                 exclude:
+                    -   laravel: "8.0"
+                        php: "8.3"
+
+                    -   laravel: "9.0"
+                        php: "8.3"
+
                     -   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 }}, Dragon ${{ matrix.dragon }}
+        name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
 
         steps:
             -   name: Checkout code
@@ -27,10 +38,10 @@ 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 }} dragon-code/support:^${{ matrix.dragon }}
+                run: composer require --dev laravel/framework:^${{ matrix.laravel }}
 
             -   name: Execute tests
                 run: sudo vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -44,16 +44,16 @@
         "php": "^8.0",
         "doctrine/dbal": "^3.3",
         "dragon-code/support": "^5.8 || ^6.0",
-        "illuminate/contracts": "^8.37 || ^9.0 || ^10.0",
-        "illuminate/database": "^8.37 || ^9.0 || ^10.0",
-        "illuminate/http": "^8.37 || ^9.0 || ^10.0",
-        "illuminate/routing": "^8.37 || ^9.0 || ^10.0",
-        "illuminate/support": "^8.37 || ^9.0 || ^10.0"
+        "illuminate/contracts": "^8.37 || ^9.0 || ^10.0 || ^11.0",
+        "illuminate/database": "^8.37 || ^9.0 || ^10.0 || ^11.0",
+        "illuminate/http": "^8.37 || ^9.0 || ^10.0 || ^11.0",
+        "illuminate/routing": "^8.37 || ^9.0 || ^10.0 || ^11.0",
+        "illuminate/support": "^8.37 || ^9.0 || ^10.0 || ^11.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.5",
-        "orchestra/testbench": "^6.0 || ^7.0 || ^8.0",
-        "phpunit/phpunit": "^9.6"
+        "orchestra/testbench": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^9.6 || ^10.0"
     },
     "minimum-stability": "stable",
     "prefer-stable": true,

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"