applying PR ongr-io#354

Lindsay Snider · Lindsay Snider · commit ef0fd0b6b317 · 2021-08-27T14:51:09.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 sudo: false
 language: php
 php:
-  - 7.1
   - 7.2
   - 7.3
   - 7.4snapshot
+  - 8.0
 matrix:
   allow_failures:
       - php: 7.4snapshot
diff --git a/composer.json b/composer.json
@@ -11,13 +11,13 @@
         }
     ],
     "require": {
-        "php": "^7.0",
+        "php": "^7.2 || ^8.0",
         "symfony/serializer": "^3.0|^4.0",
         "paragonie/random_compat": "*"
     },
     "require-dev": {
         "elasticsearch/elasticsearch": "^7.0",
-        "phpunit/phpunit": "~6.0",
+        "phpunit/phpunit": "^8.0",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "suggest": {
diff --git a/tests/Functional/AbstractElasticsearchTestCase.php b/tests/Functional/AbstractElasticsearchTestCase.php
@@ -31,7 +31,7 @@ abstract class AbstractElasticsearchTestCase extends TestCase
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -109,7 +109,7 @@ protected function getDataArray()
     /**
      * {@inheritdoc}
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         $this->deleteIndex();
diff --git a/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php b/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php
@@ -20,11 +20,10 @@ class ChildrenAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests if ChildrenAggregation#getArray throws exception when expected.
-     *
-     * @expectedException \LogicException
      */
     public function testGetArrayException()
     {
+        $this->expectException(\LogicException::class);
         $aggregation = new ChildrenAggregation('foo');
         $aggregation->getArray();
     }
diff --git a/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php
@@ -20,11 +20,10 @@ class DateHistogramAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests if ChildrenAggregation#getArray throws exception when expected.
-     *
-     * @expectedException \LogicException
      */
     public function testGetArrayException()
     {
+        $this->expectException(\LogicException::class);
         $aggregation = new DateHistogramAggregation('foo');
         $aggregation->getArray();
     }
diff --git a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php
@@ -17,24 +17,22 @@ class DateRangeAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown.
-     *
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Date range aggregation must have field, format set and range added.
      */
     public function testIfExceptionIsThrownWhenNoParametersAreSet()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Date range aggregation must have field, format set and range added.');
         $agg = new DateRangeAggregation('test_agg');
         $agg->getArray();
     }
 
     /**
      * Test if exception is thrown when both range parameters are null.
-     *
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Either from or to must be set. Both cannot be null.
      */
     public function testIfExceptionIsThrownWhenBothRangesAreNull()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Either from or to must be set. Both cannot be null.');
         $agg = new DateRangeAggregation('test_agg');
         $agg->addRange(null, null);
     }
diff --git a/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php
@@ -101,24 +101,22 @@ public function testToArray($aggregation, $expectedResult)
 
     /**
      * Test for setField().
-     *
-     * @expectedException        \LogicException
-     * @expectedExceptionMessage doesn't support `field` parameter
      */
     public function testSetField()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage("doesn't support `field` parameter");
         $aggregation = new FilterAggregation('test_agg');
         $aggregation->setField('test_field');
     }
 
     /**
      * Test for toArray() without setting a filter.
-     *
-     * @expectedException        \LogicException
-     * @expectedExceptionMessage has no filter added
      */
     public function testToArrayNoFilter()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('has no filter added');
         $aggregation = new FilterAggregation('test_agg');
         $aggregation->toArray();
     }
diff --git a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php
@@ -21,12 +21,11 @@ class FiltersAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when not anonymous filter is without name.
-     *
-     * @expectedException \LogicException
-     * @expectedExceptionMessage In not anonymous filters filter name must be set.
      */
     public function testIfExceptionIsThrown()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('In not anonymous filters filter name must be set.');
         $mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')->getMock();
         $aggregation = new FiltersAggregation('test_agg');
         $aggregation->addFilter($mock);
diff --git a/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php
@@ -17,38 +17,35 @@ class GeoDistanceAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when field is not set.
-     *
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Geo distance aggregation must have a field set.
      */
     public function testGeoDistanceAggregationExceptionWhenFieldIsNotSet()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Geo distance aggregation must have a field set.');
         $agg = new GeoDistanceAggregation('test_agg');
         $agg->setOrigin('50, 70');
         $agg->getArray();
     }
 
     /**
      * Test if exception is thrown when origin is not set.
-     *
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Geo distance aggregation must have an origin set.
      */
     public function testGeoDistanceAggregationExceptionWhenOriginIsNotSet()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Geo distance aggregation must have an origin set.');
         $agg = new GeoDistanceAggregation('test_agg');
         $agg->setField('location');
         $agg->getArray();
     }
 
     /**
      * Test if exception is thrown when field is not set.
-     *
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Either from or to must be set. Both cannot be null.
      */
     public function testGeoDistanceAggregationAddRangeException()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Either from or to must be set. Both cannot be null.');
         $agg = new GeoDistanceAggregation('test_agg');
         $agg->addRange();
     }
