Merge pull request #33 from pmatseykanets/laravel7

Support Laravel 7 and Scout 8

Author: pmatseykanets

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - 7.2
   - 7.3
+  - 7.4
 
 env:
   matrix:

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [7.0.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v7.0.0) - 2020-03-08
+
+### Added
+
+- Added support for Laravel 7
+
+### Removed
+
+- Removed support for Laravel 5
+
 ## [6.0.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v6.0.0) - 2019-09-19
 
 ### Added

README.md

@@ -32,10 +32,16 @@ This package makes it easy to use native PostgreSQL Full Text Search capabilitie
 
 You can install the package via composer:
 
+**Scout 8**
+
+``` bash
+composer require pmatseykanets/laravel-scout-postgres:7.0.0
+```
+
 **Scout 7**
 
 ``` bash
-composer require pmatseykanets/laravel-scout-postgres
+composer require pmatseykanets/laravel-scout-postgres:5.0.0
 ```
 
 **Scout 6**

composer.json

@@ -24,10 +24,10 @@
     ],
     "require": {
         "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"
+        "illuminate/contracts": "~6.0|~7.0",
+        "illuminate/database": "~6.0|~7.0",
+        "illuminate/support": "~6.0|~7.0",
+        "laravel/scout": "~8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.3",

src/PostgresEngine.php

@@ -2,15 +2,15 @@
 
 namespace ScoutEngines\Postgres;
 
-use Laravel\Scout\Builder;
+use Illuminate\Database\ConnectionResolverInterface;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
+use Laravel\Scout\Builder;
 use Laravel\Scout\Engines\Engine;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Collection;
-use ScoutEngines\Postgres\TsQuery\ToTsQuery;
-use ScoutEngines\Postgres\TsQuery\PlainToTsQuery;
 use ScoutEngines\Postgres\TsQuery\PhraseToTsQuery;
-use Illuminate\Database\ConnectionResolverInterface;
+use ScoutEngines\Postgres\TsQuery\PlainToTsQuery;
+use ScoutEngines\Postgres\TsQuery\ToTsQuery;
 
 class PostgresEngine extends Engine
 {

src/PostgresEngineServiceProvider.php

@@ -2,12 +2,12 @@
 
 namespace ScoutEngines\Postgres;
 
+use Illuminate\Support\ServiceProvider;
 use Laravel\Scout\Builder;
 use Laravel\Scout\EngineManager;
-use Illuminate\Support\ServiceProvider;
-use ScoutEngines\Postgres\TsQuery\ToTsQuery;
-use ScoutEngines\Postgres\TsQuery\PlainToTsQuery;
 use ScoutEngines\Postgres\TsQuery\PhraseToTsQuery;
+use ScoutEngines\Postgres\TsQuery\PlainToTsQuery;
+use ScoutEngines\Postgres\TsQuery\ToTsQuery;
 use ScoutEngines\Postgres\TsQuery\WebSearchToTsQuery;
 
 class PostgresEngineServiceProvider extends ServiceProvider

tests/PostgresEngineTest.php

@@ -2,14 +2,14 @@
 
 namespace ScoutEngines\Postgres\Test;
 
-use Mockery;
-use Laravel\Scout\Builder;
 use Illuminate\Database\Connection;
-use Illuminate\Database\Eloquent\Model;
-use ScoutEngines\Postgres\PostgresEngine;
+use Illuminate\Database\ConnectionResolverInterface;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\ConnectionResolverInterface;
+use Laravel\Scout\Builder;
+use Mockery;
+use ScoutEngines\Postgres\PostgresEngine;
 
 class PostgresEngineTest extends TestCase
 {