Merge remote-tracking branch 'remotes/origin/6.x'

Author: Simonas Šerlinskas

.coveralls.yml

@@ -1,3 +1,4 @@
 /vendor/
 /phpunit.xml
 /composer.lock
+coverage.xml

.gitignore

@@ -6,7 +6,7 @@ php:
   - 7.2
 env:
   global:
-    - ES_VERSION=6.5.4 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
+    - ES_VERSION=6.7.1 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
 install:
   - wget ${ES_DOWNLOAD_URL}
   - tar -xzf elasticsearch-${ES_VERSION}.tar.gz
@@ -16,7 +16,7 @@ before_script:
   - composer install --no-interaction --prefer-dist
 script:
   - wget -q --waitretry=1 --retry-connrefused -T 10 -O - http://127.0.0.1:9200
-  - vendor/bin/phpunit --coverage-clover=coverage.clover
+  - vendor/bin/phpunit --coverage-clover=coverage.xml
   - vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/ ./
 after_script:
-  - travis_retry php vendor/bin/php-coveralls
+  - travis_retry bash <(curl -s https://codecov.io/bash)

.travis.yml

@@ -6,6 +6,7 @@ If you need any help, [stack overflow](http://stackoverflow.com/questions/tagged
 is the preffered and recommended way to ask ONGR support questions.
 
 [![Build Status](https://travis-ci.org/ongr-io/ElasticsearchDSL.svg?branch=master)](https://travis-ci.org/ongr-io/ElasticsearchDSL)
+[![codecov](https://codecov.io/gh/ongr-io/ElasticsearchDSL/branch/master/graph/badge.svg)](https://codecov.io/gh/ongr-io/ElasticsearchDSL)
 [![Coverage Status](https://coveralls.io/repos/ongr-io/ElasticsearchDSL/badge.svg?branch=master&service=github)](https://coveralls.io/github/ongr-io/ElasticsearchDSL?branch=master)
 [![Latest Stable Version](https://poser.pugx.org/ongr/elasticsearch-dsl/v/stable)](https://packagist.org/packages/ongr/elasticsearch-dsl)
 [![Total Downloads](https://poser.pugx.org/ongr/elasticsearch-dsl/downloads)](https://packagist.org/packages/ongr/elasticsearch-dsl)

README.md

@@ -32,9 +32,7 @@
             </exclude>
         </whitelist>
     </filter>
-
     <logging>
         <log type="coverage-text" target="php://stdout" showOnlySummary="true"/>
     </logging>
-
 </phpunit>

phpunit.xml.dist

@@ -14,8 +14,9 @@
 use Elasticsearch\Client;
 use Elasticsearch\ClientBuilder;
 use ONGR\ElasticsearchDSL\Search;
+use PHPUnit\Framework\TestCase;
 
-abstract class AbstractElasticsearchTestCase extends \PHPUnit\Framework\TestCase
+abstract class AbstractElasticsearchTestCase extends TestCase
 {
     /**
      * Test index name in the elasticsearch.

tests/Functional/AbstractElasticsearchTestCase.php

@@ -43,7 +43,7 @@ public function testMatchAll()
         $matchAll = new MatchAllQuery();
 
         $search->addQuery($matchAll);
-
+        $q = $search->getQueries();
         $results = $this->executeSearch($search);
 
         $this->assertEquals($this->getDataArray()['product'], $results);