diff --git a/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php
@@ -20,11 +20,10 @@ class GeoHashGridAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown.
-     *
-     * @expectedException \LogicException
      */
     public function testGeoHashGridAggregationException()
     {
+        $this->expectException(\LogicException::class);
         $agg = new GeoHashGridAggregation('test_agg');
         $agg->getArray();
     }
diff --git a/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php
@@ -74,11 +74,10 @@ public function testToArray($aggregation, $expectedResult)
 
     /**
      * Test for setField method on global aggregation.
-     *
-     * @expectedException \LogicException
      */
     public function testSetField()
     {
+        $this->expectException(\LogicException::class);
         $aggregation = new GlobalAggregation('test_agg');
         $aggregation->setField('test_field');
     }
diff --git a/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php
@@ -17,11 +17,10 @@ class Ipv4RangeAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test exception when field and range are not set.
-     *
-     * @expectedException \LogicException
      */
     public function testIfExceptionIsThrownWhenFieldAndRangeAreNotSet()
     {
+        $this->expectException(\LogicException::class);
         $agg = new Ipv4RangeAggregation('foo');
         $agg->toArray();
     }
diff --git a/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php b/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php
@@ -17,12 +17,11 @@ class MissingAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when field is not set.
-     *
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Missing aggregation must have a field set.
      */
     public function testIfExceptionIsThrown()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Missing aggregation must have a field set.');
         $agg = new MissingAggregation('test_agg');
         $agg->getArray();
     }
diff --git a/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php b/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php
@@ -52,12 +52,11 @@ public function testGetArray()
 
     /**
      * Tests if CardinalityAggregation#getArray throws exception when expected.
-     *
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Cardinality aggregation must have field or script set.
      */
     public function testGetArrayException()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Cardinality aggregation must have field or script set.');
         $aggregation = new CardinalityAggregation('bar');
         $aggregation->getArray();
     }
diff --git a/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php b/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php
@@ -20,11 +20,10 @@ class GeoBoundsAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown.
-     *
-     * @expectedException \LogicException
      */
     public function testGeoBoundsAggregationException()
     {
+        $this->expectException(\LogicException::class);
         $agg = new GeoBoundsAggregation('test_agg');
         $agg->getArray();
     }
diff --git a/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php b/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php
@@ -20,11 +20,10 @@ class GeoCentroidAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when field is not provided
-     *
-     * @expectedException \LogicException
      */
     public function testGetArrayException()
     {
+        $this->expectException(\LogicException::class);
         $aggregation = new GeoCentroidAggregation('foo');
         $aggregation->getArray();
     }
diff --git a/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php b/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php
@@ -26,39 +26,36 @@ class PercentileRanksAggregationTest extends \PHPUnit\Framework\TestCase
     /**
      * Phpunit setup.
      */
-    public function setUp()
+    protected function setUp(): void
     {
         $this->agg = new PercentileRanksAggregation('foo');
     }
 
     /**
      * Tests if exception is thrown when required parameters not set.
-     *
-     * @expectedException \LogicException
      */
     public function testIfPercentileRanksAggregationThrowsAnException()
     {
+        $this->expectException(\LogicException::class);
         $this->agg->toArray();
     }
 
     /**
      * Tests exception when only field is set.
-     *
-     * @expectedException \LogicException
      */
     public function testIfExceptionIsThrownWhenFieldSetAndValueNotSet()
     {
+        $this->expectException(\LogicException::class);
         $this->agg->setField('bar');
         $this->agg->toArray();
     }
 
     /**
      * Tests exception when only value is set.
-     *
-     * @expectedException \LogicException
      */
     public function testIfExceptionIsThrownWhenScriptSetAndValueNotSet()
     {
+        $this->expectException(\LogicException::class);
         $this->agg->setScript('bar');
         $this->agg->toArray();
     }
diff --git a/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php b/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php
@@ -17,12 +17,11 @@ class PercentilesAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests if PercentilesAggregation#getArray throws exception when expected.
-     *
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Percentiles aggregation must have field or script set.
      */
     public function testPercentilesAggregationGetArrayException()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Percentiles aggregation must have field or script set.');
         $aggregation = new PercentilesAggregation('bar');
         $aggregation->getArray();
     }
diff --git a/tests/Unit/Aggregation/Pipeline/BucketScriptAggregationTest.php b/tests/Unit/Aggregation/Pipeline/BucketScriptAggregationTest.php
@@ -50,12 +50,11 @@ public function testToArray()
     /**
      * Tests if the exception is thrown in getArray method if no
      * buckets_path or script is set
-     *
-     * @expectedException \LogicException
-     * @expectedExceptionMessage `test` aggregation must have script set.
      */
     public function testGetArrayException()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('`test` aggregation must have script set.');
         $agg = new BucketScriptAggregation('test', []);
 
         $agg->getArray();
