Merge pull request #20 from msztorc/laravel11

Laravel 11
msztorc · Mar 18, 2024 · 5e61543 · 5e61543
2 parents 47e1e9b + 98905b0
commit 5e61543
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 38 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,10 +9,12 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ubuntu-latest]
-                php: [8.2, 8.1, 8.0, 7.4, 7.3]
-                laravel: [9.*, 8.*, 7.*, 6.*, 10.*]
+                php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3]
+                laravel: [6.*, 7.*, 8.*, 9.*, 10.*, 11.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
+                    - laravel: 11.*
+                      testbench: 9.*
                     - laravel: 10.*
                       testbench: 8.*
                     - laravel: 9.*
@@ -24,27 +26,42 @@ jobs:
                     - laravel: 6.*
                       testbench: ^4.17
                 exclude:
+                    - laravel: 11.*
+                      php: 8.1
+                    - laravel: 11.*
+                      php: 8.0
+                    - laravel: 11.*
+                      php: 7.4
+                    - laravel: 11.*
+                      php: 7.3
                     - laravel: 10.*
                       php: 8.0
                     - laravel: 10.*
                       php: 7.4
                     - laravel: 10.*
                       php: 7.3
-                    - laravel: 6.*
-                      php: 8.1
-                    - laravel: 6.*
+                    - laravel: 9.*
+                      php: 7.3
+                    - laravel: 9.*
+                      php: 7.4
+                    - laravel: 8.*
                       php: 8.2
+                      dependency-version: prefer-lowest
+                    - laravel: 8.*
+                      php: 8.3
+                      dependency-version: prefer-lowest
                     - laravel: 7.*
                       php: 8.1
                     - laravel: 7.*
                       php: 8.2
-                    - laravel: 8.*
+                    - laravel: 7.*
+                      php: 8.3
+                    - laravel: 6.*
+                      php: 8.1
+                    - laravel: 6.*
                       php: 8.2
-                      dependency-version: prefer-lowest
-                    - laravel: 9.*
-                      php: 7.3
-                    - laravel: 9.*
-                      php: 7.4
+                    - laravel: 6.*
+                      php: 8.3
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 

diff --git a/composer.json b/composer.json
@@ -21,8 +21,8 @@
         }
     ],
     "require": {
-        "php": "^7.3|^7.4|^8.0|^8.1|^8.2",
-        "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
+        "php": "^7.3 || ^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3",
+        "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
         "ext-json": "*"
     },
     "autoload": {
@@ -54,7 +54,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2 || ^3",
-        "orchestra/testbench": "^4.0|^5.0|^6.0||^7.0|^8.0",
-        "phpunit/phpunit": "^8.0 || ^9.0"
+        "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0 || ^11.0"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,34 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="vendor/autoload.php"
          backupGlobals="false"
-         backupStaticAttributes="false"
          colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false">
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <ini name="xdebug.mode" value="coverage" />
-        <env name="XDEBUG_MODE" value="coverage" />
-    </php>
     <testsuites>
         <testsuite name="Test Suite">
-            <directory>tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
 </phpunit>