Merge pull request #16 from spatie/l11

Laravel 11
spatie · Feb 16, 2024 · f5b3c93 · f5b3c93
2 parents c73e0ab + 06028e3
commit f5b3c93
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 28 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -2,25 +2,28 @@ name: run-tests
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
+    branches: [ main ]
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest]
-        php: [8.1, 8.2]
-        laravel: [9.*, 10.*]
-        stability: [prefer-lowest, prefer-stable]
+        os: [ ubuntu-latest ]
+        php: [ 8.1, 8.2, 8.3 ]
+        laravel: [10.*, 11.* ]
+        stability: [ prefer-lowest, prefer-stable ]
         include:
-          - laravel: 9.*
-            testbench: 7.*
           - laravel: 10.*
             testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
+        exclude:
+          - php: 8.1
+            laravel: 11.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

diff --git a/composer.json b/composer.json
@@ -20,22 +20,22 @@
         "php": "^8.1",
         "amphp/amp": "^v3.0",
         "amphp/parallel": "^2.2",
-        "illuminate/collections": "^9.30|^10.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",
+        "illuminate/console": "^10.0|^11.0",
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^6.0",
+        "nunomaduro/collision": "^7.0|^8.0",
         "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^7.0|^8.0",
-        "pestphp/pest": "^1.21",
-        "pestphp/pest-plugin-laravel": "^1.1",
+        "orchestra/testbench": "^7.0|^8.0|^9.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",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.5|^10.0",
         "spatie/laravel-ray": "^1.26"
     },
     "autoload": {
@@ -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",

diff --git 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

diff --git 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),
     ],
 ]);