update to support the symfony serializer 5.0

saimaz · saimaz · commit 057642eaa665 · 2020-02-19T22:20:20.000+02:00
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,17 @@
 sudo: false
 language: php
 php:
+  - 7.0
   - 7.1
   - 7.2
   - 7.3
-  - 7.4snapshot
-matrix:
-  allow_failures:
-      - php: 7.4snapshot
+  - 7.4
 env:
   global:
-    - ES_VERSION=7.4.0 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.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}-linux-x86_64.tar.gz
+  - tar -xzf elasticsearch-${ES_VERSION}.tar.gz
   - ./elasticsearch-${ES_VERSION}/bin/elasticsearch -d
 before_script:
   - if [ "$GITHUB_COMPOSER_AUTH" ]; then composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH; fi
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     },
     "require-dev": {
         "elasticsearch/elasticsearch": "^6.0",
-        "phpunit/phpunit": "~6.0",
+        "phpunit/phpunit": "^7.0",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "suggest": {
diff --git a/src/SearchEndpoint/AggregationsEndpoint.php b/src/SearchEndpoint/AggregationsEndpoint.php
@@ -27,7 +27,7 @@ class AggregationsEndpoint extends AbstractSearchEndpoint
     /**
      * {@inheritdoc}
      */
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
+    public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
     {
         $output = [];
         if (count($this->getAll()) > 0) {
diff --git a/src/SearchEndpoint/HighlightEndpoint.php b/src/SearchEndpoint/HighlightEndpoint.php
@@ -37,7 +37,7 @@ class HighlightEndpoint extends AbstractSearchEndpoint
     /**
      * {@inheritdoc}
      */
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
+    public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
     {
         if ($this->highlight) {
             return $this->highlight->toArray();
diff --git a/src/SearchEndpoint/InnerHitsEndpoint.php b/src/SearchEndpoint/InnerHitsEndpoint.php
@@ -27,7 +27,7 @@ class InnerHitsEndpoint extends AbstractSearchEndpoint
     /**
      * {@inheritdoc}
      */
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
+    public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
     {
         $output = [];
         if (count($this->getAll()) > 0) {
diff --git a/src/SearchEndpoint/PostFilterEndpoint.php b/src/SearchEndpoint/PostFilterEndpoint.php
@@ -26,7 +26,7 @@ class PostFilterEndpoint extends QueryEndpoint
     /**
      * {@inheritdoc}
      */
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
+    public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
     {
         if (!$this->getBool()) {
             return null;
diff --git a/src/SearchEndpoint/QueryEndpoint.php b/src/SearchEndpoint/QueryEndpoint.php
@@ -39,7 +39,7 @@ class QueryEndpoint extends AbstractSearchEndpoint implements OrderedNormalizerI
     /**
      * {@inheritdoc}
      */
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
+    public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
     {
         if (!$this->filtersSet && $this->hasReference('filter_query')) {
             /** @var BuilderInterface $filter */
diff --git a/src/SearchEndpoint/SortEndpoint.php b/src/SearchEndpoint/SortEndpoint.php
@@ -26,7 +26,7 @@ class SortEndpoint extends AbstractSearchEndpoint
     /**
      * {@inheritdoc}
      */
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
+    public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
     {
         $output = [];
 
diff --git a/src/SearchEndpoint/SuggestEndpoint.php b/src/SearchEndpoint/SuggestEndpoint.php
@@ -27,7 +27,7 @@ class SuggestEndpoint extends AbstractSearchEndpoint
     /**
      * {@inheritdoc}
      */
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
+    public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
     {
         $output = [];
         if (count($this->getAll()) > 0) {
diff --git a/src/Serializer/Normalizer/CustomReferencedNormalizer.php b/src/Serializer/Normalizer/CustomReferencedNormalizer.php
@@ -26,7 +26,7 @@ class CustomReferencedNormalizer extends CustomNormalizer
     /**
      * {@inheritdoc}
      */
-    public function normalize($object, $format = null, array $context = [])
+    public function normalize($object, string $format = null, array $context = [])
     {
         $object->setReferences($this->references);
         $data = parent::normalize($object, $format, $context);
@@ -38,7 +38,7 @@ public function normalize($object, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null)
+    public function supportsNormalization($data, string $format = null)
     {
         return $data instanceof AbstractNormalizable;
     }
diff --git a/src/Serializer/OrderedSerializer.php b/src/Serializer/OrderedSerializer.php
@@ -22,7 +22,7 @@ class OrderedSerializer extends Serializer
     /**
      * {@inheritdoc}
      */
-    public function normalize($data, $format = null, array $context = [])
+    public function normalize($data, string $format = null, array $context = [])
     {
         return parent::normalize(
             is_array($data) ? $this->order($data) : $data,
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/DateRangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php
@@ -73,7 +73,7 @@ public function testDateRangeAggregationGetType()
      *
      * @return array
      */
-    public function testDateRangeAggregationConstructorProvider()
+    public function getDateRangeAggregationConstructorProvider()
     {
         return [
             // Case #0. Minimum arguments.
@@ -112,7 +112,7 @@ public function testDateRangeAggregationConstructorProvider()
      * @param string $format
      * @param array  $ranges
      *
-     * @dataProvider testDateRangeAggregationConstructorProvider
+     * @dataProvider getDateRangeAggregationConstructorProvider
      */
     public function testDateRangeAggregationConstructor($field = null, $format = null, array $ranges = null)
     {
diff --git a/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php
@@ -120,7 +120,18 @@ public function testSetField()
     public function testToArrayNoFilter()
     {
         $aggregation = new FilterAggregation('test_agg');
-        $aggregation->toArray();
+        $result = $aggregation->toArray();
+
+        $this->assertEquals(
+            [
+                'aggregation' => [
+                    'test_agg' => [
+                        'filter' => []
+                    ]
+                ]
+            ],
+            $result
+        );
     }
 
     /**
@@ -129,9 +140,19 @@ public function testToArrayNoFilter()
     public function testToArrayWithFilter()
     {
         $aggregation = new FilterAggregation('test_agg');
-
         $aggregation->setFilter(new ExistsQuery('test'));
-        $aggregation->toArray();
+        $result = $aggregation->toArray();
+
+        $this->assertEquals(
+            [
+                'filter' => [
+                    'exists' => [
+                        'field' => 'test'
+                    ]
+                ]
+            ],
+            $result
+        );
     }
 
     /**
diff --git a/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php
@@ -58,7 +58,7 @@ public function testGeoDistanceAggregationAddRangeException()
      *
      * @return array
      */
-    public function testGeoDistanceAggregationGetArrayDataProvider()
+    public function getGeoDistanceAggregationGetArrayDataProvider()
     {
         $out = [];
         $filterData = [
@@ -88,7 +88,7 @@ public function testGeoDistanceAggregationGetArrayDataProvider()
      * @param array $filterData
      * @param array $expected
      *
-     * @dataProvider testGeoDistanceAggregationGetArrayDataProvider
+     * @dataProvider getGeoDistanceAggregationGetArrayDataProvider
      */
     public function testGeoDistanceAggregationGetArray($filterData, $expected)
     {
diff --git a/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php b/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php
@@ -12,6 +12,7 @@
 namespace ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Metric\PercentileRanksAggregation;
+use phpDocumentor\Reflection\Types\Void_;
 
 /**
  * Percentile ranks aggregation unit tests.
@@ -26,7 +27,7 @@ class PercentileRanksAggregationTest extends \PHPUnit\Framework\TestCase
     /**
      * Phpunit setup.
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->agg = new PercentileRanksAggregation('foo');
     }
diff --git a/tests/Unit/ParametersTraitTest.php b/tests/Unit/ParametersTraitTest.php
@@ -27,7 +27,7 @@ class ParametersTraitTest extends \PHPUnit\Framework\TestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->parametersTraitMock = $this->getMockForTrait('ONGR\ElasticsearchDSL\ParametersTrait');
     }
diff --git a/tests/Unit/Query/Compound/FunctionScoreQueryTest.php b/tests/Unit/Query/Compound/FunctionScoreQueryTest.php
@@ -67,7 +67,7 @@ public function addRandomFunctionProvider()
     public function testAddRandomFunction($seed, $expectedArray)
     {
         /** @var MatchAllQuery|MockObject $matchAllQuery */
-        $matchAllQuery = $this->getMockBuilder('ONGR\ElasticsearchDSL\Query\MatchAllQuery')->getMock();
+        $matchAllQuery = $this->getMockBuilder(MatchAllQuery::class)->getMock();
 
         $functionScoreQuery = new FunctionScoreQuery($matchAllQuery);
         $functionScoreQuery->addRandomFunction($seed);
diff --git a/tests/Unit/SearchEndpoint/HighlightEndpointTest.php b/tests/Unit/SearchEndpoint/HighlightEndpointTest.php
@@ -26,7 +26,7 @@ class HighlightEndpointTest extends \PHPUnit\Framework\TestCase
      */
     public function testItCanBeInstantiated()
     {
-        $this->assertInstanceOf('ONGR\ElasticsearchDSL\SearchEndpoint\HighlightEndpoint', new HighlightEndpoint());
+        $this->assertInstanceOf(HighlightEndpoint::class, new HighlightEndpoint());
     }
 
     /**
@@ -37,7 +37,7 @@ public function testNormalization()
         $instance = new HighlightEndpoint();
         /** @var NormalizerInterface|MockObject $normalizerInterface */
         $normalizerInterface = $this->getMockForAbstractClass(
-            'Symfony\Component\Serializer\Normalizer\NormalizerInterface'
+            NormalizerInterface::class
         );
 
         $this->assertNull($instance->normalize($normalizerInterface));
diff --git a/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php b/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php
@@ -13,6 +13,7 @@
 
 use ONGR\ElasticsearchDSL\SearchEndpoint\AggregationsEndpoint;
 use ONGR\ElasticsearchDSL\SearchEndpoint\SearchEndpointFactory;
+use ONGR\ElasticsearchDSL\SearchEndpoint\SearchEndpointInterface;
 
 /**
  * Unit test class for search endpoint factory.
@@ -34,6 +35,8 @@ public function testGet()
      */
     public function testFactory()
     {
-        SearchEndpointFactory::get(AggregationsEndpoint::NAME);
+        $endpoinnt = SearchEndpointFactory::get(AggregationsEndpoint::NAME);
+
+        $this->assertInstanceOf(SearchEndpointInterface::class, $endpoinnt);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class AggregationsEndpoint extends AbstractSearchEndpoint`
`27`	`27`	`/**`
`28`	`28`	`* {@inheritdoc}`
`29`	`29`	`*/`
`30`		`- public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])`
	`30`	`+ public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])`
`31`	`31`	`{`
`32`	`32`	`$output = [];`
`33`	`33`	`if (count($this->getAll()) > 0) {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class HighlightEndpoint extends AbstractSearchEndpoint`
`37`	`37`	`/**`
`38`	`38`	`* {@inheritdoc}`
`39`	`39`	`*/`
`40`		`- public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])`
	`40`	`+ public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])`
`41`	`41`	`{`
`42`	`42`	`if ($this->highlight) {`
`43`	`43`	`return $this->highlight->toArray();`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class InnerHitsEndpoint extends AbstractSearchEndpoint`
`27`	`27`	`/**`
`28`	`28`	`* {@inheritdoc}`
`29`	`29`	`*/`
`30`		`- public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])`
	`30`	`+ public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])`
`31`	`31`	`{`
`32`	`32`	`$output = [];`
`33`	`33`	`if (count($this->getAll()) > 0) {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class PostFilterEndpoint extends QueryEndpoint`
`26`	`26`	`/**`
`27`	`27`	`* {@inheritdoc}`
`28`	`28`	`*/`
`29`		`- public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])`
	`29`	`+ public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])`
`30`	`30`	`{`
`31`	`31`	`if (!$this->getBool()) {`
`32`	`32`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class QueryEndpoint extends AbstractSearchEndpoint implements OrderedNormalizerI`
`39`	`39`	`/**`
`40`	`40`	`* {@inheritdoc}`
`41`	`41`	`*/`
`42`		`- public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])`
	`42`	`+ public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])`
`43`	`43`	`{`
`44`	`44`	`if (!$this->filtersSet && $this->hasReference('filter_query')) {`
`45`	`45`	`/** @var BuilderInterface $filter */`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class SortEndpoint extends AbstractSearchEndpoint`
`26`	`26`	`/**`
`27`	`27`	`* {@inheritdoc}`
`28`	`28`	`*/`
`29`		`- public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])`
	`29`	`+ public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])`
`30`	`30`	`{`
`31`	`31`	`$output = [];`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class SuggestEndpoint extends AbstractSearchEndpoint`
`27`	`27`	`/**`
`28`	`28`	`* {@inheritdoc}`
`29`	`29`	`*/`
`30`		`- public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])`
	`30`	`+ public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])`
`31`	`31`	`{`
`32`	`32`	`$output = [];`
`33`	`33`	`if (count($this->getAll()) > 0) {`