Merge pull request #79 from rawilk/Laravel-12.x

rawilk · Feb 25, 2025 · c02026e · c02026e
2 parents ee2556e + f158feb
commit c02026e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -18,14 +18,18 @@ jobs:
             fail-fast: true
             matrix:
                 php: [8.3, 8.2, 8.1]
-                laravel: [11.*, 10.*]
+                laravel: [12.*, 11.*, 10.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
+                    -   laravel: 12.*
+                        testbench: 10.*
                     -   laravel: 10.*
                         testbench: 8.*
                     -   laravel: 11.*
                         testbench: 9.*
                 exclude:
+                    -   laravel: 12.*
+                        php: 8.1
                     -   laravel: 11.*
                         php: 8.1
 

diff --git a/composer.json b/composer.json
@@ -20,15 +20,15 @@
     ],
     "require": {
         "php": "^8.1|^8.2|^8.3",
-        "illuminate/database": "^10.0|^11.0",
-        "illuminate/support": "^10.0|^11.0",
+        "illuminate/database": "^10.0|^11.0|^12.0",
+        "illuminate/support": "^10.0|^11.0|^12.0",
         "spatie/laravel-package-tools": "^1.13"
     },
     "require-dev": {
         "laravel/pint": "^1.2",
-        "orchestra/testbench": "^8.0|^9.0",
-        "pestphp/pest": "^2.10",
-        "pestphp/pest-plugin-laravel": "^2.2",
+        "orchestra/testbench": "^8.0|^9.0|^10.0",
+        "pestphp/pest": "^2.10|^3.0",
+        "pestphp/pest-plugin-laravel": "^2.2|^3.0",
         "spatie/laravel-ray": "^1.31"
     },
     "autoload": {

diff --git a/tests/Unit/ValueSerializers/ValueSerializerTest.php b/tests/Unit/ValueSerializers/ValueSerializerTest.php
@@ -63,6 +63,9 @@
     true,
     false,
     'string',
-    ['array' => 'array'],
+    // The array key must match our dataset parameter name,
+    // otherwise nunomaduro/collision will throw a fatal
+    // error right now...
+    ['value' => 'array'],
     (object) ['a' => 'b'],
 ]);