[10.x] PHP 8.5 Compatibility

.github/workflows/tests.yml

@@ -23,6 +23,8 @@ jobs:
             laravel: 11
           - php: 8.4
             laravel: 12
+          - php: 8.5
+            laravel: 12
           - php: 8.2
             laravel: 9
           - php: 8.1

composer.json

@@ -29,10 +29,9 @@
         "typesense/typesense-php": "^4.9.3",
         "meilisearch/meilisearch-php": "^1.0",
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^7.31|^8.11|^9.0|^10.0",
+        "orchestra/testbench": "^7.31|^8.36|^9.15|^10.8",
         "php-http/guzzle7-adapter": "^1.0",
-        "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9.3|^10.4|^11.5"
+        "phpstan/phpstan": "^1.10"
     },
     "conflict": {
         "algolia/algoliasearch-client-php": "<3.2.0|>=5.0.0"

tests/Integration/AlgoliaSearchableTest.php

@@ -2,6 +2,7 @@
 
 namespace Laravel\Scout\Tests\Integration;
 
+use Orchestra\Sidekick\Env;
 use Orchestra\Testbench\Attributes\RequiresEnv;
 use Workbench\App\Models\SearchableUser;
 
@@ -215,6 +216,17 @@ public function test_it_can_use_raw_cursor_search_with_after_raw_search_callback
         $this->assertArrayHasKey('processingTimeMS', $rawResults);
     }
 
+    /** {@inheritdoc} */
+    #[\Override]
+    protected static function flushIndexesFromScout(): void
+    {
+        if (! Env::has('ALGOLIA_APP_ID')) {
+            return;
+        }
+
+        parent::flushIndexesFromScout();
+    }
+
     protected static function scoutDriver(): string
     {
         return 'algolia';

tests/Integration/TestCase.php

@@ -26,12 +26,20 @@ protected function importScoutIndexFrom($model = null)
      * Clean up the testing environment before the next test case.
      */
     public static function tearDownAfterClass(): void
+    {
+        static::flushIndexesFromScout();
+
+        parent::tearDownAfterClass();
+    }
+
+    /**
+     * Cleanup indexes from scout before starting new test.
+     */
+    protected static function flushIndexesFromScout(): void
     {
         remote('scout:delete-all-indexes', [
             'SCOUT_DRIVER' => static::scoutDriver(),
         ])->mustRun();
-
-        parent::tearDownAfterClass();
     }
 
     abstract protected static function scoutDriver(): string;

tests/Unit/MeilisearchEngineTest.php

@@ -12,11 +12,14 @@
 use Meilisearch\Client;
 use Meilisearch\Endpoints\Indexes;
 use Mockery as m;
+use Orchestra\Testbench\Concerns\InteractsWithMockery;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
 class MeilisearchEngineTest extends TestCase
 {
+    use InteractsWithMockery;
+
     protected function setUp(): void
     {
         Config::shouldReceive('get')->with('scout.after_commit', m::any())->andReturn(false);
@@ -26,7 +29,8 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         Container::getInstance()->flush();
-        m::close();
+
+        $this->tearDownTheTestEnvironmentUsingMockery();
     }
 
     public function test_map_ids_returns_empty_collection_if_no_hits()

tests/Unit/SearchableScopeTest.php

@@ -5,13 +5,16 @@
 use Illuminate\Database\Eloquent\Builder;
 use Laravel\Scout\SearchableScope;
 use Mockery as m;
+use Orchestra\Testbench\Concerns\InteractsWithMockery;
 use PHPUnit\Framework\TestCase;
 
 class SearchableScopeTest extends TestCase
 {
+    use InteractsWithMockery;
+
     protected function tearDown(): void
     {
-        m::close();
+        $this->tearDownTheTestEnvironmentUsingMockery();
     }
 
     public function test_chunks_by_id()