Add support for Laravel 5.6 and Elasticsearch 5.*/6.*

Author: datashaman

.travis.yml

@@ -6,29 +6,40 @@ php:
 
 sudo: false
 
-install:
-- phpenv config-rm xdebug.ini
-- travis_retry composer self-update
-- travis_retry composer install --no-interaction --prefer-dist
-- travis_retry composer require symfony/yaml --no-interaction --prefer-dist
-
 env:
 - ILLUMINATE_VERSION=^5.1 TESTBENCH_VERSION=^3.1 ELASTICSEARCH_VERSION=^2
 - ILLUMINATE_VERSION=^5.2 TESTBENCH_VERSION=^3.2 ELASTICSEARCH_VERSION=^2
 - ILLUMINATE_VERSION=^5.3 TESTBENCH_VERSION=^3.3 ELASTICSEARCH_VERSION=^2
 - ILLUMINATE_VERSION=^5.4 TESTBENCH_VERSION=^3.4 ELASTICSEARCH_VERSION=^2
 - ILLUMINATE_VERSION=^5.5 TESTBENCH_VERSION=^3.5 ELASTICSEARCH_VERSION=^2
+- ILLUMINATE_VERSION=^5.6 TESTBENCH_VERSION=^3.6 ELASTICSEARCH_VERSION=^2
 - ILLUMINATE_VERSION=^5.1 TESTBENCH_VERSION=^3.1 ELASTICSEARCH_VERSION=^5
 - ILLUMINATE_VERSION=^5.2 TESTBENCH_VERSION=^3.2 ELASTICSEARCH_VERSION=^5
 - ILLUMINATE_VERSION=^5.3 TESTBENCH_VERSION=^3.3 ELASTICSEARCH_VERSION=^5
 - ILLUMINATE_VERSION=^5.4 TESTBENCH_VERSION=^3.4 ELASTICSEARCH_VERSION=^5
 - ILLUMINATE_VERSION=^5.5 TESTBENCH_VERSION=^3.5 ELASTICSEARCH_VERSION=^5
+- ILLUMINATE_VERSION=^5.6 TESTBENCH_VERSION=^3.6 ELASTICSEARCH_VERSION=^5
+- ILLUMINATE_VERSION=^5.1 TESTBENCH_VERSION=^3.1 ELASTICSEARCH_VERSION=^6
+- ILLUMINATE_VERSION=^5.2 TESTBENCH_VERSION=^3.2 ELASTICSEARCH_VERSION=^6
+- ILLUMINATE_VERSION=^5.3 TESTBENCH_VERSION=^3.3 ELASTICSEARCH_VERSION=^6
+- ILLUMINATE_VERSION=^5.4 TESTBENCH_VERSION=^3.4 ELASTICSEARCH_VERSION=^6
+- ILLUMINATE_VERSION=^5.5 TESTBENCH_VERSION=^3.5 ELASTICSEARCH_VERSION=^6
+- ILLUMINATE_VERSION=^5.6 TESTBENCH_VERSION=^3.6 ELASTICSEARCH_VERSION=^6
+
+matrix:
+  exclude:
+  - php: 7.0
+    env: ILLUMINATE_VERSION=^5.6 TESTBENCH_VERSION=^3.6 ELASTICSEARCH_VERSION=^2
+  - php: 7.0
+    env: ILLUMINATE_VERSION=^5.6 TESTBENCH_VERSION=^3.6 ELASTICSEARCH_VERSION=^5
+  - php: 7.0
+    env: ILLUMINATE_VERSION=^5.6 TESTBENCH_VERSION=^3.6 ELASTICSEARCH_VERSION=^6
 
-before_script:
-  - composer remove elasticsearch/elasticsearch illuminate/support
-  - composer remove --dev orchestra/testbench
-  - composer require elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION} illuminate/support:${ILLUMINATE_VERSION}
-  - composer require --dev orchestra/testbench:${TESTBENCH_VERSION}
+install:
+- phpenv config-rm xdebug.ini
+- travis_retry composer global require hirak/prestissimo
+- travis_retry composer require elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION} illuminate/support:${ILLUMINATE_VERSION}
+- travis_retry composer require --dev orchestra/testbench:${TESTBENCH_VERSION}
 
 script: composer run coverage
 
@@ -39,7 +50,3 @@ cache:
   directories:
   - vendor
   - "$HOME/.composer/cache"
