From b70e25f734e33bc9aa320d59006ed516b9ce0d59 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Wed, 15 Oct 2025 10:55:48 -0700 Subject: [PATCH 01/10] update composer deps --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a53ad96..23ec3f9 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^8.1", "spatie/laravel-package-tools": "^1.14.0", - "illuminate/contracts": "^10.0|^11.0" + "illuminate/contracts": "^10.0|^11.0|^12.0" }, "require-dev": { "larastan/larastan": "^2.9", From eaae617c67199a4f30399c6500142f316cde35e8 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Wed, 15 Oct 2025 10:55:57 -0700 Subject: [PATCH 02/10] update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3717383..2166492 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .idea .phpunit.cache +.DS_Store build composer.lock coverage From 94824ddc03b608506de266302d005c7cbfde9b26 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Wed, 15 Oct 2025 10:56:10 -0700 Subject: [PATCH 03/10] add new values to test matrix --- .github/workflows/run-tests.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5cbbc4c..e2e0191 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,10 +13,13 @@ jobs: fail-fast: true matrix: os: [macos-latest, ubuntu-latest, windows-latest] - php: [8.3, 8.2, 8.1] - laravel: [11.*, 10.*] + php: [8.4, 8.3, 8.2, 8.1] + laravel: [12.*, 11.*, 10.*] stability: [prefer-lowest, prefer-stable] include: + - laravel: 12.* + canvas: ^9.0 + carbon: ^2.0 - laravel: 11.* canvas: 9.* carbon: 2.* @@ -24,6 +27,8 @@ jobs: canvas: ^8.11 carbon: 2.* exclude: + - laravel: 12.* + php: 8.1 - laravel: 11.* php: 8.1 From 887a58aa16fc4329efc0333044385f57c0ecbd58 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Wed, 15 Oct 2025 11:08:44 -0700 Subject: [PATCH 04/10] bump carbon package in test workflow --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index e2e0191..e7ae7d4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,7 +19,7 @@ jobs: include: - laravel: 12.* canvas: ^9.0 - carbon: ^2.0 + carbon: 3.* - laravel: 11.* canvas: 9.* carbon: 2.* From 6dc57ff1c43f04f5ef96c63bf1a08e8f1fa5f53f Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Wed, 15 Oct 2025 11:10:21 -0700 Subject: [PATCH 05/10] bump testbench dep --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 23ec3f9..cd9e1ba 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "larastan/larastan": "^2.9", "laravel/pint": "^1.0", "nunomaduro/collision": "^7.0|^8.0", - "orchestra/testbench": "^8.11|^9.0", + "orchestra/testbench": "^8.11|^9.0|^10.0", "pestphp/pest": "^2.0", "pestphp/pest-plugin-arch": "^2.0", "pestphp/pest-plugin-laravel": "^2.0", From 97c60c137b194038308c2c236e1290199443493c Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Wed, 15 Oct 2025 11:15:37 -0700 Subject: [PATCH 06/10] bump pest --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index cd9e1ba..c659294 100644 --- a/composer.json +++ b/composer.json @@ -25,9 +25,9 @@ "laravel/pint": "^1.0", "nunomaduro/collision": "^7.0|^8.0", "orchestra/testbench": "^8.11|^9.0|^10.0", - "pestphp/pest": "^2.0", - "pestphp/pest-plugin-arch": "^2.0", - "pestphp/pest-plugin-laravel": "^2.0", + "pestphp/pest": "^2.0|^3.0|^4.0", + "pestphp/pest-plugin-arch": "^2.0|^3.0|^4.0", + "pestphp/pest-plugin-laravel": "^2.0|^3.0|^4.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0" From 7df658005416f6104862a0c53a6f2dac75a7c306 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Wed, 15 Oct 2025 11:17:45 -0700 Subject: [PATCH 07/10] bump canvas in test workflow --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index e7ae7d4..f4cbbe1 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -18,7 +18,7 @@ jobs: stability: [prefer-lowest, prefer-stable] include: - laravel: 12.* - canvas: ^9.0 + canvas: ^10.0 carbon: 3.* - laravel: 11.* canvas: 9.* From b7b6f1ad9d29120ea0e0726b97d3124f6bf571e3 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Wed, 15 Oct 2025 11:21:12 -0700 Subject: [PATCH 08/10] bump larastan --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c659294..dd2590e 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "illuminate/contracts": "^10.0|^11.0|^12.0" }, "require-dev": { - "larastan/larastan": "^2.9", + "larastan/larastan": "^2.9|^3.0", "laravel/pint": "^1.0", "nunomaduro/collision": "^7.0|^8.0", "orchestra/testbench": "^8.11|^9.0|^10.0", From f49a5eceae4c7d6e01794ff2d3c7543d5e040090 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Wed, 15 Oct 2025 11:24:32 -0700 Subject: [PATCH 09/10] bump phpstan plugins --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index dd2590e..399b4d0 100644 --- a/composer.json +++ b/composer.json @@ -29,8 +29,8 @@ "pestphp/pest-plugin-arch": "^2.0|^3.0|^4.0", "pestphp/pest-plugin-laravel": "^2.0|^3.0|^4.0", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1.0" + "phpstan/phpstan-deprecation-rules": "^1.0|^2.0", + "phpstan/phpstan-phpunit": "^1.0|^2.0" }, "autoload": { "psr-4": { From 9caf278eae6fede4ae7aae838016d6f4a69730ea Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Wed, 15 Oct 2025 11:28:16 -0700 Subject: [PATCH 10/10] migrate phpunit config --- phpunit.xml.dist | 55 +++++++++++++++++--------------------------- phpunit.xml.dist.bak | 36 +++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 phpunit.xml.dist.bak diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a925dff..fb9ee9b 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,36 +1,23 @@ - - - - tests - - - - - ./src - - - - - - - - - - + + + + tests + + + + + + + + + + + + + + + ./src + + diff --git a/phpunit.xml.dist.bak b/phpunit.xml.dist.bak new file mode 100644 index 0000000..a925dff --- /dev/null +++ b/phpunit.xml.dist.bak @@ -0,0 +1,36 @@ + + + + + tests + + + + + ./src + + + + + + + + + + +