Merge pull request #24 from Westie/laravel-11

Update to allow for Laravel 11 and Laravel JSON:API v5 support
swisnl · Jan 31, 2025 · ae7d22c · ae7d22c
2 parents bca1883 + 3c19445
commit ae7d22c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ composer.lock
 vendor
 phpunit.xml
 .phpunit.result.cache
+.phpunit.cache/test-results
diff --git a/composer.json b/composer.json
@@ -45,12 +45,12 @@
     },
     "require-dev": {
         "ext-json": "*",
-        "laravel-json-api/laravel": "^2.0|^3.0|^4.0",
+        "laravel-json-api/laravel": "^2.0|^3.0|^4.0|^5.0",
         "laravel-json-api/non-eloquent": "^2.0|^3.0|^v4.0",
         "laravel/pint": "^1.20",
         "nesbot/carbon": "^2.63|^3.0",
         "orchestra/testbench": "^6.25|^7.21|^8.0|^9.0",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.5"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="vendor/autoload.php"
          backupGlobals="false"
-         backupStaticAttributes="false"
+         backupStaticProperties="false"
          colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
+         cacheDirectory=".phpunit.cache"
          stopOnFailure="false">
     <testsuites>
         <testsuite name="Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
     <php>
         <server name="APP_ENV" value="testing"/>
         <server name="BCRYPT_ROUNDS" value="4"/>