Scout 9 Support

Update the test Matrix.
Added Laravel 9 and Scout 9 packages.
Implemented new abstract methods needed for Scout 9.
Added tests for 2 of the 3 new methods.
The lazyMap method returns a lazyCollection but not completely implemeted yet.

Author: devNoiseConsulting

.github/workflows/tests.yml

@@ -11,21 +11,33 @@ jobs:
 
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        php: [7.2, 7.3, 7.4]
-        laravel: [^6.0, ^7.0, ^8.0]
-        scout: [^7.0, ^8.0]
+        php: [7.3, 7.4, 8.0, 8.1]
+        laravel: [^6.0, ^7.0, ^8.0, ^9.0]
+        scout: [^7.0, ^8.0, ^9.0]
         exclude:
-          - php: 7.2
-            laravel: ^8.0
+          - php: 7.3
+            laravel: ^9.0
+          - php: 7.4
+            laravel: ^9.0
+          - php: 8.0
+            scout: ^7.0 
+          - php: 8.1
+            scout: ^7.0 
+          - php: 8.1
+            scout: ^8.0 
+          - laravel: ^6.0
+            scout: ^9.0
+          - laravel: ^7.0
+            scout: ^9.0
           - laravel: ^8.0
             scout: ^7.0
-        include:
-          - php: 8.0
-            laravel: ^8.0
+          - laravel: ^9.0
+            scout: ^7.0
+          - laravel: ^9.0
             scout: ^8.0
-
+            
     name: Test PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Scout ${{ matrix.scout }}
 
     steps:
@@ -49,4 +61,4 @@ jobs:
            composer update --prefer-dist --no-interaction --no-progress
 
       - name: Run tests
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit --verbose

composer.json

@@ -23,11 +23,11 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
-        "illuminate/contracts": "~6.0|~7.0|~8.0",
-        "illuminate/database": "~6.0|~7.0|~8.0",
-        "illuminate/support": "~6.0|~7.0|~8.0",
-        "laravel/scout": "~7.0|~8.0"
+        "php": "^7.3|^8.0",
+        "illuminate/contracts": "~6.0|~7.0|~8.0|~9.0",
+        "illuminate/database": "~6.0|~7.0|~8.0|~9.0",
+        "illuminate/support": "~6.0|~7.0|~8.0|~9.0",
+        "laravel/scout": "~7.0|~8.0|~9.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.3",

src/PostgresEngine.php

@@ -2,6 +2,7 @@
 
 namespace ScoutEngines\Postgres;
 
+use Exception;
 use Illuminate\Database\ConnectionResolverInterface;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
@@ -339,6 +340,42 @@ public function map(Builder $builder, $results, $model)
             });
     }
 
+    /**
+     * Map the given results to instances of the given model via a lazy collection.
+     *
+     * @param  \Laravel\Scout\Builder  $builder
+     * @param  mixed  $results
+     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @return \Illuminate\Support\LazyCollection
+     */
+    public function lazyMap(Builder $builder, $results, $model)
+    {
+        return LazyCollection::make($model->newCollection());
+    }
+
+    /**
+     * Create a search index.
+     *
+     * @param  string  $name
+     * @param  array  $options
+     * @return mixed
+     */
+    public function createIndex($name, array $options = [])
+    {
+        throw new Exception('PostgreSQL indexes should be created through Laravel database migrations.');
+    }
+
+    /**
+     * Delete a search index.
+     *
+     * @param  string  $name
+     * @return mixed
+     */
+    public function deleteIndex($name)
+    {
+        throw new Exception('PostgreSQL indexes should be deleted through Laravel database migrations.');
+    }
+
     /**
      * Connect to the database.
      */

tests/PostgresEngineTest.php

@@ -282,6 +282,26 @@ public function test_map_ids_returns_right_key()
         $this->assertEquals([1, 2], $ids->all());
     }
 
+    public function test_create_index()
+    {
+        [$engine, $db] = $this->getEngine();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('PostgreSQL indexes should be created through Laravel database migrations.');
+
+        $engine->createIndex('bad_index');
+    }
+
+    public function test_delete_index()
+    {
+        [$engine, $db] = $this->getEngine();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('PostgreSQL indexes should be deleted through Laravel database migrations.');
+
+        $engine->deleteIndex('bad_index');
+    }
+
     protected function getEngine($config = [])
     {
         $resolver = Mockery::mock(ConnectionResolverInterface::class);