From c89418f9229263e062c44872282ed9bf63eeaae2 Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:15:25 +0100 Subject: [PATCH 01/13] Laravel 11 --- .github/workflows/run-tests.yml | 6 ++++-- composer.json | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ff4ba05..32947ca 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,14 +13,16 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.1, 8.2] - laravel: [9.*, 10.*] + php: [8.1, 8.2, 8.3] + laravel: [9.*, 10.*, 10.*] stability: [prefer-lowest, prefer-stable] include: - laravel: 9.* testbench: 7.* - laravel: 10.* testbench: 8.* + - laravel: 11.* + testbench: 9.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index b992b17..eadec77 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "php": "^8.1", "amphp/amp": "^v3.0", "amphp/parallel": "^2.2", - "illuminate/collections": "^9.30|^10.0", + "illuminate/collections": "^9.30|^10.0|^11.0", "spatie/laravel-package-tools": "^1.4.3", "symfony/finder" : "^6.0|^7.0" }, @@ -29,13 +29,13 @@ "laravel/pint": "^1.0", "nunomaduro/collision": "^6.0", "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.0|^8.0", + "orchestra/testbench": "^7.0|^8.0|^9.0", "pestphp/pest": "^1.21", "pestphp/pest-plugin-laravel": "^1.1", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.5|^10.0", "spatie/laravel-ray": "^1.26" }, "autoload": { From 5cd99be2f2c1f528e034b015fbda54139d8f2a62 Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:18:29 +0100 Subject: [PATCH 02/13] wip --- .github/workflows/run-tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 32947ca..18a72d5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -2,9 +2,9 @@ name: run-tests on: push: - branches: [main] + branches: [ main ] pull_request: - branches: [main] + branches: [ main ] jobs: test: @@ -12,10 +12,10 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest] - php: [8.1, 8.2, 8.3] - laravel: [9.*, 10.*, 10.*] - stability: [prefer-lowest, prefer-stable] + os: [ ubuntu-latest ] + php: [ 8.1, 8.2, 8.3 ] + laravel: [ 9.*, 10.*, 10.* ] + stability: [ prefer-lowest, prefer-stable ] include: - laravel: 9.* testbench: 7.* From c037990fdf78de7ea4483523512ed64ae92563ef Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:18:52 +0100 Subject: [PATCH 03/13] Laravel 11 --- .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 18a72d5..a06b6c0 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [ ubuntu-latest ] php: [ 8.1, 8.2, 8.3 ] - laravel: [ 9.*, 10.*, 10.* ] + laravel: [ 9.*, 10.*, 10.*, 11.* ] stability: [ prefer-lowest, prefer-stable ] include: - laravel: 9.* From 6ded61ec52858ffe07fa090cdaa93702f0467eb4 Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:20:12 +0100 Subject: [PATCH 04/13] Laravel 11 --- .github/workflows/run-tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index a06b6c0..c2c99fd 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -23,6 +23,11 @@ jobs: testbench: 8.* - laravel: 11.* testbench: 9.* + exlude: + - php: 8.3 + laravel: 9.* + - php: 8.1 + laravel: 11.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From ca20075b2f089ca741dd8aa8311aa97b502880a6 Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:21:09 +0100 Subject: [PATCH 05/13] Laravel 11 --- .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 c2c99fd..8370ac6 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -23,7 +23,7 @@ jobs: testbench: 8.* - laravel: 11.* testbench: 9.* - exlude: + exclude: - php: 8.3 laravel: 9.* - php: 8.1 From 3fa84bd28ce8b3f36524274b4f068bd9aec726e9 Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:22:13 +0100 Subject: [PATCH 06/13] Laravel 11 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index eadec77..3a2ff62 100644 --- a/composer.json +++ b/composer.json @@ -25,12 +25,12 @@ "symfony/finder" : "^6.0|^7.0" }, "require-dev": { - "illuminate/console": "^9.30|^10.0", + "illuminate/console": "^9.30|^10.0|^11.0", "laravel/pint": "^1.0", "nunomaduro/collision": "^6.0", "nunomaduro/larastan": "^2.0.1", "orchestra/testbench": "^7.0|^8.0|^9.0", - "pestphp/pest": "^1.21", + "pestphp/pest": "^1.21|^2.0", "pestphp/pest-plugin-laravel": "^1.1", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", From 680af4d75adefe83af30547bf189f8b37eb278d2 Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:27:55 +0100 Subject: [PATCH 07/13] Laravel 11 --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 3a2ff62..735fe88 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,6 @@ } }, "scripts": { - "post-autoload-dump": "@php ./vendor/bin/testbench package:discover --ansi", "analyse": "vendor/bin/phpstan analyse", "test": "vendor/bin/pest", "test-coverage": "vendor/bin/pest --coverage", From 18e1fe857ceebc3f3c148ae740665cf3e492cabf Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:29:10 +0100 Subject: [PATCH 08/13] Laravel 11 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 735fe88..855a2a1 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "nunomaduro/larastan": "^2.0.1", "orchestra/testbench": "^7.0|^8.0|^9.0", "pestphp/pest": "^1.21|^2.0", - "pestphp/pest-plugin-laravel": "^1.1", + "pestphp/pest-plugin-laravel": "^1.1|^2.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", From e610a5337133a1cf5b923ca9de2d9d7e5a0bb79f Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:35:01 +0100 Subject: [PATCH 09/13] Laravel 11 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 855a2a1..e690526 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "require-dev": { "illuminate/console": "^9.30|^10.0|^11.0", "laravel/pint": "^1.0", - "nunomaduro/collision": "^6.0", + "nunomaduro/collision": "^6.0|^7.0|^8.0", "nunomaduro/larastan": "^2.0.1", "orchestra/testbench": "^7.0|^8.0|^9.0", "pestphp/pest": "^1.21|^2.0", From a580ef7b649e0723b74bdb9fd2694101fdd5e45d Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:38:50 +0100 Subject: [PATCH 10/13] Laravel 11 --- composer.json | 10 +++++----- tests/CacheDriversTest.php | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index e690526..b0a0acd 100644 --- a/composer.json +++ b/composer.json @@ -20,18 +20,18 @@ "php": "^8.1", "amphp/amp": "^v3.0", "amphp/parallel": "^2.2", - "illuminate/collections": "^9.30|^10.0|^11.0", + "illuminate/collections": "^10.0|^11.0", "spatie/laravel-package-tools": "^1.4.3", "symfony/finder" : "^6.0|^7.0" }, "require-dev": { - "illuminate/console": "^9.30|^10.0|^11.0", + "illuminate/console": "^10.0|^11.0", "laravel/pint": "^1.0", - "nunomaduro/collision": "^6.0|^7.0|^8.0", + "nunomaduro/collision": "^7.0|^8.0", "nunomaduro/larastan": "^2.0.1", "orchestra/testbench": "^7.0|^8.0|^9.0", - "pestphp/pest": "^1.21|^2.0", - "pestphp/pest-plugin-laravel": "^1.1|^2.0", + "pestphp/pest": "^2.0", + "pestphp/pest-plugin-laravel": "^2.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", diff --git a/tests/CacheDriversTest.php b/tests/CacheDriversTest.php index 56d7950..150d67d 100644 --- a/tests/CacheDriversTest.php +++ b/tests/CacheDriversTest.php @@ -26,30 +26,30 @@ })->with([ 'laravel' => [ new LaravelDiscoverCacheDriver(), - fn () => fn () => cache()->has('discoverer-cache-test'), + fn() => cache()->has('discoverer-cache-test'), ], 'laravel with prefix' => [ new LaravelDiscoverCacheDriver(prefix: 'prefixed'), - fn () => fn () => cache()->has('prefixed-discoverer-cache-test'), + fn() => cache()->has('prefixed-discoverer-cache-test'), ], 'laravel with store' => [ new LaravelDiscoverCacheDriver(store: 'file'), - fn () => fn () => cache()->driver('file')->has('discoverer-cache-test'), + fn() => cache()->driver('file')->has('discoverer-cache-test'), ], 'file serialized' => [ new FileDiscoverCacheDriver(__DIR__.'/temp'), - fn () => fn () => file_exists(__DIR__.'/temp/discoverer-cache-test'), + fn() => file_exists(__DIR__.'/temp/discoverer-cache-test'), ], 'file using php' => [ new FileDiscoverCacheDriver(__DIR__.'/temp', serialize: false), - fn () => fn () => file_exists(__DIR__.'/temp/discoverer-cache-test'), + fn() => file_exists(__DIR__.'/temp/discoverer-cache-test'), ], 'file with alternative filename' => [ new FileDiscoverCacheDriver(__DIR__.'/temp', filename: 'discovered.php'), - fn () => fn () => file_exists(__DIR__.'/temp/discovered.php'), + fn() => file_exists(__DIR__.'/temp/discovered.php'), ], 'static' => [ new StaticDiscoverCacheDriver(), - fn () => fn () => array_key_exists('test', StaticDiscoverCacheDriver::$entries), + fn() => array_key_exists('test', StaticDiscoverCacheDriver::$entries), ], ]); From 775e1b82e363b088f5b1c8543f20859007e6cace Mon Sep 17 00:00:00 2001 From: rubenvanassche Date: Fri, 16 Feb 2024 12:39:06 +0000 Subject: [PATCH 11/13] Fix styling --- tests/CacheDriversTest.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/CacheDriversTest.php b/tests/CacheDriversTest.php index 150d67d..5725bd5 100644 --- a/tests/CacheDriversTest.php +++ b/tests/CacheDriversTest.php @@ -26,30 +26,30 @@ })->with([ 'laravel' => [ new LaravelDiscoverCacheDriver(), - fn() => cache()->has('discoverer-cache-test'), + fn () => cache()->has('discoverer-cache-test'), ], 'laravel with prefix' => [ new LaravelDiscoverCacheDriver(prefix: 'prefixed'), - fn() => cache()->has('prefixed-discoverer-cache-test'), + fn () => cache()->has('prefixed-discoverer-cache-test'), ], 'laravel with store' => [ new LaravelDiscoverCacheDriver(store: 'file'), - fn() => cache()->driver('file')->has('discoverer-cache-test'), + fn () => cache()->driver('file')->has('discoverer-cache-test'), ], 'file serialized' => [ new FileDiscoverCacheDriver(__DIR__.'/temp'), - fn() => file_exists(__DIR__.'/temp/discoverer-cache-test'), + fn () => file_exists(__DIR__.'/temp/discoverer-cache-test'), ], 'file using php' => [ new FileDiscoverCacheDriver(__DIR__.'/temp', serialize: false), - fn() => file_exists(__DIR__.'/temp/discoverer-cache-test'), + fn () => file_exists(__DIR__.'/temp/discoverer-cache-test'), ], 'file with alternative filename' => [ new FileDiscoverCacheDriver(__DIR__.'/temp', filename: 'discovered.php'), - fn() => file_exists(__DIR__.'/temp/discovered.php'), + fn () => file_exists(__DIR__.'/temp/discovered.php'), ], 'static' => [ new StaticDiscoverCacheDriver(), - fn() => array_key_exists('test', StaticDiscoverCacheDriver::$entries), + fn () => array_key_exists('test', StaticDiscoverCacheDriver::$entries), ], ]); From 4a2ba2038e27dd458d62f578b0760d6b332ddd28 Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:39:35 +0100 Subject: [PATCH 12/13] Laravel 11 --- .github/workflows/run-tests.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8370ac6..268769b 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,18 +14,14 @@ jobs: matrix: os: [ ubuntu-latest ] php: [ 8.1, 8.2, 8.3 ] - laravel: [ 9.*, 10.*, 10.*, 11.* ] + laravel: [10.*, 11.* ] stability: [ prefer-lowest, prefer-stable ] include: - - laravel: 9.* - testbench: 7.* - laravel: 10.* testbench: 8.* - laravel: 11.* testbench: 9.* exclude: - - php: 8.3 - laravel: 9.* - php: 8.1 laravel: 11.* From 06028e31bb8857ca37bb25752d9220c24fd4409e Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:41:32 +0100 Subject: [PATCH 13/13] wip --- phpstan-baseline.neon | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index feb6e54..869edb7 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -5,6 +5,11 @@ parameters: count: 1 path: src/Data/DiscoveredClass.php + - + message: "#^Casting class ReflectionType to string is deprecated\\.$#" + count: 2 + path: src/Data/DiscoveredEnum.php + - message: "#^Parameter \\$file of class Spatie\\\\StructureDiscoverer\\\\Data\\\\DiscoveredEnum constructor expects string, string\\|false given\\.$#" count: 1 @@ -20,11 +25,6 @@ parameters: count: 1 path: src/Data/DiscoveredTrait.php - - - message: "#^Unable to resolve the template type T in call to function Amp\\\\Promise\\\\wait$#" - count: 1 - path: src/DiscoverWorkers/ParallelDiscoverWorker.php - - message: "#^Match arm is unreachable because previous comparison is always true\\.$#" count: 1