diff --git a/tests/Unit/Aggregation/Pipeline/BucketSelectorAggregationTest.php b/tests/Unit/Aggregation/Pipeline/BucketSelectorAggregationTest.php
@@ -48,12 +48,11 @@ public function testToArray()
     /**
      * Tests if the exception is thrown in getArray method if no
      * buckets_path or script is set
-     *
-     * @expectedException \LogicException
-     * @expectedExceptionMessage `test` aggregation must have script set.
      */
     public function testGetArrayException()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('`test` aggregation must have script set.');
         $agg = new BucketSelectorAggregation('test', []);
 
         $agg->getArray();
diff --git a/tests/Unit/ParametersTraitTest.php b/tests/Unit/ParametersTraitTest.php
@@ -26,7 +26,7 @@ class ParametersTraitTest extends \PHPUnit\Framework\TestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp(): void
     {
         $this->parametersTraitMock = $this->getMockForTrait('ONGR\ElasticsearchDSL\ParametersTrait');
     }
diff --git a/tests/Unit/Query/Compound/BoolQueryTest.php b/tests/Unit/Query/Compound/BoolQueryTest.php
diff --git a/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php b/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php
diff --git a/tests/Unit/Query/Span/SpanOrQueryTest.php b/tests/Unit/Query/Span/SpanOrQueryTest.php
diff --git a/tests/Unit/Query/Specialized/TemplateQueryTest.php b/tests/Unit/Query/Specialized/TemplateQueryTest.php
diff --git a/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php b/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,10 @@ class ChildrenAggregationTest extends \PHPUnit\Framework\TestCase`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* Tests if ChildrenAggregation#getArray throws exception when expected.`
`23`		`- *`
`24`		`- * @expectedException \LogicException`
`25`	`23`	`*/`
`26`	`24`	`public function testGetArrayException()`
`27`	`25`	`{`
	`26`	`+ $this->expectException(\LogicException::class);`
`28`	`27`	`$aggregation = new ChildrenAggregation('foo');`
`29`	`28`	`$aggregation->getArray();`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,10 @@ class DateHistogramAggregationTest extends \PHPUnit\Framework\TestCase`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* Tests if ChildrenAggregation#getArray throws exception when expected.`
`23`		`- *`
`24`		`- * @expectedException \LogicException`
`25`	`23`	`*/`
`26`	`24`	`public function testGetArrayException()`
`27`	`25`	`{`
	`26`	`+ $this->expectException(\LogicException::class);`
`28`	`27`	`$aggregation = new DateHistogramAggregation('foo');`
`29`	`28`	`$aggregation->getArray();`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,24 +17,22 @@ class DateRangeAggregationTest extends \PHPUnit\Framework\TestCase`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* Test if exception is thrown.`
`20`		`- *`
`21`		`- * @expectedException \LogicException`
`22`		`- * @expectedExceptionMessage Date range aggregation must have field, format set and range added.`
`23`	`20`	`*/`
`24`	`21`	`public function testIfExceptionIsThrownWhenNoParametersAreSet()`
`25`	`22`	`{`
	`23`	`+ $this->expectException(\LogicException::class);`
	`24`	`+ $this->expectExceptionMessage('Date range aggregation must have field, format set and range added.');`
`26`	`25`	`$agg = new DateRangeAggregation('test_agg');`
`27`	`26`	`$agg->getArray();`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`/**`
`31`	`30`	`* Test if exception is thrown when both range parameters are null.`
`32`		`- *`
`33`		`- * @expectedException \LogicException`
`34`		`- * @expectedExceptionMessage Either from or to must be set. Both cannot be null.`
`35`	`31`	`*/`
`36`	`32`	`public function testIfExceptionIsThrownWhenBothRangesAreNull()`
`37`	`33`	`{`
	`34`	`+ $this->expectException(\LogicException::class);`
	`35`	`+ $this->expectExceptionMessage('Either from or to must be set. Both cannot be null.');`
`38`	`36`	`$agg = new DateRangeAggregation('test_agg');`
`39`	`37`	`$agg->addRange(null, null);`
`40`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,10 @@ class GeoHashGridAggregationTest extends \PHPUnit\Framework\TestCase`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* Test if exception is thrown.`
`23`		`- *`
`24`		`- * @expectedException \LogicException`
`25`	`23`	`*/`
`26`	`24`	`public function testGeoHashGridAggregationException()`
`27`	`25`	`{`
	`26`	`+ $this->expectException(\LogicException::class);`
`28`	`27`	`$agg = new GeoHashGridAggregation('test_agg');`
`29`	`28`	`$agg->getArray();`
`30`	`29`	`}`