Support Laravel 6

Author: pmatseykanets

.gitignore

@@ -1,2 +1,3 @@
 /vendor
-composer.lock
+.phpunit.result.cache
+composer.lock

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 7.1
   - 7.2
   - 7.3
 

composer.json

@@ -23,15 +23,15 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "~5.4",
-        "illuminate/database": "~5.4",
-        "illuminate/support": "~5.4",
+        "php": "^7.2",
+        "illuminate/contracts": "~5.4|~6.0",
+        "illuminate/database": "~5.4|~6.0",
+        "illuminate/support": "~5.4|~6.0",
         "laravel/scout": "~7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.0",
-        "mockery/mockery": "~1.0"
+        "phpunit/phpunit": "^8.3",
+        "mockery/mockery": "^1.2.3"
     },
     "autoload": {
         "psr-4": {

src/PostgresEngine.php

@@ -3,6 +3,7 @@
 namespace ScoutEngines\Postgres;
 
 use Laravel\Scout\Builder;
+use Illuminate\Support\Arr;
 use Laravel\Scout\Engines\Engine;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Collection;
@@ -200,7 +201,7 @@ public function getTotalCount($results)
             return 0;
         }
 
-        return (int) array_first($results)
+        return (int) Arr::first($results)
             ->total_count;
     }
 
@@ -497,7 +498,7 @@ protected function option(Model $model, $key, $default = null)
 
         $options = $model->searchableOptions() ?: [];
 
-        return array_get($options, $key, $default);
+        return Arr::get($options, $key, $default);
     }
 
     /**
@@ -509,7 +510,7 @@ protected function option(Model $model, $key, $default = null)
      */
     protected function config($key, $default = null)
     {
-        return array_get($this->config, $key, $default);
+        return Arr::get($this->config, $key, $default);
     }
 
     /**

tests/TestCase.php

@@ -7,7 +7,7 @@
 
 abstract class TestCase extends BaseTestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         // Prevent PHPUnit complaining about risky tests
         // because Mockery expectations are not counted towards assertions