-
-notifications:
-  slack:
-    secure: ODPo7KQ7N+gQv4thY6Y8oDvvWt95tHpc19w018K9dTrY5+OWUp4LYimAwBTJ0YJxa/e3L+mRXXFl5R6i++SZGEqidmes4tPQB1ApP6ru4InIF6bQ0b0rvpxtWSUJZ1iVMvSQSFsp5C+1I75lfKDw4trnSarJ2jIQqa7z4uMrp4nLW/cVuYgoC44ehFiW3Uhzm+EtEOtbTgOvgZr+hLiUVE1x1VGIVcalSDbz+AnAiYmLBARwhKXMmL39/89O/eXucJALp3yLlmLKYjp5MaIh5EjFmAAWuvqayEbW3gb4U70XGvMf3FRORxnQn+pPcU55ULSy+6JeH3t4tZt48Wq29RQhY296klspW8bSXvry7Ot6/L2DiKAOOx6yBOIWMTUfMlOhKCT4HZoHZ4LCl74UqnmWaHlsdq2X+coNlD/XvdGgqd9QFKLoVfAwdGlaP3Lt5wDX9Ihce1m9Ncm4xNv5dbwG3hlfA/oY8Ntakc3u4IWH8ujELv0Vbc940zBlOK4YL6xRR3+2Ek2CYf6do7iNpHhLlcZXQeA0XK+ELhXKtIJxDIiTUt6ZRv0TrSsiAq2h95NUSLjw/LuwLlKQp22CUkj4L870/wC6kf67HuFXlPFau5L8hS++3dBghe8CJnySZTfrCMb7EJCCfr9TmkD63/W+xCN83S2071bjbpkqE8Y=

composer.json

@@ -17,15 +17,15 @@
         }
     ],
     "require": {
-        "php": "^7.0 || ^7.1",
-        "elasticsearch/elasticsearch": "^2.0 || ^5.0",
-        "illuminate/support": "^5.1 || ^5.2 || ^5.3 || ^5.4 || ^5.5"
+        "php": "^7.0 || ^7.1 || ^7.2",
+        "elasticsearch/elasticsearch": "^2.0 || ^5.0 || ^6.0",
+        "illuminate/support": "^5.1 || ^5.2 || ^5.3 || ^5.4 || ^5.5 || ^5.6"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8 || ^5.4 || ^6.0",
+        "phpunit/phpunit": "^4.8 || ^5.4 || ^6.0 || ^7.0",
         "mockery/mockery": "dev-master",
         "codeclimate/php-test-reporter": "dev-master",
-        "orchestra/testbench": "^3.1 || ^3.2 || ^3.3 || ^3.4 || ^3.5",
+        "orchestra/testbench": "^3.1 || ^3.2 || ^3.3 || ^3.4 || ^3.5 || ^3.6",
         "ext-sqlite3": "*"
     },
     "suggest": {

phpunit.xml

@@ -7,7 +7,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Package Test Suite">

src/ArrayDelegateMethod.php

@@ -30,4 +30,11 @@ public function offsetGet($offset)
 
         return $item;
     }
+
+    public function count()
+    {
+        $array = call_user_func([$this, static::$arrayDelegate]);
+
+        return count($array);
+    }
 }

src/Response.php

@@ -3,11 +3,12 @@
 namespace Datashaman\Elasticsearch\Model;
 
 use ArrayAccess;
+use Countable;
 use Exception;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 
-class Response implements ArrayAccess
+class Response implements ArrayAccess, Countable
 {
     use ArrayDelegateMethod;
     protected static $arrayDelegate = 'results';

src/Response/Records.php

@@ -3,10 +3,11 @@
 namespace Datashaman\Elasticsearch\Model\Response;
 
 use ArrayAccess;
+use Countable;
 use Datashaman\Elasticsearch\Model\ArrayDelegateMethod;
 use Illuminate\Support\Collection;
 
-class Records implements ArrayAccess
+class Records implements ArrayAccess, Countable
 {
     use ArrayDelegateMethod;
     protected static $arrayDelegate = 'records';

tests/Response/PaginationTest.php

@@ -274,8 +274,8 @@ public function testResults()
 
         $rendered = (string) $results->render();
 
-        $this->assertContains('<ul class="pagination">', $rendered);
-        $this->assertContains('<a href="/articles?page=1" rel="prev">&laquo;</a>', $rendered);
-        $this->assertContains('<a href="/articles?page=3" rel="next">&raquo;</a>', $rendered);
+        $this->assertContains('ul class="pagination"', $rendered);
+        $this->assertContains('href="/articles?page=1" rel="prev"', $rendered);
+        $this->assertContains('href="/articles?page=3" rel="next"', $rendered);
     }
 }