Laravel 11 and 12 and PHP 8.4 (#3)

willpower232 · daniel-cannon · web-flow · commit 1d87eddfbdd4 · 2025-07-07T15:36:25.000+01:00
* 🔧 update to phpunit 10

* 🔧 support laravel 11

* Update PHP and Laravel support matrix, bump dependencies in composer.json

* Downgrade PHP requirement to ^8.3 in composer.json

* Expand orchestra/testbench dependency to allow ^10.0 &amp; update constructor type hint in Response.php

* Expand phpunit dependency to allow ^11.0 in composer.json

---------

Co-authored-by: Daniel Cannon &lt;Daniel@synergitech.co.uk&gt;
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,14 +8,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        laravel: [8, 9, 10]
-        php: ["8.0", 8.1, 8.2, 8.3]
-        exclude:
-          - php: "8.0"
-            laravel: 10
+        laravel: [11, 12]
+        php: [8.4, 8.3]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: test against Laravel ${{ matrix.laravel }} on PHP ${{ matrix.php }}
         run: docker build . --build-arg PHP_VERSION=${{ matrix.php }} --build-arg LARAVEL=${{ matrix.laravel }}
diff --git a/composer.json b/composer.json
@@ -7,16 +7,16 @@
         "salesforce"
     ],
     "require": {
-        "php": "^8.0",
-        "illuminate/collections": "^8.0 || ^9.0 || ^10.0",
-        "illuminate/support": "^8.0 || ^9.0 || ^10.0",
+        "php": "^8.3",
+        "illuminate/collections": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
+        "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
         "omniphx/forrest": "^2.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.0 || ^7.0 || ^8.0",
+        "orchestra/testbench": "^8.0 || ^9.0 || ^10.0",
         "php-parallel-lint/php-parallel-lint": "^1.3",
         "phpstan/phpstan": "^1",
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^10.0 || ^11.0",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {
@@ -40,4 +40,4 @@
             "phpstan analyse --level 9 src"
         ]
     }
-}
+}
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,27 +1,27 @@
-<?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"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="alert-package-tests">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage processUncoveredFiles="true">
-        <report>
-            <html outputDirectory="build/coverage"/>
-            <text outputFile="php://stdout"/>
-        </report>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
-</phpunit>
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticProperties="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         processIsolation="false"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         stopOnFailure="false"
+>
+    <testsuites>
+        <testsuite name="alert-package-tests">
+            <directory suffix="Test.php">./tests</directory>
+        </testsuite>
+    </testsuites>
+    <coverage>
+        <report>
+            <html outputDirectory="build/coverage"/>
+            <text outputFile="php://stdout"/>
+        </report>
+    </coverage>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
+</phpunit>
diff --git a/src/Models/Response.php b/src/Models/Response.php
@@ -23,7 +23,7 @@ class Response
     /**
      * @param string|array<string, mixed> $rawResponse
      */
-    public function __construct(protected string $query, string|array $rawResponse, int $currentPage = null)
+    public function __construct(protected string $query, string|array $rawResponse, ?int $currentPage = null)
     {
         if (is_string($rawResponse)) {
             throw new InvalidResponseException('String response received - expected an array');

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class Response`
`23`	`23`	`/**`
`24`	`24`	`* @param string\|array<string, mixed> $rawResponse`
`25`	`25`	`*/`
`26`		`- public function __construct(protected string $query, string\|array $rawResponse, int $currentPage = null)`
	`26`	`+ public function __construct(protected string $query, string\|array $rawResponse, ?int $currentPage = null)`
`27`	`27`	`{`
`28`	`28`	`if (is_string($rawResponse)) {`
`29`	`29`	`throw new InvalidResponseException('String response received - expected an array');`