Merge pull request #52 from barryvdh/feat-laravel-10

Allow Laravel 10
barryvdh · Feb 5, 2023 · 8732863 · 8732863
2 parents 52b3348 + 8cae6e5
commit 8732863
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 43 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,15 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -19,23 +19,13 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.2, 8.1, 8.0, 7.4, 7.3]
-        laravel: [9.*]
+        php: [8.2, 8.1, 8.0]
+        laravel: [10.*, 9.*]
         dependency-version: [prefer-lowest, prefer-stable]
         exclude:
           - php: 8.0
-            dependency-version: prefer-lowest
-          - php: 7.4
-            laravel: 9.*
-          - php: 7.3
-            laravel: 9.*
-        include:
-          - php: 7.2
-            laravel: 6.*
-          - php: 7.3
-            laravel: 7.*
-          - php: 7.4
-            laravel: 8.*
+            laravel: 10.*
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

diff --git a/composer.json b/composer.json
@@ -10,12 +10,12 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8",
-        "illuminate/support": "^6|^7|^8|^9",
-        "symfony/form": "^4|^5|^6",
-        "symfony/validator": "^4|^5|^6",
-        "symfony/twig-bridge": "^4|^5|^6",
-        "twig/twig": "^2.13|^3.3.8"
+        "php": "^8",
+        "illuminate/support": "^9|^10",
+        "symfony/form": "^6",
+        "symfony/validator": "^6",
+        "symfony/twig-bridge": "^6",
+        "twig/twig": "^3.3.8"
     },
     "autoload": {
         "psr-4": {
@@ -39,7 +39,7 @@
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^2.3",
-        "orchestra/testbench": "^3|^4|^5|^6|^7"
+        "orchestra/testbench": "^7|^8"
     },
     "scripts": {
         "test": "phpunit",

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="Cors Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
+<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="Cors Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>