[5.x] PHP 8.5 Compatibility (#13112)

Co-authored-by: Jason Varga <jason@pixelfear.com>

Author: duncanmcclean

.github/workflows/tests.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.1, 8.2, 8.3, 8.4]
+        php: [8.1, 8.2, 8.3, 8.4, 8.5]
         laravel: [10.*, 11.*, 12.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
@@ -36,6 +36,10 @@ jobs:
             laravel: 12.*
           - php: 8.4
             laravel: 10.*
+          - php: 8.5
+            laravel: 10.*
+          - php: 8.5
+            laravel: 11.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

composer.json

@@ -14,7 +14,7 @@
         "composer/semver": "^3.4",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "james-heinrich/getid3": "^1.9.21",
-        "laravel/framework": "^10.48.29 || ^11.44.1 || ^12.1.1",
+        "laravel/framework": "^10.48.29 || ^11.44.1 || ^12.40.0",
         "laravel/prompts": "^0.1.16 || ^0.2.0 || ^0.3.0",
         "league/commonmark": "^2.2",
         "league/csv": "^9.0",
@@ -44,9 +44,10 @@
         "google/cloud-translate": "^1.6",
         "laravel/pint": "1.16.0",
         "mockery/mockery": "^1.6.10",
-        "orchestra/testbench": "^8.14 || ^9.2 || ^10.0",
+        "orchestra/testbench": "^8.36 || ^9.15 || ^10.8",
         "phpunit/phpunit": "^10.5.35 || ^11.5.3",
-        "spatie/laravel-ray": "^1.37"
+        "sebastian/recursion-context": "^5.0.1 || ^6.0.3",
+        "spatie/laravel-ray": "^1.42"
     },
     "config": {
         "optimize-autoloader": true,

src/Stache/Repositories/CollectionRepository.php

@@ -50,8 +50,8 @@ public function findByMount($mount): ?Collection
 
         return Blink::once('mounted-collections', fn () => $this
             ->all()
-            ->keyBy(fn ($collection) => $collection->mount()?->id())
-            ->filter()
+            ->keyBy(fn ($collection) => $collection->mount()?->id() ?? '__nomount')
+            ->filter(fn ($collection, $mountId) => $mountId !== '__nomount')
         )->get($mount->id());
     }