Merge pull request #67 from cybex-gmbh/feature/laravel-10-compatibility

[2.x] Add Laravel 10 compatibility
cybex-gmbh · Feb 23, 2023 · 612c9dd · 612c9dd
2 parents 513ba5b + 04e7546
commit 612c9dd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -22,8 +22,8 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ 8.0, 8.1 ]
-                laravel: [ 8.*, 9.* ]
+                php: [ 8.1, 8.2 ]
+                laravel: [ 9.*, 10.* ]
                 dependency-version: [ prefer-stable ]
 
         name: PHP ${{ matrix.php }} with Laravel ${{ matrix.laravel }} (${{ matrix.dependency-version }})

diff --git a/composer.json b/composer.json
@@ -21,20 +21,20 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
+        "ext-pdo": "*",
         "ext-sodium": "*",
         "guzzlehttp/guzzle": "^7.4",
-        "illuminate/support": "^8.0|^9.0",
-        "laravel/framework": "^8.0|^9.0",
-        "laravel/sanctum": "^2.4",
-        "ext-pdo": "*"
+        "illuminate/support": "^9.0|^10.0",
+        "laravel/framework": "^9.0|^10.0",
+        "laravel/sanctum": "^3.2"
     },
     "require-dev": {
-        "laravel/sail": "^1.15",
-        "orchestra/testbench": "^6.23|^7.0",
+        "laravel/sail": "^1.18",
+        "orchestra/testbench": "^7.0|^8.0",
         "phpunit/phpunit": "^9.5"
     },
     "autoload": {

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