Switch to Scout 4 (Laravel 5.6) and PHPUnit 7

Author: Peter Matseykanets

.travis.yml

@@ -1,9 +1,8 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
+  - 7.2
 
 env:
   matrix:

CHANGELOG.md

@@ -1,48 +1,72 @@
 # Changelog
 
-## [Unreleased]
+## [2.0.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v2.0.0) - 2018-02-09
+
+### Changed
+
+- Switched to Scout 4 (Laravel 5.6) and PHPUnit 7
 
 ## [1.0.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v1.0.0) - 2017-09-03
+
 ### Added
+
 - Added Laravel 5.5 support including package auto discovery.
 
 ## [0.5.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v0.5.0) - 2017-01-30
+
 ### Changed
+
 - Updated dependencies to support Laravel 5.4 and Scout 3.0
 
 ### Fixed
+
 - Fall back to phpunit 4.8.
 
 ## [0.4.1](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v0.4.1) - 2017-01-22
+
 ### Fixed
+
 - Fixed #7. No longer uses `resolve()` helper to better support Laravel Lumen.
 
 ## [0.4.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v0.4.0) - 2017-01-16
+
 ### Added
+
 - Made it possible to specify PostgreSQL search config both globally in scout.php or on per model basis.
 
 ### Changed
+
 - Fixed #6. Check for models that no longer exist but still present in the index (i.e. soft-deleted models).
 
 ## [0.3.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v0.3.0) - 2017-01-04
+
 ### Changed
+
 - Updated to scout 2.0. 
 - Fixed an issue with order by clause when performing a search.
 
 ## [0.2.1](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v0.2.1) - 2016-12-23
+
 ### Changed
+
 - Fixed #2. Cast nulls to empty strings in `toVector()`. 
 
 ## [0.2.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v0.2.0) - 2016-10-07
+
 ### Added
+
 - Implemented `getTotalCount()` method to support length aware pagination. 
 
 ### Changed
+
 - Updated README.md.
 
 ## [0.1.1](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v0.1.1) - 2016-10-07
+
 ### Changed
+
 - Updated composer dependencies.
 
 ## [0.1.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v0.1.0) - 2016-09-02
+
 Experimental release.

README.md

@@ -14,8 +14,9 @@ This package makes it easy to use native PostgreSQL Full Text Search capabilitie
 ## Contents
 
 - [Installation](#installation)
-    - [Scout 1.x](#scout-1x)
+    - [Scout 4.x](#scout-4x)
     - [Scout 2.x, 3.x](#scout-2x-3x)
+    - [Scout 1.x](#scout-1x)
     - [Laravel](#laravel)
     - [Lumen](#lumen)
 - [Configuration](#configuration)
@@ -36,16 +37,22 @@ This package makes it easy to use native PostgreSQL Full Text Search capabilitie
 
 You can install the package via composer:
 
-### Scout 1.x
+### Scout 4.x (Laravel 5.6)
 ``` bash
-composer require pmatseykanets/laravel-scout-postgres:0.2.1
+composer require pmatseykanets/laravel-scout-postgres
 ```
 
 ### Scout 2.x, 3.x
 ``` bash
-composer require pmatseykanets/laravel-scout-postgres
+composer require pmatseykanets/laravel-scout-postgres:1.0.0
 ```
 
+### Scout 1.x
+``` bash
+composer require pmatseykanets/laravel-scout-postgres:0.2.1
+```
+
+
 ### Laravel
 If you're using Laravel < 5.5 or if you have package auto-discovery turned off you have to manually register the service provider:
 

composer.json

@@ -20,15 +20,15 @@
         }
     ],
     "require": {
-        "php": ">=5.6.4",
-        "illuminate/contracts": "5.3.*|5.4.*|5.5.*",
-        "illuminate/database": "5.3.*|5.4.*|5.5.*",
-        "illuminate/support": "5.3.*|5.4.*|5.5.*",
-        "laravel/scout": "2.*|3.*"
+        "php": ">=7.1.3",
+        "illuminate/contracts": "5.6.*",
+        "illuminate/database": "5.6.*",
+        "illuminate/support": "5.6.*",
+        "laravel/scout": "4.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
-        "mockery/mockery": "^0.9.5"
+        "phpunit/phpunit": "~7.0",
+        "mockery/mockery": "~1.0"
     },
     "autoload": {
         "psr-4": {

tests/AbstractTestCase.php

@@ -11,7 +11,7 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\ConnectionResolverInterface;
 
-class PostgresEngineTest extends AbstractTestCase
+class PostgresEngineTest extends TestCase
 {
     public function test_it_can_be_instantiated()
     {

tests/PostgresEngineTest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace ScoutEngines\Postgres\Test;
+
+use Mockery;
+use PHPUnit\Framework\TestCase as BaseTestCase;
+
+abstract class TestCase extends BaseTestCase
+{
+    public function tearDown()
+    {
+        // Prevent PHPUnit complaining about risky tests
+        // because Mockery expectations are not counted towards assertions
+        if ($container = Mockery::getContainer()) {
+            $this->addToAssertionCount($container->mockery_getExpectationCount());
+        }
+
+        Mockery::close();
+    }
+}