Merge pull request #61 from barryvdh/feat-laravel10

Support Laravel 10
barryvdh · Feb 5, 2023 · d98ba82 · d98ba82
2 parents ff2745f + 2e1bdd0
commit d98ba82
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 43 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -19,23 +19,12 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.0, 7.4, 7.3, 7.2]
-        laravel: [8.*, 7.*, 6.*]
+        php: [8.2, 8.1, 8.0]
+        laravel: [9.*, 10.*]
         dependency-version: [prefer-lowest, prefer-stable]
-        include:
-          - laravel: 9.*
-            php: 8.1
-            dependency-version: prefer-stable
-          - laravel: 9.*
-            php: 8.0
-            dependency-version: prefer-lowest
         exclude:
-          - laravel: 8.*
-            php: 7.2
-          - php: 7.4
-            dependency-version: prefer-lowest
-          - php: 8.0
-            dependency-version: prefer-lowest
+          - laravel: 10.*
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

diff --git a/composer.json b/composer.json
@@ -10,14 +10,14 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
-        "illuminate/support": "^6|^7|^8|^9",
-        "symfony/console": "^4|^5|^6",
-        "symfony/http-kernel": "^4|^5|^6",
+        "php": "^8",
+        "illuminate/support": "^9|^10",
+        "symfony/console": "^6",
+        "symfony/http-kernel": "^6",
         "barryvdh/laravel-stack-middleware": "^1.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^4|^5|^6|^7"
+        "orchestra/testbench": "^7|^8"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,24 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
->
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>