From 71516a20b77489110de348512f90592981f70c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?=
 <saimaz@users.noreply.github.com>
Date: Fri, 9 Mar 2018 16:13:45 +0200
Subject: [PATCH] fix travis support (#251)

* fixed unit tests to support phpunit 6

* do not use sudo

* update elasticsearch in the travis env and use docker vm

* add java jdk8

* temporary remove elasticsearch scripting

* clean up travis file

* null cannot be used in count() functions anymore in 7.2
---
 .travis.yml                                   | 23 +++++++------------
 composer.json                                 |  2 +-
 .../Matrix/MatrixStatsAggregation.php         |  5 ++--
 .../AbstractElasticsearchTestCase.php         |  2 +-
 .../Bucketing/ChildrenAggregationTest.php     |  2 +-
 .../DateHistogramAggregationTest.php          |  2 +-
 .../Bucketing/DateRangeAggregationTest.php    |  4 ++--
 .../Bucketing/FilterAggregationTest.php       |  2 +-
 .../Bucketing/FiltersAggregationTest.php      |  2 +-
 .../Bucketing/GeoDistanceAggregationTest.php  |  2 +-
 .../Bucketing/GeoHashGridAggregationTest.php  |  2 +-
 .../Bucketing/GlobalAggregationTest.php       |  2 +-
 .../Bucketing/Ipv4RangeAggregationTest.php    |  2 +-
 .../Bucketing/MissingAggregationTest.php      |  2 +-
 .../Bucketing/NestedAggregationTest.php       |  2 +-
 .../Bucketing/RangeAggregationTest.php        |  2 +-
 .../ReverseNestedAggregationTest.php          |  2 +-
 .../Bucketing/SamplerAggregationTest.php      |  2 +-
 .../SignificantTermsAggregationTest.php       |  2 +-
 .../Bucketing/TermsAggregationTest.php        |  2 +-
 .../Metric/CardinalityAggregationTest.php     |  2 +-
 .../Metric/GeoBoundsAggregationTest.php       |  2 +-
 .../Metric/GeoCentroidAggregationTest.php     |  2 +-
 .../Metric/PercentileRanksAggregationTest.php |  2 +-
 .../Metric/PercentilesAggregationTest.php     |  2 +-
 .../Metric/StatsAggregationTest.php           |  2 +-
 .../Metric/TopHitsAggregationTest.php         |  2 +-
 .../Pipeline/AvgBucketAggregationTest.php     |  2 +-
 .../Pipeline/BucketScriptAggregationTest.php  |  2 +-
 .../BucketSelectorAggregationTest.php         |  2 +-
 .../Pipeline/CumulativeSumAggregationTest.php |  2 +-
 .../Pipeline/DerivativeAggregationTest.php    |  2 +-
 .../ExtendedStatsBucketAggregationTest.php    |  2 +-
 .../Pipeline/MaxBucketAggregationTest.php     |  2 +-
 .../Pipeline/MinBucketAggregationTest.php     |  2 +-
 .../PercentilesBucketAggregationTest.php      |  2 +-
 .../SerialDifferencingAggregationTest.php     |  2 +-
 .../Pipeline/StatsBucketAggregationTest.php   |  2 +-
 .../Pipeline/SumBucketAggregationTest.php     |  2 +-
 tests/Unit/BuilderBagTest.php                 |  2 +-
 tests/Unit/Highlight/HighlightTest.php        |  2 +-
 tests/Unit/InnerHit/NestedInnerHitTest.php    |  2 +-
 tests/Unit/InnerHit/ParentInnerHitTest.php    |  2 +-
 tests/Unit/ParametersTraitTest.php            |  2 +-
 tests/Unit/Query/Compound/BoolQueryTest.php   |  2 +-
 .../Unit/Query/Compound/BoostingQueryTest.php |  2 +-
 .../Query/Compound/ConstantScoreQueryTest.php |  2 +-
 tests/Unit/Query/Compound/DisMaxQueryTest.php |  2 +-
 .../Query/Compound/FunctionScoreQueryTest.php |  2 +-
 .../Unit/Query/Compound/IndicesQueryTest.php  |  2 +-
 .../Query/FullText/CommonTermsQueryTest.php   |  2 +-
 .../FullText/MatchPhrasePrefixQueryTest.php   |  4 ++--
 .../Query/FullText/MatchPhraseQueryTest.php   |  4 ++--
 tests/Unit/Query/FullText/MatchQueryTest.php  |  2 +-
 .../Query/FullText/MultiMatchQueryTest.php    |  2 +-
 .../Query/FullText/QueryStringQueryTest.php   |  2 +-
 .../FullText/SimpleQueryStringQueryTest.php   |  2 +-
 .../Query/Geo/GeoBoundingBoxQueryTest.php     |  2 +-
 tests/Unit/Query/Geo/GeoDistanceQueryTest.php |  2 +-
 .../Query/Geo/GeoDistanceRangeQueryTest.php   |  2 +-
 tests/Unit/Query/Geo/GeoPolygonQueryTest.php  |  2 +-
 tests/Unit/Query/Geo/GeoShapeQueryTest.php    |  2 +-
 .../Unit/Query/Joining/HasChildQueryTest.php  |  2 +-
 .../Unit/Query/Joining/HasParentQueryTest.php |  2 +-
 tests/Unit/Query/Joining/NestedQueryTest.php  |  2 +-
 tests/Unit/Query/MatchAllQueryTest.php        |  2 +-
 .../Query/Span/SpanContainingQueryTest.php    |  2 +-
 tests/Unit/Query/Span/SpanFirstQueryTest.php  |  2 +-
 .../Query/Span/SpanMultiTermQueryTest.php     |  2 +-
 tests/Unit/Query/Span/SpanNearQueryTest.php   |  2 +-
 tests/Unit/Query/Span/SpanNotQueryTest.php    |  2 +-
 tests/Unit/Query/Span/SpanOrQueryTest.php     |  2 +-
 tests/Unit/Query/Span/SpanTermQueryTest.php   |  2 +-
 tests/Unit/Query/Span/SpanWithinQueryTest.php |  2 +-
 .../Specialized/MoreLikeThisQueryTest.php     |  2 +-
 .../Query/Specialized/ScriptQueryTest.php     |  2 +-
 .../Query/Specialized/TemplateQueryTest.php   |  2 +-
 .../Unit/Query/TermLevel/ExistsQueryTest.php  |  2 +-
 tests/Unit/Query/TermLevel/FuzzyQueryTest.php |  2 +-
 tests/Unit/Query/TermLevel/IdsQueryTest.php   |  2 +-
 .../Unit/Query/TermLevel/PrefixQueryTest.php  |  2 +-
 tests/Unit/Query/TermLevel/RangeQueryTest.php |  2 +-
 .../Unit/Query/TermLevel/RegexpQueryTest.php  |  2 +-
 tests/Unit/Query/TermLevel/TermQueryTest.php  |  2 +-
 tests/Unit/Query/TermLevel/TermsQueryTest.php |  2 +-
 tests/Unit/Query/TermLevel/TypeQueryTest.php  |  2 +-
 .../Query/TermLevel/WildcardQueryTest.php     |  2 +-
 .../AggregationsEndpointTest.php              |  2 +-
 .../SearchEndpoint/HighlightEndpointTest.php  |  2 +-
 .../SearchEndpoint/InnerHitsEndpointTest.php  |  2 +-
 .../SearchEndpoint/PostFilterEndpointTest.php |  2 +-
 .../Unit/SearchEndpoint/QueryEndpointTest.php |  2 +-
 .../SearchEndpointFactoryTest.php             |  2 +-
 .../Unit/SearchEndpoint/SortEndpointTest.php  |  2 +-
 .../SearchEndpoint/SuggestEndpointTest.php    |  2 +-
 tests/Unit/SearchTest.php                     |  2 +-
 tests/Unit/Suggest/SuggestTest.php            |  2 +-
 97 files changed, 109 insertions(+), 115 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 54d8539..1f81f3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,22 @@
-sudo: true
+sudo: false
 language: php
 php:
-  - 5.6
   - 7.0
   - 7.1
-  - hhvm
+  - 7.2
 env:
   global:
-    - JAVA_HOME="/usr/lib/jvm/java-8-oracle/jre"
-    - ELASRICSEARCH_HOST="127.0.0.1:9200"
-    - ES_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.1.2.zip"
-matrix:
-  allow_failures:
-    - php: hhvm
+    - ES_VERSION=6.2.2 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
 install:
-  # Container based PHP image ues PHP 5.6.5, once it will be upgraded sudo will be not necessary
-  - sudo apt-get install -y oracle-java8-set-default
-  - curl -L -o elasticsearch.zip $ES_URL
-  - unzip elasticsearch.zip
-  - ./elasticsearch-*/bin/elasticsearch -d -Escript.inline=true -Escript.stored=true
+  - wget ${ES_DOWNLOAD_URL}
+  - tar -xzf elasticsearch-${ES_VERSION}.tar.gz
+  - ./elasticsearch-${ES_VERSION}/bin/elasticsearch -d
 before_script:
   - composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH
   - 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/phpcs -p --standard=PSR2 --ignore=vendor/ ./
 after_script:
-  - travis_retry php vendor/bin/coveralls
+  - travis_retry php vendor/bin/coveralls
\ No newline at end of file
diff --git a/composer.json b/composer.json
index c9db5e9..5a33e2a 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     "require-dev": {
         "phpunit/phpunit": "~6.0",
         "squizlabs/php_codesniffer": "~3.0",
-        "satooshi/php-coveralls": "~1.0"
+        "satooshi/php-coveralls": "~2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Aggregation/Matrix/MatrixStatsAggregation.php b/src/Aggregation/Matrix/MatrixStatsAggregation.php
index 7e8d96c..5fb916d 100644
--- a/src/Aggregation/Matrix/MatrixStatsAggregation.php
+++ b/src/Aggregation/Matrix/MatrixStatsAggregation.php
@@ -10,6 +10,7 @@
  */
 
 namespace ONGR\ElasticsearchDSL\Aggregation\Matrix;
+
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Type\MetricTrait;
 
@@ -96,12 +97,12 @@ class MaxAggregation extends AbstractAggregation
             $out['fields'] = $this->getField();
         }
 
-        if($this->getMode()) {
+        if ($this->getMode()) {
             $out['mode'] = $this->getMode();
         }
 
 
-        if($this->getMissing()) {
+        if ($this->getMissing()) {
             $out['missing'] = $this->getMissing();
         }
 
diff --git a/tests/Functional/AbstractElasticsearchTestCase.php b/tests/Functional/AbstractElasticsearchTestCase.php
index 2b5ecfc..f1387ad 100644
--- a/tests/Functional/AbstractElasticsearchTestCase.php
+++ b/tests/Functional/AbstractElasticsearchTestCase.php
@@ -15,7 +15,7 @@ use Elasticsearch\Client;
 use Elasticsearch\ClientBuilder;
 use ONGR\ElasticsearchDSL\Search;
 
-abstract class AbstractElasticsearchTestCase extends \PHPUnit_Framework_TestCase
+abstract class AbstractElasticsearchTestCase extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test index name in the elasticsearch.
diff --git a/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php b/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php
index 3e00aca..f4cb6b3 100644
--- a/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Bucketing\ChildrenAggregation;
 /**
  * Unit test for children aggregation.
  */
-class ChildrenAggregationTest extends \PHPUnit_Framework_TestCase
+class ChildrenAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests if ChildrenAggregation#getArray throws exception when expected.
diff --git a/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php
index da340c6..6f7544b 100644
--- a/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Bucketing\DateHistogramAggregation;
 /**
  * Unit test for children aggregation.
  */
-class DateHistogramAggregationTest extends \PHPUnit_Framework_TestCase
+class DateHistogramAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests if ChildrenAggregation#getArray throws exception when expected.
diff --git a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php
index 8fc3bbb..80514f2 100644
--- a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\DateRangeAggregation;
 
-class DateRangeAggregationTest extends \PHPUnit_Framework_TestCase
+class DateRangeAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown.
@@ -121,7 +121,7 @@ class DateRangeAggregationTest extends \PHPUnit_Framework_TestCase
             ->getMock();
         $aggregation->expects($this->once())->method('setField')->with($field);
         $aggregation->expects($this->once())->method('setFormat')->with($format);
-        $aggregation->expects($this->exactly(count($ranges)))->method('addRange');
+        $aggregation->expects($this->exactly(count($ranges ?? [])))->method('addRange');
 
         if ($field !== null) {
             if ($format !== null) {
diff --git a/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php
index 7b79c21..b453e01 100644
--- a/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php
@@ -18,7 +18,7 @@ use ONGR\ElasticsearchDSL\Query\TermLevel\ExistsQuery;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
 use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 
-class FilterAggregationTest extends \PHPUnit_Framework_TestCase
+class FilterAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider for testToArray.
diff --git a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php
index f5b4369..b3032a3 100644
--- a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php
@@ -17,7 +17,7 @@ use ONGR\ElasticsearchDSL\BuilderInterface;
 /**
  * Unit test for filters aggregation.
  */
-class FiltersAggregationTest extends \PHPUnit_Framework_TestCase
+class FiltersAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when not anonymous filter is without name.
diff --git a/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php
index c19b1f1..89f2f5d 100644
--- a/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\GeoDistanceAggregation;
 
-class GeoDistanceAggregationTest extends \PHPUnit_Framework_TestCase
+class GeoDistanceAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when field is not set.
diff --git a/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php
index 627a4f3..1ef28d3 100644
--- a/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Bucketing\GeoHashGridAggregation;
 /**
  * Unit test for geohash grid aggregation.
  */
-class GeoHashGridAggregationTest extends \PHPUnit_Framework_TestCase
+class GeoHashGridAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown.
diff --git a/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php
index 03f5ca9..725ed28 100644
--- a/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\GlobalAggregation;
 
-class GlobalAggregationTest extends \PHPUnit_Framework_TestCase
+class GlobalAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider for testToArray().
diff --git a/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php
index f6b60db..7566efe 100644
--- a/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\Ipv4RangeAggregation;
 
-class Ipv4RangeAggregationTest extends \PHPUnit_Framework_TestCase
+class Ipv4RangeAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test exception when field and range are not set.
diff --git a/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php b/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php
index 11f6b4a..613d97b 100644
--- a/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\MissingAggregation;
 
-class MissingAggregationTest extends \PHPUnit_Framework_TestCase
+class MissingAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when field is not set.
diff --git a/tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php b/tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php
index 51886af..b4458f1 100644
--- a/tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php
@@ -14,7 +14,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\NestedAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation;
 
-class NestedAggregationTest extends \PHPUnit_Framework_TestCase
+class NestedAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for nested aggregation toArray() method exception.
diff --git a/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php
index 741a0be..55134a8 100644
--- a/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\RangeAggregation;
 
-class RangeAggregationTest extends \PHPUnit_Framework_TestCase
+class RangeAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test addRange method.
diff --git a/tests/Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php b/tests/Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php
index e14a055..11ed18f 100644
--- a/tests/Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php
@@ -14,7 +14,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\ReverseNestedAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation;
 
-class ReverseNestedAggregationTest extends \PHPUnit_Framework_TestCase
+class ReverseNestedAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for reverse_nested aggregation toArray() method exception.
diff --git a/tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php b/tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php
index 09a9455..0bbb209 100644
--- a/tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php
@@ -17,7 +17,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation;
 /**
  * Unit test for children aggregation.
  */
-class SamplerAggregationTest extends \PHPUnit_Framework_TestCase
+class SamplerAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests getType method.
diff --git a/tests/Unit/Aggregation/Bucketing/SignificantTermsAggregationTest.php b/tests/Unit/Aggregation/Bucketing/SignificantTermsAggregationTest.php
index 98da346..c6cf213 100644
--- a/tests/Unit/Aggregation/Bucketing/SignificantTermsAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/SignificantTermsAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Bucketing\SignificantTermsAggregation;
 /**
  * Unit test for children aggregation.
  */
-class SignificantTermsAggregationTest extends \PHPUnit_Framework_TestCase
+class SignificantTermsAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests getType method.
diff --git a/tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php b/tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php
index ea9c826..4792441 100644
--- a/tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation;
 
-class TermsAggregationTest extends \PHPUnit_Framework_TestCase
+class TermsAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests setField method.
diff --git a/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php b/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php
index 14cf1b0..8ec9f2c 100644
--- a/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Metric\CardinalityAggregation;
 /**
  * Unit test for cardinality aggregation.
  */
-class CardinalityAggregationTest extends \PHPUnit_Framework_TestCase
+class CardinalityAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests getArray method.
diff --git a/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php b/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php
index 02984bf..efccb9b 100644
--- a/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Metric\GeoBoundsAggregation;
 /**
  * Unit test for geo bounds aggregation.
  */
-class GeoBoundsAggregationTest extends \PHPUnit_Framework_TestCase
+class GeoBoundsAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown.
diff --git a/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php b/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php
index 4f263e5..dca1457 100644
--- a/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Metric\GeoCentroidAggregation;
 /**
  * Unit test for children aggregation.
  */
-class GeoCentroidAggregationTest extends \PHPUnit_Framework_TestCase
+class GeoCentroidAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when field is not provided
diff --git a/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php b/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php
index dd3ae46..12aeffc 100644
--- a/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Metric\PercentileRanksAggregation;
 /**
  * Percentile ranks aggregation unit tests.
  */
-class PercentileRanksAggregationTest extends \PHPUnit_Framework_TestCase
+class PercentileRanksAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var PercentileRanksAggregation
diff --git a/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php b/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php
index b7cbec2..aa98aa3 100644
--- a/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Metric\PercentilesAggregation;
 
-class PercentilesAggregationTest extends \PHPUnit_Framework_TestCase
+class PercentilesAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests if PercentilesAggregation#getArray throws exception when expected.
diff --git a/tests/Unit/Aggregation/Metric/StatsAggregationTest.php b/tests/Unit/Aggregation/Metric/StatsAggregationTest.php
index 794bb80..e130641 100644
--- a/tests/Unit/Aggregation/Metric/StatsAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/StatsAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Metric\StatsAggregation;
 
-class StatsAggregationTest extends \PHPUnit_Framework_TestCase
+class StatsAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for stats aggregation toArray() method.
diff --git a/tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php b/tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php
index 53f6294..046390a 100644
--- a/tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php
@@ -17,7 +17,7 @@ use ONGR\ElasticsearchDSL\Sort\FieldSort;
 /**
  * Unit tests for top hits aggregation.
  */
-class TopHitsAggregationTest extends \PHPUnit_Framework_TestCase
+class TopHitsAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Check if aggregation returns the expected array.
diff --git a/tests/Unit/Aggregation/Pipeline/AvgBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/AvgBucketAggregationTest.php
index e468224..d4d26af 100644
--- a/tests/Unit/Aggregation/Pipeline/AvgBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/AvgBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\AvgBucketAggregation;
 /**
  * Unit test for avg_bucket aggregation.
  */
-class AvgBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class AvgBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests getArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/BucketScriptAggregationTest.php b/tests/Unit/Aggregation/Pipeline/BucketScriptAggregationTest.php
index 8f75353..16c85b6 100644
--- a/tests/Unit/Aggregation/Pipeline/BucketScriptAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/BucketScriptAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\BucketScriptAggregation;
 /**
  * Unit test for bucket script pipeline aggregation.
  */
-class BucketScriptAggregationTest extends \PHPUnit_Framework_TestCase
+class BucketScriptAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/BucketSelectorAggregationTest.php b/tests/Unit/Aggregation/Pipeline/BucketSelectorAggregationTest.php
index d54f61f..c8edbc9 100644
--- a/tests/Unit/Aggregation/Pipeline/BucketSelectorAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/BucketSelectorAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\BucketSelectorAggregation;
 /**
  * Unit test for bucket selector pipeline aggregation.
  */
-class BucketSelectorAggregationTest extends \PHPUnit_Framework_TestCase
+class BucketSelectorAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/CumulativeSumAggregationTest.php b/tests/Unit/Aggregation/Pipeline/CumulativeSumAggregationTest.php
index e5cebf8..2a90494 100644
--- a/tests/Unit/Aggregation/Pipeline/CumulativeSumAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/CumulativeSumAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\CumulativeSumAggregation;
 /**
  * Unit test for cumulative sum aggregation.
  */
-class CumulativeSumAggregationTest extends \PHPUnit_Framework_TestCase
+class CumulativeSumAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/DerivativeAggregationTest.php b/tests/Unit/Aggregation/Pipeline/DerivativeAggregationTest.php
index ada4424..2d37b5a 100644
--- a/tests/Unit/Aggregation/Pipeline/DerivativeAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/DerivativeAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\DerivativeAggregation;
 /**
  * Unit test for derivative aggregation.
  */
-class DerivativeAggregationTest extends \PHPUnit_Framework_TestCase
+class DerivativeAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/ExtendedStatsBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/ExtendedStatsBucketAggregationTest.php
index de15f10..69f3efc 100644
--- a/tests/Unit/Aggregation/Pipeline/ExtendedStatsBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/ExtendedStatsBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\ExtendedStatsBucketAggregation;
 /**
  * Unit test for stats bucket aggregation.
  */
-class ExtendedStatsBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class ExtendedStatsBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/MaxBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/MaxBucketAggregationTest.php
index a5f9d07..db8af08 100644
--- a/tests/Unit/Aggregation/Pipeline/MaxBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/MaxBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\MaxBucketAggregation;
 /**
  * Unit test for max bucket aggregation.
  */
-class MaxBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class MaxBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/MinBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/MinBucketAggregationTest.php
index c570569..cee5c0c 100644
--- a/tests/Unit/Aggregation/Pipeline/MinBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/MinBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\MinBucketAggregation;
 /**
  * Unit test for min bucket aggregation.
  */
-class MinBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class MinBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/PercentilesBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/PercentilesBucketAggregationTest.php
index ae94d77..21ecc1b 100644
--- a/tests/Unit/Aggregation/Pipeline/PercentilesBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/PercentilesBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\PercentilesBucketAggregation;
 /**
  * Unit test for percentiles bucket aggregation.
  */
-class PercentilesBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class PercentilesBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/SerialDifferencingAggregationTest.php b/tests/Unit/Aggregation/Pipeline/SerialDifferencingAggregationTest.php
index 77e75e8..41c0bac 100644
--- a/tests/Unit/Aggregation/Pipeline/SerialDifferencingAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/SerialDifferencingAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\SerialDifferencingAggregation;
 /**
  * Unit test for serial differencing aggregation.
  */
-class SerialDifferencingAggregationTest extends \PHPUnit_Framework_TestCase
+class SerialDifferencingAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/StatsBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/StatsBucketAggregationTest.php
index 876ee8d..3bf5dd4 100644
--- a/tests/Unit/Aggregation/Pipeline/StatsBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/StatsBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\StatsBucketAggregation;
 /**
  * Unit test for stats bucket aggregation.
  */
-class StatsBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class StatsBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/SumBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/SumBucketAggregationTest.php
index 2ee9a4a..2e11754 100644
--- a/tests/Unit/Aggregation/Pipeline/SumBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/SumBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\SumBucketAggregation;
 /**
  * Unit test for sum bucket aggregation.
  */
-class SumBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class SumBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/BuilderBagTest.php b/tests/Unit/BuilderBagTest.php
index 44228a5..49d6a2f 100644
--- a/tests/Unit/BuilderBagTest.php
+++ b/tests/Unit/BuilderBagTest.php
@@ -14,7 +14,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit;
 use ONGR\ElasticsearchDSL\BuilderBag;
 use ONGR\ElasticsearchDSL\BuilderInterface;
 
-class BuilderBagTest extends \PHPUnit_Framework_TestCase
+class BuilderBagTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests if bag knows if he has a builder.
diff --git a/tests/Unit/Highlight/HighlightTest.php b/tests/Unit/Highlight/HighlightTest.php
index ede0f36..bc5ddaa 100644
--- a/tests/Unit/Highlight/HighlightTest.php
+++ b/tests/Unit/Highlight/HighlightTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Highlight;
 
 use ONGR\ElasticsearchDSL\Highlight\Highlight;
 
-class HighlightTest extends \PHPUnit_Framework_TestCase
+class HighlightTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests GetType method, it should return 'highlight'.
diff --git a/tests/Unit/InnerHit/NestedInnerHitTest.php b/tests/Unit/InnerHit/NestedInnerHitTest.php
index 1fb042c..0e1ee2c 100644
--- a/tests/Unit/InnerHit/NestedInnerHitTest.php
+++ b/tests/Unit/InnerHit/NestedInnerHitTest.php
@@ -7,7 +7,7 @@ use ONGR\ElasticsearchDSL\Query\FullText\MatchQuery;
 use ONGR\ElasticsearchDSL\Query\Joining\NestedQuery;
 use ONGR\ElasticsearchDSL\Search;
 
-class NestedInnerHitTest extends \PHPUnit_Framework_TestCase
+class NestedInnerHitTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider for testToArray().
diff --git a/tests/Unit/InnerHit/ParentInnerHitTest.php b/tests/Unit/InnerHit/ParentInnerHitTest.php
index 65c18db..7794b9b 100644
--- a/tests/Unit/InnerHit/ParentInnerHitTest.php
+++ b/tests/Unit/InnerHit/ParentInnerHitTest.php
@@ -6,7 +6,7 @@ use ONGR\ElasticsearchDSL\InnerHit\ParentInnerHit;
 use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 use ONGR\ElasticsearchDSL\Search;
 
-class ParentInnerHitTest extends \PHPUnit_Framework_TestCase
+class ParentInnerHitTest extends \PHPUnit\Framework\TestCase
 {
     public function testToArray()
     {
diff --git a/tests/Unit/ParametersTraitTest.php b/tests/Unit/ParametersTraitTest.php
index 8b3e9f6..d456e28 100644
--- a/tests/Unit/ParametersTraitTest.php
+++ b/tests/Unit/ParametersTraitTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\ParametersTrait;
 /**
  * Test for ParametersTrait.
  */
-class ParametersTraitTest extends \PHPUnit_Framework_TestCase
+class ParametersTraitTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var ParametersTrait
diff --git a/tests/Unit/Query/Compound/BoolQueryTest.php b/tests/Unit/Query/Compound/BoolQueryTest.php
index b2e3da1..4eb0417 100644
--- a/tests/Unit/Query/Compound/BoolQueryTest.php
+++ b/tests/Unit/Query/Compound/BoolQueryTest.php
@@ -18,7 +18,7 @@ use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 /**
  * Unit test for Bool.
  */
-class BoolQueryTest extends \PHPUnit_Framework_TestCase
+class BoolQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for addToBool() without setting a correct bool operator.
diff --git a/tests/Unit/Query/Compound/BoostingQueryTest.php b/tests/Unit/Query/Compound/BoostingQueryTest.php
index 08549bd..7fa687b 100644
--- a/tests/Unit/Query/Compound/BoostingQueryTest.php
+++ b/tests/Unit/Query/Compound/BoostingQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound;
 
 use ONGR\ElasticsearchDSL\Query\Compound\BoostingQuery;
 
-class BoostingQueryTest extends \PHPUnit_Framework_TestCase
+class BoostingQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/Compound/ConstantScoreQueryTest.php b/tests/Unit/Query/Compound/ConstantScoreQueryTest.php
index e5bb2e2..c1a11dc 100644
--- a/tests/Unit/Query/Compound/ConstantScoreQueryTest.php
+++ b/tests/Unit/Query/Compound/ConstantScoreQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound;
 
 use ONGR\ElasticsearchDSL\Query\Compound\ConstantScoreQuery;
 
-class ConstantScoreQueryTest extends \PHPUnit_Framework_TestCase
+class ConstantScoreQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/Compound/DisMaxQueryTest.php b/tests/Unit/Query/Compound/DisMaxQueryTest.php
index 833ad0c..cbdda1f 100644
--- a/tests/Unit/Query/Compound/DisMaxQueryTest.php
+++ b/tests/Unit/Query/Compound/DisMaxQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound;
 
 use ONGR\ElasticsearchDSL\Query\Compound\DisMaxQuery;
 
-class DisMaxQueryTest extends \PHPUnit_Framework_TestCase
+class DisMaxQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/Compound/FunctionScoreQueryTest.php b/tests/Unit/Query/Compound/FunctionScoreQueryTest.php
index 508881b..9997b0b 100644
--- a/tests/Unit/Query/Compound/FunctionScoreQueryTest.php
+++ b/tests/Unit/Query/Compound/FunctionScoreQueryTest.php
@@ -19,7 +19,7 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
 /**
  * Tests for FunctionScoreQuery.
  */
-class FunctionScoreQueryTest extends \PHPUnit_Framework_TestCase
+class FunctionScoreQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider for testAddRandomFunction.
diff --git a/tests/Unit/Query/Compound/IndicesQueryTest.php b/tests/Unit/Query/Compound/IndicesQueryTest.php
index 268d8a4..72f1778 100644
--- a/tests/Unit/Query/Compound/IndicesQueryTest.php
+++ b/tests/Unit/Query/Compound/IndicesQueryTest.php
@@ -14,7 +14,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound;
 use ONGR\ElasticsearchDSL\BuilderInterface;
 use ONGR\ElasticsearchDSL\Query\Compound\IndicesQuery;
 
-class IndicesQueryTest extends \PHPUnit_Framework_TestCase
+class IndicesQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @return \PHPUnit_Framework_MockObject_MockObject|BuilderInterface
diff --git a/tests/Unit/Query/FullText/CommonTermsQueryTest.php b/tests/Unit/Query/FullText/CommonTermsQueryTest.php
index 4e6e476..8a38713 100644
--- a/tests/Unit/Query/FullText/CommonTermsQueryTest.php
+++ b/tests/Unit/Query/FullText/CommonTermsQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\CommonTermsQuery;
 
-class CommonTermsQueryTest extends \PHPUnit_Framework_TestCase
+class CommonTermsQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/FullText/MatchPhrasePrefixQueryTest.php b/tests/Unit/Query/FullText/MatchPhrasePrefixQueryTest.php
index 32c6117..9a0d651 100644
--- a/tests/Unit/Query/FullText/MatchPhrasePrefixQueryTest.php
+++ b/tests/Unit/Query/FullText/MatchPhrasePrefixQueryTest.php
@@ -12,9 +12,9 @@
 namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\MatchPhrasePrefixQuery;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class MatchPhrasePrefixQueryTest extends PHPUnit_Framework_TestCase
+class MatchPhrasePrefixQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/FullText/MatchPhraseQueryTest.php b/tests/Unit/Query/FullText/MatchPhraseQueryTest.php
index 6614f0d..0bd142c 100644
--- a/tests/Unit/Query/FullText/MatchPhraseQueryTest.php
+++ b/tests/Unit/Query/FullText/MatchPhraseQueryTest.php
@@ -12,9 +12,9 @@
 namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\MatchPhraseQuery;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class MatchPhraseQueryTest extends PHPUnit_Framework_TestCase
+class MatchPhraseQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/FullText/MatchQueryTest.php b/tests/Unit/Query/FullText/MatchQueryTest.php
index e186ca4..e1b664f 100644
--- a/tests/Unit/Query/FullText/MatchQueryTest.php
+++ b/tests/Unit/Query/FullText/MatchQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\MatchQuery;
 
-class MatchQueryTest extends \PHPUnit_Framework_TestCase
+class MatchQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/FullText/MultiMatchQueryTest.php b/tests/Unit/Query/FullText/MultiMatchQueryTest.php
index 3ee1460..a21e68d 100644
--- a/tests/Unit/Query/FullText/MultiMatchQueryTest.php
+++ b/tests/Unit/Query/FullText/MultiMatchQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\MultiMatchQuery;
 
-class MultiMatchQueryTest extends \PHPUnit_Framework_TestCase
+class MultiMatchQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/FullText/QueryStringQueryTest.php b/tests/Unit/Query/FullText/QueryStringQueryTest.php
index 1a07a25..7d8337d 100644
--- a/tests/Unit/Query/FullText/QueryStringQueryTest.php
+++ b/tests/Unit/Query/FullText/QueryStringQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\QueryStringQuery;
 
-class QueryStringQueryTest extends \PHPUnit_Framework_TestCase
+class QueryStringQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/FullText/SimpleQueryStringQueryTest.php b/tests/Unit/Query/FullText/SimpleQueryStringQueryTest.php
index 396bd3d..fd6d10c 100644
--- a/tests/Unit/Query/FullText/SimpleQueryStringQueryTest.php
+++ b/tests/Unit/Query/FullText/SimpleQueryStringQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\SimpleQueryStringQuery;
 
-class SimpleQueryStringQueryTest extends \PHPUnit_Framework_TestCase
+class SimpleQueryStringQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php b/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php
index 63f292b..f7bb6ff 100644
--- a/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php
+++ b/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo;
 
 use ONGR\ElasticsearchDSL\Query\Geo\GeoBoundingBoxQuery;
 
-class GeoBoundingBoxQueryTest extends \PHPUnit_Framework_TestCase
+class GeoBoundingBoxQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when geo points are not set.
diff --git a/tests/Unit/Query/Geo/GeoDistanceQueryTest.php b/tests/Unit/Query/Geo/GeoDistanceQueryTest.php
index 959da13..b7f416d 100644
--- a/tests/Unit/Query/Geo/GeoDistanceQueryTest.php
+++ b/tests/Unit/Query/Geo/GeoDistanceQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo;
 
 use ONGR\ElasticsearchDSL\Query\Geo\GeoDistanceQuery;
 
-class GeoDistanceQueryTest extends \PHPUnit_Framework_TestCase
+class GeoDistanceQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider for testToArray().
diff --git a/tests/Unit/Query/Geo/GeoDistanceRangeQueryTest.php b/tests/Unit/Query/Geo/GeoDistanceRangeQueryTest.php
index 579d1be..f4a32cc 100644
--- a/tests/Unit/Query/Geo/GeoDistanceRangeQueryTest.php
+++ b/tests/Unit/Query/Geo/GeoDistanceRangeQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo;
 
 use ONGR\ElasticsearchDSL\Query\Geo\GeoDistanceRangeQuery;
 
-class GeoDistanceRangeQueryTest extends \PHPUnit_Framework_TestCase
+class GeoDistanceRangeQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider to testToArray.
diff --git a/tests/Unit/Query/Geo/GeoPolygonQueryTest.php b/tests/Unit/Query/Geo/GeoPolygonQueryTest.php
index e1c250c..1edcaf9 100644
--- a/tests/Unit/Query/Geo/GeoPolygonQueryTest.php
+++ b/tests/Unit/Query/Geo/GeoPolygonQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo;
 
 use ONGR\ElasticsearchDSL\Query\Geo\GeoPolygonQuery;
 
-class GeoPolygonQueryTest extends \PHPUnit_Framework_TestCase
+class GeoPolygonQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider to testToArray.
diff --git a/tests/Unit/Query/Geo/GeoShapeQueryTest.php b/tests/Unit/Query/Geo/GeoShapeQueryTest.php
index 9771144..a0135bf 100644
--- a/tests/Unit/Query/Geo/GeoShapeQueryTest.php
+++ b/tests/Unit/Query/Geo/GeoShapeQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo;
 
 use ONGR\ElasticsearchDSL\Query\Geo\GeoShapeQuery;
 
-class GeoShapeQueryTest extends \PHPUnit_Framework_TestCase
+class GeoShapeQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray() method.
diff --git a/tests/Unit/Query/Joining/HasChildQueryTest.php b/tests/Unit/Query/Joining/HasChildQueryTest.php
index 93dc7d5..147ca67 100644
--- a/tests/Unit/Query/Joining/HasChildQueryTest.php
+++ b/tests/Unit/Query/Joining/HasChildQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Joining;
 
 use ONGR\ElasticsearchDSL\Query\Joining\HasChildQuery;
 
-class HasChildQueryTest extends \PHPUnit_Framework_TestCase
+class HasChildQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests whether __constructor calls setParameters method.
diff --git a/tests/Unit/Query/Joining/HasParentQueryTest.php b/tests/Unit/Query/Joining/HasParentQueryTest.php
index 570246a..7601815 100644
--- a/tests/Unit/Query/Joining/HasParentQueryTest.php
+++ b/tests/Unit/Query/Joining/HasParentQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Joining;
 
 use ONGR\ElasticsearchDSL\Query\Joining\HasParentQuery;
 
-class HasParentQueryTest extends \PHPUnit_Framework_TestCase
+class HasParentQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests whether __constructor calls setParameters method.
diff --git a/tests/Unit/Query/Joining/NestedQueryTest.php b/tests/Unit/Query/Joining/NestedQueryTest.php
index dc273b4..0291e72 100644
--- a/tests/Unit/Query/Joining/NestedQueryTest.php
+++ b/tests/Unit/Query/Joining/NestedQueryTest.php
@@ -14,7 +14,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Joining;
 use ONGR\ElasticsearchDSL\Query\Joining\NestedQuery;
 use ONGR\ElasticsearchDSL\Query\TermLevel\TermsQuery;
 
-class NestedQueryTest extends \PHPUnit_Framework_TestCase
+class NestedQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider to testGetToArray.
diff --git a/tests/Unit/Query/MatchAllQueryTest.php b/tests/Unit/Query/MatchAllQueryTest.php
index f513818..bab4cc0 100644
--- a/tests/Unit/Query/MatchAllQueryTest.php
+++ b/tests/Unit/Query/MatchAllQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query;
 
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
 
-class MatchAllQueryTest extends \PHPUnit_Framework_TestCase
+class MatchAllQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/Span/SpanContainingQueryTest.php b/tests/Unit/Query/Span/SpanContainingQueryTest.php
index 2c0c9ba..71411ab 100644
--- a/tests/Unit/Query/Span/SpanContainingQueryTest.php
+++ b/tests/Unit/Query/Span/SpanContainingQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanContainingQuery;
 /**
  * Unit test for SpanContainingQuery.
  */
-class SpanContainingQueryTest extends \PHPUnit_Framework_TestCase
+class SpanContainingQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Span/SpanFirstQueryTest.php b/tests/Unit/Query/Span/SpanFirstQueryTest.php
index d976bf3..fbff909 100644
--- a/tests/Unit/Query/Span/SpanFirstQueryTest.php
+++ b/tests/Unit/Query/Span/SpanFirstQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanFirstQuery;
 /**
  * Unit test for SpanFirstQuery.
  */
-class SpanFirstQueryTest extends \PHPUnit_Framework_TestCase
+class SpanFirstQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Span/SpanMultiTermQueryTest.php b/tests/Unit/Query/Span/SpanMultiTermQueryTest.php
index 1c18fda..e6f4f80 100644
--- a/tests/Unit/Query/Span/SpanMultiTermQueryTest.php
+++ b/tests/Unit/Query/Span/SpanMultiTermQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanMultiTermQuery;
 /**
  * Unit test for SpanMultiTermQuery.
  */
-class SpanMultiTermQueryTest extends \PHPUnit_Framework_TestCase
+class SpanMultiTermQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for toArray().
diff --git a/tests/Unit/Query/Span/SpanNearQueryTest.php b/tests/Unit/Query/Span/SpanNearQueryTest.php
index 60f3f8d..a71d073 100644
--- a/tests/Unit/Query/Span/SpanNearQueryTest.php
+++ b/tests/Unit/Query/Span/SpanNearQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanNearQuery;
 /**
  * Unit test for SpanNearQuery.
  */
-class SpanNearQueryTest extends \PHPUnit_Framework_TestCase
+class SpanNearQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Span/SpanNotQueryTest.php b/tests/Unit/Query/Span/SpanNotQueryTest.php
index 2fef79b..0fb002f 100644
--- a/tests/Unit/Query/Span/SpanNotQueryTest.php
+++ b/tests/Unit/Query/Span/SpanNotQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanNotQuery;
 /**
  * Unit test for SpanNotQuery.
  */
-class SpanNotQueryTest extends \PHPUnit_Framework_TestCase
+class SpanNotQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Span/SpanOrQueryTest.php b/tests/Unit/Query/Span/SpanOrQueryTest.php
index e7dfab8..537caf4 100644
--- a/tests/Unit/Query/Span/SpanOrQueryTest.php
+++ b/tests/Unit/Query/Span/SpanOrQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanOrQuery;
 /**
  * Unit test for SpanOrQuery.
  */
-class SpanOrQueryTest extends \PHPUnit_Framework_TestCase
+class SpanOrQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Span/SpanTermQueryTest.php b/tests/Unit/Query/Span/SpanTermQueryTest.php
index fd6b70f..d260a61 100644
--- a/tests/Unit/Query/Span/SpanTermQueryTest.php
+++ b/tests/Unit/Query/Span/SpanTermQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanTermQuery;
 /**
  * Unit test for SpanTermQuery.
  */
-class SpanTermQueryTest extends \PHPUnit_Framework_TestCase
+class SpanTermQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Span/SpanWithinQueryTest.php b/tests/Unit/Query/Span/SpanWithinQueryTest.php
index f6e0255..d0a7c16 100644
--- a/tests/Unit/Query/Span/SpanWithinQueryTest.php
+++ b/tests/Unit/Query/Span/SpanWithinQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanWithinQuery;
 /**
  * Unit test for SpanWithinQuery.
  */
-class SpanWithinQueryTest extends \PHPUnit_Framework_TestCase
+class SpanWithinQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Specialized/MoreLikeThisQueryTest.php b/tests/Unit/Query/Specialized/MoreLikeThisQueryTest.php
index 44e62db..557b40e 100644
--- a/tests/Unit/Query/Specialized/MoreLikeThisQueryTest.php
+++ b/tests/Unit/Query/Specialized/MoreLikeThisQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Specialized;
 
 use ONGR\ElasticsearchDSL\Query\Specialized\MoreLikeThisQuery;
 
-class MoreLikeThisQueryTest extends \PHPUnit_Framework_TestCase
+class MoreLikeThisQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/Specialized/ScriptQueryTest.php b/tests/Unit/Query/Specialized/ScriptQueryTest.php
index 27c265f..7327f15 100644
--- a/tests/Unit/Query/Specialized/ScriptQueryTest.php
+++ b/tests/Unit/Query/Specialized/ScriptQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Specialized;
 
 use ONGR\ElasticsearchDSL\Query\Specialized\ScriptQuery;
 
-class ScriptQueryTest extends \PHPUnit_Framework_TestCase
+class ScriptQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider for testToArray().
diff --git a/tests/Unit/Query/Specialized/TemplateQueryTest.php b/tests/Unit/Query/Specialized/TemplateQueryTest.php
index 3ede55e..80e497a 100644
--- a/tests/Unit/Query/Specialized/TemplateQueryTest.php
+++ b/tests/Unit/Query/Specialized/TemplateQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Specialized\TemplateQuery;
 /**
  * Unit test for Template.
  */
-class TemplateQueryTest extends \PHPUnit_Framework_TestCase
+class TemplateQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray() method with inline.
diff --git a/tests/Unit/Query/TermLevel/ExistsQueryTest.php b/tests/Unit/Query/TermLevel/ExistsQueryTest.php
index 07c739f..9ffd57e 100644
--- a/tests/Unit/Query/TermLevel/ExistsQueryTest.php
+++ b/tests/Unit/Query/TermLevel/ExistsQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\TermLevel\ExistsQuery;
 /**
  * Unit test for ExistsQuery.
  */
-class ExistsQueryTest extends \PHPUnit_Framework_TestCase
+class ExistsQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray() method.
diff --git a/tests/Unit/Query/TermLevel/FuzzyQueryTest.php b/tests/Unit/Query/TermLevel/FuzzyQueryTest.php
index 0433205..8eeb599 100644
--- a/tests/Unit/Query/TermLevel/FuzzyQueryTest.php
+++ b/tests/Unit/Query/TermLevel/FuzzyQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\FuzzyQuery;
 
-class FuzzyQueryTest extends \PHPUnit_Framework_TestCase
+class FuzzyQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/IdsQueryTest.php b/tests/Unit/Query/TermLevel/IdsQueryTest.php
index d29c305..eda356f 100644
--- a/tests/Unit/Query/TermLevel/IdsQueryTest.php
+++ b/tests/Unit/Query/TermLevel/IdsQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\IdsQuery;
 
-class IdsQueryTest extends \PHPUnit_Framework_TestCase
+class IdsQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/PrefixQueryTest.php b/tests/Unit/Query/TermLevel/PrefixQueryTest.php
index caafbbc..54604b5 100644
--- a/tests/Unit/Query/TermLevel/PrefixQueryTest.php
+++ b/tests/Unit/Query/TermLevel/PrefixQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\PrefixQuery;
 
-class PrefixQueryTest extends \PHPUnit_Framework_TestCase
+class PrefixQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/RangeQueryTest.php b/tests/Unit/Query/TermLevel/RangeQueryTest.php
index ad6ee1a..9506b06 100644
--- a/tests/Unit/Query/TermLevel/RangeQueryTest.php
+++ b/tests/Unit/Query/TermLevel/RangeQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\RangeQuery;
 
-class RangeQueryTest extends \PHPUnit_Framework_TestCase
+class RangeQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/RegexpQueryTest.php b/tests/Unit/Query/TermLevel/RegexpQueryTest.php
index 7bc78c6..37035df 100644
--- a/tests/Unit/Query/TermLevel/RegexpQueryTest.php
+++ b/tests/Unit/Query/TermLevel/RegexpQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\RegexpQuery;
 
-class RegexpQueryTest extends \PHPUnit_Framework_TestCase
+class RegexpQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/TermQueryTest.php b/tests/Unit/Query/TermLevel/TermQueryTest.php
index 339938b..70bb264 100644
--- a/tests/Unit/Query/TermLevel/TermQueryTest.php
+++ b/tests/Unit/Query/TermLevel/TermQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 
-class TermQueryTest extends \PHPUnit_Framework_TestCase
+class TermQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/TermsQueryTest.php b/tests/Unit/Query/TermLevel/TermsQueryTest.php
index ba34dc5..a7c128e 100644
--- a/tests/Unit/Query/TermLevel/TermsQueryTest.php
+++ b/tests/Unit/Query/TermLevel/TermsQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\TermsQuery;
 
-class TermsQueryTest extends \PHPUnit_Framework_TestCase
+class TermsQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/TypeQueryTest.php b/tests/Unit/Query/TermLevel/TypeQueryTest.php
index 038c6d8..6a0cd7f 100644
--- a/tests/Unit/Query/TermLevel/TypeQueryTest.php
+++ b/tests/Unit/Query/TermLevel/TypeQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\TypeQuery;
 
-class TypeQueryTest extends \PHPUnit_Framework_TestCase
+class TypeQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for query toArray() method.
diff --git a/tests/Unit/Query/TermLevel/WildcardQueryTest.php b/tests/Unit/Query/TermLevel/WildcardQueryTest.php
index 2dbd119..cbc9518 100644
--- a/tests/Unit/Query/TermLevel/WildcardQueryTest.php
+++ b/tests/Unit/Query/TermLevel/WildcardQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\WildcardQuery;
 
-class WildcardQueryTest extends \PHPUnit_Framework_TestCase
+class WildcardQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for query toArray() method.
diff --git a/tests/Unit/SearchEndpoint/AggregationsEndpointTest.php b/tests/Unit/SearchEndpoint/AggregationsEndpointTest.php
index d08a334..016c1ff 100644
--- a/tests/Unit/SearchEndpoint/AggregationsEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/AggregationsEndpointTest.php
@@ -17,7 +17,7 @@ use ONGR\ElasticsearchDSL\SearchEndpoint\AggregationsEndpoint;
 /**
  * Class AggregationsEndpointTest.
  */
-class AggregationsEndpointTest extends \PHPUnit_Framework_TestCase
+class AggregationsEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchEndpoint/HighlightEndpointTest.php b/tests/Unit/SearchEndpoint/HighlightEndpointTest.php
index c7058e0..5b1a623 100644
--- a/tests/Unit/SearchEndpoint/HighlightEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/HighlightEndpointTest.php
@@ -19,7 +19,7 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
 /**
  * Class HighlightEndpointTest.
  */
-class HighlightEndpointTest extends \PHPUnit_Framework_TestCase
+class HighlightEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php b/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php
index d3d4519..26e2a7a 100644
--- a/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\SearchEndpoint\InnerHitsEndpoint;
 /**
  * Class AggregationsEndpointTest.
  */
-class InnerHitsEndpointTest extends \PHPUnit_Framework_TestCase
+class InnerHitsEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php b/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php
index 4b3b6b8..36adfc3 100644
--- a/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php
@@ -19,7 +19,7 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
 /**
  * Class PostFilterEndpointTest.
  */
-class PostFilterEndpointTest extends \PHPUnit_Framework_TestCase
+class PostFilterEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchEndpoint/QueryEndpointTest.php b/tests/Unit/SearchEndpoint/QueryEndpointTest.php
index 9d4c0d2..5d28e15 100644
--- a/tests/Unit/SearchEndpoint/QueryEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/QueryEndpointTest.php
@@ -19,7 +19,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 /**
  * Unit test class for the QueryEndpoint.
  */
-class QueryEndpointTest extends \PHPUnit_Framework_TestCase
+class QueryEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php b/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php
index 7eefe32..b33028b 100644
--- a/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php
+++ b/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php
@@ -17,7 +17,7 @@ use ONGR\ElasticsearchDSL\SearchEndpoint\SearchEndpointFactory;
 /**
  * Unit test class for search endpoint factory.
  */
-class SearchEndpointFactoryTest extends \PHPUnit_Framework_TestCase
+class SearchEndpointFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests get method exception.
diff --git a/tests/Unit/SearchEndpoint/SortEndpointTest.php b/tests/Unit/SearchEndpoint/SortEndpointTest.php
index 42bc761..7f825bc 100644
--- a/tests/Unit/SearchEndpoint/SortEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/SortEndpointTest.php
@@ -19,7 +19,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 /**
  * Class SortEndpointTest.
  */
-class SortEndpointTest extends \PHPUnit_Framework_TestCase
+class SortEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchEndpoint/SuggestEndpointTest.php b/tests/Unit/SearchEndpoint/SuggestEndpointTest.php
index f71884f..34c8704 100644
--- a/tests/Unit/SearchEndpoint/SuggestEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/SuggestEndpointTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Suggest\Suggest;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-class SuggestEndpointTest extends \PHPUnit_Framework_TestCase
+class SuggestEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchTest.php b/tests/Unit/SearchTest.php
index 3d6972b..bfb2f4d 100644
--- a/tests/Unit/SearchTest.php
+++ b/tests/Unit/SearchTest.php
@@ -20,7 +20,7 @@ use ONGR\ElasticsearchDSL\Suggest\Suggest;
 /**
  * Test for Search.
  */
-class SearchTest extends \PHPUnit_Framework_TestCase
+class SearchTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests Search constructor.
diff --git a/tests/Unit/Suggest/SuggestTest.php b/tests/Unit/Suggest/SuggestTest.php
index 626411a..7ae1789 100644
--- a/tests/Unit/Suggest/SuggestTest.php
+++ b/tests/Unit/Suggest/SuggestTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Suggest;
 
 use ONGR\ElasticsearchDSL\Suggest\Suggest;
 
-class SuggestTest extends \PHPUnit_Framework_TestCase
+class SuggestTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests getType method.
-- 
GitLab