From c367385101cf54e3fa7e914afe3b522069b4937c Mon Sep 17 00:00:00 2001 From: Randall Wilk Date: Tue, 25 Feb 2025 13:28:41 -0600 Subject: [PATCH 1/2] Add Laravel 12.x support --- .github/workflows/run-tests.yml | 6 +++++- composer.json | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 78d0894..3450ebc 100644 --- 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 index f3347be..ab63c36 100644 --- 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": { From f158feb2778e9fb71b2bdc120e53bd2aaa9f3574 Mon Sep 17 00:00:00 2001 From: Randall Wilk Date: Tue, 25 Feb 2025 13:46:01 -0600 Subject: [PATCH 2/2] Fix fatal dataset error in test --- tests/Unit/ValueSerializers/ValueSerializerTest.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/Unit/ValueSerializers/ValueSerializerTest.php b/tests/Unit/ValueSerializers/ValueSerializerTest.php index b9ab367..dd6407a 100644 --- 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'], ]);