Laravel 10.x Compatibility (#19)

Co-authored-by: Michael Dyrynda <[email protected]>
michaeldyrynda · Feb 16, 2023 · 044ea53 · 044ea53
1 parent 46356cb
commit 044ea53
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 39 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -11,13 +11,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1,8.0, 7.4, 7.3]
-        laravel: [^8.12, ^9.0]
-        exclude:
-          - php: 7.3
-            laravel: '^9.0'
-          - php: 7.4
-            laravel: '^9.0'
+        php: [8.2,8.1]
+        laravel: [10.0]
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }}
 

diff --git a/composer.json b/composer.json
@@ -15,22 +15,22 @@
         }
     ],
     "require": {
-        "php": "^7.3|^8.0",
-        "illuminate/support": "^8.0|^9.0",
-        "illuminate/console": "^8.0|^9.0",
-        "illuminate/database": "^8.0|^9.0",
-        "illuminate/auth": "^8.0|^9.0",
-        "illuminate/notifications": "^8.0|^9.0"
+        "php": "^8.1",
+        "illuminate/support": "^10.0",
+        "illuminate/console": "^10.0",
+        "illuminate/database": "^10.0",
+        "illuminate/auth": "^10.0",
+        "illuminate/notifications": "^10.0"
     },
     "autoload": {
         "psr-4": {
             "Dyrynda\\Artisan\\": "src/"
         }
     },
     "require-dev": {
-        "mockery/mockery": "^1.4.2",
-        "phpunit/phpunit": "^9.3.3",
-        "orchestra/testbench": "^6.0|^7.0"
+        "mockery/mockery": "^1.4.4",
+        "phpunit/phpunit": "^9.6.0 || ^10.0.7",
+        "orchestra/testbench": "^8.0"
     },
     "autoload-dev": {
         "psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,25 +1,16 @@
 <?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">
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="MAIL_DRIVER" value="null"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Package Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="MAIL_MAILER" value="array"/>
+  </php>
 </phpunit>