From 057642eaa665056a6c55bae0ec3473b4432a6eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= Date: Wed, 19 Feb 2020 22:20:20 +0200 Subject: [PATCH] update to support the symfony serializer 5.0 --- .phpunit.result.cache | 1 + .travis.yml | 10 +++---- composer.json | 2 +- src/SearchEndpoint/AggregationsEndpoint.php | 2 +- src/SearchEndpoint/HighlightEndpoint.php | 2 +- src/SearchEndpoint/InnerHitsEndpoint.php | 2 +- src/SearchEndpoint/PostFilterEndpoint.php | 2 +- src/SearchEndpoint/QueryEndpoint.php | 2 +- src/SearchEndpoint/SortEndpoint.php | 2 +- src/SearchEndpoint/SuggestEndpoint.php | 2 +- .../Normalizer/CustomReferencedNormalizer.php | 4 +-- src/Serializer/OrderedSerializer.php | 2 +- .../AbstractElasticsearchTestCase.php | 4 +-- .../Bucketing/DateRangeAggregationTest.php | 4 +-- .../Bucketing/FilterAggregationTest.php | 27 ++++++++++++++++--- .../Bucketing/GeoDistanceAggregationTest.php | 4 +-- .../Metric/PercentileRanksAggregationTest.php | 3 ++- tests/Unit/ParametersTraitTest.php | 2 +- .../Query/Compound/FunctionScoreQueryTest.php | 2 +- .../SearchEndpoint/HighlightEndpointTest.php | 4 +-- .../SearchEndpointFactoryTest.php | 5 +++- 21 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 .phpunit.result.cache diff --git a/.phpunit.result.cache b/.phpunit.result.cache new file mode 100644 index 00000000..5c86792d --- /dev/null +++ b/.phpunit.result.cache @@ -0,0 +1 @@ +C:37:"PHPUnit\Runner\DefaultTestResultCache":32063:{a:2:{s:7:"defects";a:31:{s:101:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\ChildrenAggregationTest::testGetArrayException";i:6;s:106:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateHistogramAggregationTest::testGetArrayException";i:6;s:126:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testIfExceptionIsThrownWhenNoParametersAreSet";i:6;s:125:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testIfExceptionIsThrownWhenBothRangesAreNull";i:6;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FilterAggregationTest::testSetField";i:6;s:97:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FilterAggregationTest::testToArrayNoFilter";i:6;s:102:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FiltersAggregationTest::testIfExceptionIsThrown";i:6;s:135:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoDistanceAggregationTest::testGeoDistanceAggregationExceptionWhenFieldIsNotSet";i:6;s:136:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoDistanceAggregationTest::testGeoDistanceAggregationExceptionWhenOriginIsNotSet";i:6;s:126:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoDistanceAggregationTest::testGeoDistanceAggregationAddRangeException";i:6;s:118:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoHashGridAggregationTest::testGeoHashGridAggregationException";i:6;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GlobalAggregationTest::testSetField";i:6;s:130:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\Ipv4RangeAggregationTest::testIfExceptionIsThrownWhenFieldAndRangeAreNotSet";i:6;s:102:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\MissingAggregationTest::testIfExceptionIsThrown";i:6;s:101:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\CardinalityAggregationTest::testGetArrayException";i:6;s:111:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\GeoBoundsAggregationTest::testGeoBoundsAggregationException";i:6;s:101:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\GeoCentroidAggregationTest::testGetArrayException";i:6;s:133:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\PercentileRanksAggregationTest::testIfPercentileRanksAggregationThrowsAnException";i:6;s:133:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\PercentileRanksAggregationTest::testIfExceptionIsThrownWhenFieldSetAndValueNotSet";i:6;s:134:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\PercentileRanksAggregationTest::testIfExceptionIsThrownWhenScriptSetAndValueNotSet";i:6;s:123:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\PercentilesAggregationTest::testPercentilesAggregationGetArrayException";i:6;s:104:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\BucketScriptAggregationTest::testGetArrayException";i:6;s:106:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\BucketSelectorAggregationTest::testGetArrayException";i:6;s:89:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testBoolAddToBoolException";i:6;s:91:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testBoolConstructorException";i:6;s:82:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testGetQueriesEmpty";i:6;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testGetQueriesByBoolTypeEmpty";i:6;s:97:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoBoundingBoxQueryTest::testGeoBoundBoxQueryException";i:6;s:72:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Span\SpanOrQueryTest::testToArray";i:6;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Specialized\TemplateQueryTest::testToArrayException";i:6;s:87:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\SearchEndpointFactoryTest::testGet";i:6;}s:5:"times";a:250:{s:110:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\FunctionScoreQueryTest::testAddRandomFunction with data set #0";d:0.01;s:110:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\FunctionScoreQueryTest::testAddRandomFunction with data set #1";d:0.002;s:103:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\FunctionScoreQueryTest::testAddFieldValueFactorFunction";d:0.002;s:117:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\AdjacencyMatrixAggregationTest::testFiltersAggregationGetArray";d:0.012;s:116:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\AdjacencyMatrixAggregationTest::testFiltersAggregationGetType";d:0.002;s:98:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\AdjacencyMatrixAggregationTest::testToArray";d:0.007;s:108:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\AdjacencyMatrixAggregationTest::testFilterConstructor";d:0.003;s:129:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\AudoDateHistogramAggregationTest::testAutoDateHistogramAggregationSetField";d:0.003;s:127:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\AudoDateHistogramAggregationTest::testAutoDateHistogramAggregationFormat";d:0.002;s:128:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\AudoDateHistogramAggregationTest::testAutoDateHistogramAggregationBuckets";d:0.002;s:128:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\AudoDateHistogramAggregationTest::testAutoDateHistogramAggregationGetType";d:0.001;s:101:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\ChildrenAggregationTest::testGetArrayException";d:0.003;s:110:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\ChildrenAggregationTest::testChildrenAggregationGetType";d:0.001;s:111:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\ChildrenAggregationTest::testChildrenAggregationGetArray";d:0.006;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\CompositeAggregationTest::testToArray";d:0.004;s:108:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\CompositeAggregationTest::testToArrayWithSizeAndAfter";d:0.002;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\CompositeAggregationTest::testGetSize";d:0.001;s:93:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\CompositeAggregationTest::testGetAfter";d:0.002;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\CompositeAggregationTest::testGetType";d:0.001;s:114:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\CompositeAggregationTest::testTermsSourceWithOrderParameter";d:0.002;s:118:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\CompositeAggregationTest::testTermsSourceWithDescOrderParameter";d:0.002;s:119:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\CompositeAggregationTest::testMultipleSourcesWithDifferentOrders";d:0.002;s:106:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateHistogramAggregationTest::testGetArrayException";d:0.002;s:120:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateHistogramAggregationTest::testDateHistogramAggregationGetType";d:0.001;s:116:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateHistogramAggregationTest::testChildrenAggregationGetArray";d:0.002;s:126:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testIfExceptionIsThrownWhenNoParametersAreSet";d:0.003;s:125:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testIfExceptionIsThrownWhenBothRangesAreNull";d:0.002;s:113:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testDateRangeAggregationGetArray";d:0.001;s:112:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testDateRangeAggregationGetType";d:0.001;s:116:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testDateRangeAggregationConstructor";d:0.007;s:133:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testDateRangeAggregationConstructor with data set #1";d:0.004;s:133:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testDateRangeAggregationConstructor with data set #2";d:0.004;s:133:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testDateRangeAggregationConstructor with data set #3";d:0.004;s:133:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testDateRangeAggregationConstructor with data set #4";d:0.004;s:133:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testDateRangeAggregationConstructor with data set #5";d:0.005;s:133:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\DateRangeAggregationTest::testDateRangeAggregationConstructor with data set #6";d:0.005;s:106:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FilterAggregationTest::testToArray with data set #0";d:0.003;s:106:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FilterAggregationTest::testToArray with data set #1";d:0.004;s:106:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FilterAggregationTest::testToArray with data set #2";d:0.005;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FilterAggregationTest::testSetField";d:0.002;s:97:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FilterAggregationTest::testToArrayNoFilter";d:0.002;s:99:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FilterAggregationTest::testToArrayWithFilter";d:0.003;s:99:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FilterAggregationTest::testConstructorFilter";d:0.002;s:102:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FiltersAggregationTest::testIfExceptionIsThrown";d:0.003;s:109:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FiltersAggregationTest::testFiltersAggregationGetArray";d:0.002;s:108:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FiltersAggregationTest::testFiltersAggregationGetType";d:0.001;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FiltersAggregationTest::testToArray";d:0.004;s:100:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\FiltersAggregationTest::testConstructorFilter";d:0.003;s:135:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoDistanceAggregationTest::testGeoDistanceAggregationExceptionWhenFieldIsNotSet";d:0.003;s:136:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoDistanceAggregationTest::testGeoDistanceAggregationExceptionWhenOriginIsNotSet";d:0.002;s:126:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoDistanceAggregationTest::testGeoDistanceAggregationAddRangeException";d:0.002;s:134:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoDistanceAggregationTest::testGeoDistanceAggregationGetArray with data set #0";d:0.002;s:116:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoDistanceAggregationTest::testGeoDistanceAggregationGetType";d:0.002;s:104:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoDistanceAggregationTest::testConstructorFilter";d:0.002;s:118:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoHashGridAggregationTest::testGeoHashGridAggregationException";d:0.002;s:134:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoHashGridAggregationTest::testGeoHashGridAggregationGetArray with data set #0";d:0.002;s:116:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GeoHashGridAggregationTest::testGeoHashGridAggregationGetType";d:0.001;s:106:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GlobalAggregationTest::testToArray with data set #0";d:0.002;s:106:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GlobalAggregationTest::testToArray with data set #1";d:0.001;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\GlobalAggregationTest::testSetField";d:0.002;s:130:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\Ipv4RangeAggregationTest::testIfExceptionIsThrownWhenFieldAndRangeAreNotSet";d:0.002;s:102:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\Ipv4RangeAggregationTest::testConstructorFilter";d:0.002;s:102:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\MissingAggregationTest::testIfExceptionIsThrown";d:0.003;s:109:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\MissingAggregationTest::testMissingAggregationGetArray";d:0.001;s:108:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\MissingAggregationTest::testMissingAggregationGetType";d:0.002;s:89:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\NestedAggregationTest::testToArray";d:0.003;s:105:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\RangeAggregationTest::testRangeAggregationAddRange";d:0.005;s:113:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\RangeAggregationTest::testRangeAggregationAddRangeMultiple";d:0.006;s:111:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\RangeAggregationTest::testRangeAggregationAddRangeNested";d:0.007;s:104:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\RangeAggregationTest::testRangeAggregationGetType";d:0.002;s:113:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\RangeAggregationTest::testRangeAggregationRemoveRangeByKey";d:0.005;s:108:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\RangeAggregationTest::testRangeAggregationRemoveRange";d:0.005;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\RangeAggregationTest::testConstructor";d:0.002;s:96:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\ReverseNestedAggregationTest::testToArray";d:0.002;s:102:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\ReverseNestedAggregationTest::testToArrayNoPath";d:0.002;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\SamplerAggregationTest::testGetType";d:0.002;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\SamplerAggregationTest::testToArray";d:0.002;s:102:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\SamplerAggregationTest::testGetArrayNoShardSize";d:0.001;s:126:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\SignificantTermsAggregationTest::testSignificantTermsAggregationGetType";d:0.002;s:127:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\SignificantTermsAggregationTest::testSignificantTermsAggregationGetArray";d:0.002;s:124:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\SignificantTextAggregationTest::testSignificantTextAggregationGetType";d:0.002;s:126:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\SignificantTextAggregationTest::testSignificantTermsAggregationGetArray";d:0.002;s:105:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\TermsAggregationTest::testTermsAggregationSetField";d:0.001;s:104:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\TermsAggregationTest::testTermsAggregationSetSize";d:0.002;s:113:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\TermsAggregationTest::testTermsAggregationMinDocumentCount";d:0.001;s:117:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\TermsAggregationTest::testTermsAggregationSimpleIncludeExclude";d:0.002;s:116:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\TermsAggregationTest::testTermsAggregationIncludeExcludeFlags";d:0.001;s:105:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\TermsAggregationTest::testTermsAggregationSetOrder";d:0.002;s:109:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\TermsAggregationTest::testTermsAggregationSetOrderDESC";d:0.002;s:104:"ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation\TermsAggregationTest::testTermsAggregationGetType";d:0.001;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\CardinalityAggregationTest::testGetArray";d:0.004;s:101:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\CardinalityAggregationTest::testGetArrayException";d:0.002;s:112:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\CardinalityAggregationTest::testCardinallyAggregationGetType";d:0.001;s:111:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\GeoBoundsAggregationTest::testGeoBoundsAggregationException";d:0.003;s:109:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\GeoBoundsAggregationTest::testGeoBoundsAggregationGetType";d:0.001;s:110:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\GeoBoundsAggregationTest::testGeoBoundsAggregationGetArray";d:0.002;s:101:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\GeoCentroidAggregationTest::testGetArrayException";d:0.002;s:113:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\GeoCentroidAggregationTest::testGeoCentroidAggregationGetType";d:0.001;s:114:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\GeoCentroidAggregationTest::testGeoCentroidAggregationGetArray";d:0.001;s:133:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\PercentileRanksAggregationTest::testIfPercentileRanksAggregationThrowsAnException";d:0.003;s:133:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\PercentileRanksAggregationTest::testIfExceptionIsThrownWhenFieldSetAndValueNotSet";d:0.002;s:134:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\PercentileRanksAggregationTest::testIfExceptionIsThrownWhenScriptSetAndValueNotSet";d:0.002;s:95:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\PercentileRanksAggregationTest::testGetType";d:0.001;s:95:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\PercentileRanksAggregationTest::testToArray";d:0.001;s:123:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\PercentilesAggregationTest::testPercentilesAggregationGetArrayException";d:0.003;s:91:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\PercentilesAggregationTest::testGetType";d:0.001;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\PercentilesAggregationTest::testGetArray";d:0.001;s:85:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\StatsAggregationTest::testToArray";d:0.002;s:89:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\StatsAggregationTest::testConstructor";d:0.001;s:87:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\TopHitsAggregationTest::testToArray";d:0.002;s:98:"ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation\TopHitsAggregationTest::testParametersAddition";d:0.001;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\AvgBucketAggregationTest::testGetArray";d:0.003;s:111:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\AvgBucketAggregationTest::testAvgBucketAggregationGetType";d:0.001;s:94:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\BucketScriptAggregationTest::testToArray";d:0.002;s:104:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\BucketScriptAggregationTest::testGetArrayException";d:0.002;s:96:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\BucketSelectorAggregationTest::testToArray";d:0.002;s:106:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\BucketSelectorAggregationTest::testGetArrayException";d:0.002;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\BucketSortAggregationTest::testToArray";d:0.002;s:95:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\CumulativeSumAggregationTest::testToArray";d:0.002;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\DerivativeAggregationTest::testToArray";d:0.002;s:101:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\ExtendedStatsBucketAggregationTest::testToArray";d:0.002;s:91:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\MaxBucketAggregationTest::testToArray";d:0.002;s:91:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\MinBucketAggregationTest::testToArray";d:0.002;s:96:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\MovingFunctionAggregationTest::testToArray";d:0.002;s:99:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\PercentilesBucketAggregationTest::testToArray";d:0.002;s:100:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\SerialDifferencingAggregationTest::testToArray";d:0.002;s:93:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\StatsBucketAggregationTest::testToArray";d:0.002;s:91:"ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Pipeline\SumBucketAggregationTest::testToArray";d:0.002;s:56:"ONGR\ElasticsearchDSL\Tests\Unit\BuilderBagTest::testHas";d:0.005;s:59:"ONGR\ElasticsearchDSL\Tests\Unit\BuilderBagTest::testRemove";d:0.005;s:58:"ONGR\ElasticsearchDSL\Tests\Unit\BuilderBagTest::testClear";d:0.005;s:56:"ONGR\ElasticsearchDSL\Tests\Unit\BuilderBagTest::testGet";d:0.003;s:69:"ONGR\ElasticsearchDSL\Tests\Unit\Highlight\HighlightTest::testGetType";d:0.002;s:79:"ONGR\ElasticsearchDSL\Tests\Unit\Highlight\HighlightTest::testTraitHasParameter";d:0.001;s:82:"ONGR\ElasticsearchDSL\Tests\Unit\Highlight\HighlightTest::testTraitRemoveParameter";d:0.001;s:79:"ONGR\ElasticsearchDSL\Tests\Unit\Highlight\HighlightTest::testTraitGetParameter";d:0.001;s:83:"ONGR\ElasticsearchDSL\Tests\Unit\Highlight\HighlightTest::testTraitSetGetParameters";d:0.001;s:69:"ONGR\ElasticsearchDSL\Tests\Unit\Highlight\HighlightTest::testToArray";d:0.005;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\InnerHit\NestedInnerHitTest::testToArray with data set #0";d:0.002;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\InnerHit\NestedInnerHitTest::testToArray with data set #1";d:0.002;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\InnerHit\NestedInnerHitTest::testToArray with data set #2";d:0.003;s:83:"ONGR\ElasticsearchDSL\Tests\Unit\InnerHit\NestedInnerHitTest::testGettersAndSetters";d:0.002;s:73:"ONGR\ElasticsearchDSL\Tests\Unit\InnerHit\ParentInnerHitTest::testToArray";d:0.002;s:76:"ONGR\ElasticsearchDSL\Tests\Unit\ParametersTraitTest::testGetAndAddParameter";d:0.003;s:89:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testBoolAddToBoolException";d:0.002;s:82:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testBoolConstructor";d:0.002;s:91:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testBoolConstructorException";d:0.002;s:78:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testBoolToArray";d:0.001;s:81:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testEmptyBoolQuery";d:0.002;s:86:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testBoolInFilterContext";d:0.002;s:77:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testSingleMust";d:0.001;s:82:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testGetQueriesEmpty";d:0.002;s:77:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testGetQueries";d:0.001;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testGetQueriesByBoolTypeEmpty";d:0.001;s:111:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoolQueryTest::testGetQueriesByBoolTypeWithQueryAddedToBoolType";d:0.001;s:78:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\BoostingQueryTest::testToArray";d:0.004;s:83:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\ConstantScoreQueryTest::testToArray";d:0.004;s:76:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound\DisMaxQueryTest::testToArray";d:0.004;s:81:"ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText\CommonTermsQueryTest::testToArray";d:0.002;s:87:"ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText\MatchPhrasePrefixQueryTest::testToArray";d:0.002;s:81:"ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText\MatchPhraseQueryTest::testToArray";d:0.002;s:75:"ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText\MatchQueryTest::testToArray";d:0.001;s:80:"ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText\MultiMatchQueryTest::testToArray";d:0.002;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText\MultiMatchQueryTest::testToArrayWithNoFields";d:0.001;s:81:"ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText\QueryStringQueryTest::testToArray";d:0.002;s:87:"ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText\SimpleQueryStringQueryTest::testToArray";d:0.002;s:97:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoBoundingBoxQueryTest::testGeoBoundBoxQueryException";d:0.002;s:96:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoBoundingBoxQueryTest::testToArray with data set #0";d:0.002;s:96:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoBoundingBoxQueryTest::testToArray with data set #1";d:0.001;s:96:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoBoundingBoxQueryTest::testToArray with data set #2";d:0.001;s:96:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoBoundingBoxQueryTest::testToArray with data set #3";d:0.001;s:93:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoDistanceQueryTest::testToArray with data set #0";d:0.002;s:93:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoDistanceQueryTest::testToArray with data set #1";d:0.001;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoPolygonQueryTest::testToArray with data set #0";d:0.002;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoPolygonQueryTest::testToArray with data set #1";d:0.001;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoPolygonQueryTest::testToArray with data set #2";d:0.001;s:73:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoShapeQueryTest::testToArray";d:0.002;s:80:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo\GeoShapeQueryTest::testToArrayIndexed";d:0.002;s:81:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Joining\HasChildQueryTest::testConstructor";d:0.003;s:82:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Joining\HasParentQueryTest::testConstructor";d:0.002;s:102:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Joining\NestedQueryTest::testToArray with data set "query_only"";d:0.003;s:113:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Joining\NestedQueryTest::testToArray with data set "query_with_parameters"";d:0.001;s:89:"ONGR\ElasticsearchDSL\Tests\Unit\Query\MatchAllQueryTest::testToArrayWhenThereAreNoParams";d:0.003;s:79:"ONGR\ElasticsearchDSL\Tests\Unit\Query\MatchAllQueryTest::testToArrayWithParams";d:0.001;s:82:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Span\FieldMaskingSpanQueryTest::testToArray";d:0.004;s:80:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Span\SpanContainingQueryTest::testToArray";d:0.006;s:75:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Span\SpanFirstQueryTest::testToArray";d:0.004;s:79:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Span\SpanMultiTermQueryTest::testToArray";d:0.003;s:74:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Span\SpanNearQueryTest::testToArray";d:0.003;s:85:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Span\SpanNotQueryTest::testSpanNotQueryToArray";d:0.004;s:72:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Span\SpanOrQueryTest::testToArray";d:0.004;s:74:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Span\SpanTermQueryTest::testToArray";d:0.001;s:88:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Span\SpanTermQueryTest::testToArrayWithParameters";d:0.003;s:76:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Span\SpanWithinQueryTest::testToArray";d:0.005;s:85:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Specialized\MoreLikeThisQueryTest::testToArray";d:0.004;s:109:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Specialized\ScriptQueryTest::testToArray with data set "simple_script"";d:0.002;s:118:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Specialized\ScriptQueryTest::testToArray with data set "script_with_parameters"";d:0.001;s:87:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Specialized\TemplateQueryTest::testToArrayInline";d:0.002;s:85:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Specialized\TemplateQueryTest::testToArrayFile";d:0.001;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\Query\Specialized\TemplateQueryTest::testToArrayException";d:0.002;s:77:"ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel\ExistsQueryTest::testToArray";d:0.001;s:76:"ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel\FuzzyQueryTest::testToArray";d:0.002;s:74:"ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel\IdsQueryTest::testToArray";d:0.002;s:77:"ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel\PrefixQueryTest::testToArray";d:0.002;s:76:"ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel\RangeQueryTest::testToArray";d:0.002;s:77:"ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel\RegexpQueryTest::testToArray";d:0.002;s:75:"ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel\TermQueryTest::testToArray";d:0.001;s:76:"ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel\TermsQueryTest::testToArray";d:0.001;s:79:"ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel\TermsSetQueryTest::testToArray";d:0.002;s:154:"ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel\TermsSetQueryTest::testItThrowsAaExceptionWhenMinimumShouldMatchFieldOrMinimumShouldMatchScriptIsNotGiven";d:0.001;s:75:"ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel\TypeQueryTest::testToArray";d:0.002;s:79:"ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel\WildcardQueryTest::testToArray";d:0.002;s:102:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\AggregationsEndpointTest::testItCanBeInstantiated";d:0.003;s:97:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\AggregationsEndpointTest::testEndpointGetter";d:0.001;s:99:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\HighlightEndpointTest::testItCanBeInstantiated";d:0.002;s:93:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\HighlightEndpointTest::testNormalization";d:0.004;s:94:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\HighlightEndpointTest::testEndpointGetter";d:0.001;s:99:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\InnerHitsEndpointTest::testItCanBeInstantiated";d:0.001;s:94:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\InnerHitsEndpointTest::testEndpointGetter";d:0.002;s:93:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\InnerHitsEndpointTest::testNormalization";d:0.006;s:100:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\PostFilterEndpointTest::testItCanBeInstantiated";d:0.003;s:89:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\PostFilterEndpointTest::testGetOrder";d:0.001;s:94:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\PostFilterEndpointTest::testNormalization";d:0.002;s:95:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\PostFilterEndpointTest::testEndpointGetter";d:0.001;s:95:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\QueryEndpointTest::testItCanBeInstantiated";d:0.001;s:84:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\QueryEndpointTest::testGetOrder";d:0.001;s:84:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\QueryEndpointTest::testEndpoint";d:0.003;s:90:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\QueryEndpointTest::testEndpointGetter";d:0.001;s:87:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\SearchEndpointFactoryTest::testGet";d:0.002;s:91:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\SearchEndpointFactoryTest::testFactory";d:0.001;s:94:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\SortEndpointTest::testItCanBeInstantiated";d:0.002;s:84:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\SortEndpointTest::testNormalize";d:0.002;s:89:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\SortEndpointTest::testEndpointGetter";d:0.001;s:97:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\SuggestEndpointTest::testItCanBeInstantiated";d:0.002;s:92:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\SuggestEndpointTest::testEndpointGetter";d:0.001;s:87:"ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint\SuggestEndpointTest::testNormalize";d:0.002;s:68:"ONGR\ElasticsearchDSL\Tests\Unit\SearchTest::testItCanBeInstantiated";d:0.001;s:67:"ONGR\ElasticsearchDSL\Tests\Unit\SearchTest::testScrollUriParameter";d:0.001;s:64:"ONGR\ElasticsearchDSL\Tests\Unit\Sort\FieldSortTest::testToArray";d:0.005;s:64:"ONGR\ElasticsearchDSL\Tests\Unit\Sort\NestedSortTest::testSingle";d:0.001;s:66:"ONGR\ElasticsearchDSL\Tests\Unit\Sort\NestedSortTest::testNoFilter";d:0.001;s:73:"ONGR\ElasticsearchDSL\Tests\Unit\Sort\NestedSortTest::testMultipleNesting";d:0.002;s:72:"ONGR\ElasticsearchDSL\Tests\Unit\Suggest\SuggestTest::testSuggestGetType";d:0.001;s:82:"ONGR\ElasticsearchDSL\Tests\Unit\Suggest\SuggestTest::testToArray with data set #0";d:0.001;s:82:"ONGR\ElasticsearchDSL\Tests\Unit\Suggest\SuggestTest::testToArray with data set #1";d:0.001;s:82:"ONGR\ElasticsearchDSL\Tests\Unit\Suggest\SuggestTest::testToArray with data set #2";d:0.001;s:82:"ONGR\ElasticsearchDSL\Tests\Unit\Suggest\SuggestTest::testToArray with data set #3";d:0.004;s:84:"ONGR\ElasticsearchDSL\Tests\Functional\Query\FunctionScoreQueryTest::testRandomScore";d:0.221;s:84:"ONGR\ElasticsearchDSL\Tests\Functional\Query\FunctionScoreQueryTest::testScriptScore";d:0.21;s:76:"ONGR\ElasticsearchDSL\Tests\Functional\Query\MatchAllQueryTest::testMatchAll";d:0.165;}}} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 65d6b9db..0466c6a6 100644 --- 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 index 7f34e5c6..403c686d 100644 --- 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 index 079a6a5d..3e035f43 100644 --- 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 index f2b8d8e9..aa57b3d7 100644 --- 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 index f1562fe6..8428bd88 100644 --- 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 index 6055b7ed..de3e263c 100644 --- 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 index 6212b05d..b7626910 100644 --- 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 index 2461c858..cd00bb2f 100644 --- 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 index 2e2e16ac..6d292239 100644 --- 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 index 6cd24a8e..99ca63db 100644 --- 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 index bcbb9c3d..7bc51118 100644 --- 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 index 3c023410..4765f7c6 100644 --- 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 index 6a3c5dbe..ca32f902 100644 --- 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 index b453e014..c86757be 100644 --- 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 index 89f2f5d5..96fd79fc 100644 --- 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 index 12aeffcc..ec613c5c 100644 --- 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 index 6eb26277..cd9c25d7 100644 --- 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 index 9997b0b7..c5a6097d 100644 --- 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 index 5b1a623f..55d6080f 100644 --- 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 index b33028bb..3c0da38d 100644 --- 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); } }