From 3e439c0b4326f386dfe8649fe030ea145b70af3b Mon Sep 17 00:00:00 2001 From: Valerio Date: Wed, 5 Feb 2020 21:32:21 +0100 Subject: [PATCH 01/23] Fluent api on ParametersTrait (#304) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * upgrade es library version to the 7.x * update minimal php requirement to the 7.1 * update travis config * elasticsearch download link has been changed * update travis config * add php 7.4 to the build test * added travis matrix * check this out, it'a a new coffee button * update readme * Fluent api in paramerter trait * Fluent api in paramerter trait Co-authored-by: Simonas Šerlinskas --- .travis.yml | 10 +++++++--- README.md | 7 ++++++- src/ParametersTrait.php | 6 ++++++ tests/Unit/ParametersTraitTest.php | 4 +++- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c872d27..65d6b9db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,19 @@ sudo: false language: php php: - - 7.0 - 7.1 - 7.2 + - 7.3 + - 7.4snapshot +matrix: + allow_failures: + - php: 7.4snapshot env: global: - - ES_VERSION=6.7.1 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz + - ES_VERSION=7.4.0 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz install: - wget ${ES_DOWNLOAD_URL} - - tar -xzf elasticsearch-${ES_VERSION}.tar.gz + - tar -xzf elasticsearch-${ES_VERSION}-linux-x86_64.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/README.md b/README.md index dba3be4b..aa8e0c65 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Introducing Elasticsearch DSL library to provide objective query builder for [Elasticsearch bundle](https://github.com/ongr-io/ElasticsearchBundle) and [elasticsearch-php](https://github.com/elastic/elasticsearch-php) client. You can easily build any Elasticsearch query and transform it to an array. If you need any help, [stack overflow](http://stackoverflow.com/questions/tagged/ongr) -is the preffered and recommended way to ask ONGR support questions. +is the preferred and recommended way to ask ONGR support questions. [![Build Status](https://travis-ci.org/ongr-io/ElasticsearchDSL.svg?branch=master)](https://travis-ci.org/ongr-io/ElasticsearchDSL) [![codecov](https://codecov.io/gh/ongr-io/ElasticsearchDSL/branch/master/graph/badge.svg)](https://codecov.io/gh/ongr-io/ElasticsearchDSL) @@ -11,6 +11,11 @@ is the preffered and recommended way to ask ONGR support questions. [![Total Downloads](https://poser.pugx.org/ongr/elasticsearch-dsl/downloads)](https://packagist.org/packages/ongr/elasticsearch-dsl) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/ongr-io/ElasticsearchDSL/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/ongr-io/ElasticsearchDSL/?branch=master) + +If you like this library, help me to develop it by buying a cup of coffee + +Buy Me A Coffee + ## Version matrix | Elasticsearch version | ElasticsearchDSL version | diff --git a/src/ParametersTrait.php b/src/ParametersTrait.php index 5305f776..a8ebcefc 100644 --- a/src/ParametersTrait.php +++ b/src/ParametersTrait.php @@ -37,12 +37,15 @@ public function hasParameter($name) * Removes parameter. * * @param string $name + * @return $this */ public function removeParameter($name) { if ($this->hasParameter($name)) { unset($this->parameters[$name]); } + + return $this; } /** @@ -70,10 +73,13 @@ public function getParameters() /** * @param string $name * @param array|string|int|bool|\stdClass $value + * @return $this */ public function addParameter($name, $value) { $this->parameters[$name] = $value; + + return $this; } /** diff --git a/tests/Unit/ParametersTraitTest.php b/tests/Unit/ParametersTraitTest.php index d456e288..6eb26277 100644 --- a/tests/Unit/ParametersTraitTest.php +++ b/tests/Unit/ParametersTraitTest.php @@ -11,6 +11,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit; +use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation; use ONGR\ElasticsearchDSL\ParametersTrait; /** @@ -36,9 +37,10 @@ public function setUp() */ public function testGetAndAddParameter() { - $this->parametersTraitMock->addParameter('acme', 123); + $this->assertTrue(is_object($this->parametersTraitMock->addParameter('acme', 123))); $this->assertEquals(123, $this->parametersTraitMock->getParameter('acme')); $this->parametersTraitMock->addParameter('bar', 321); $this->assertEquals(321, $this->parametersTraitMock->getParameter('bar')); + $this->assertTrue(is_object($this->parametersTraitMock->removeParameter('acme'))); } } From 97136d39b0a85d6b8df2a6294d6dfcc555a3b1b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= Date: Wed, 5 Feb 2020 23:13:07 +0200 Subject: [PATCH 02/23] change deprecated inline to the source --- src/Query/Compound/FunctionScoreQuery.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Query/Compound/FunctionScoreQuery.php b/src/Query/Compound/FunctionScoreQuery.php index e7d96c1b..844bab13 100644 --- a/src/Query/Compound/FunctionScoreQuery.php +++ b/src/Query/Compound/FunctionScoreQuery.php @@ -181,7 +181,7 @@ public function addRandomFunction($seed = null, BuilderInterface $query = null) /** * Adds script score function. * - * @param string $inline + * @param string $source * @param array $params * @param array $options * @param BuilderInterface $query @@ -189,7 +189,7 @@ public function addRandomFunction($seed = null, BuilderInterface $query = null) * @return $this */ public function addScriptScoreFunction( - $inline, + $source, array $params = [], array $options = [], BuilderInterface $query = null @@ -201,7 +201,7 @@ public function addScriptScoreFunction( array_merge( [ 'lang' => 'painless', - 'inline' => $inline, + 'source' => $source, 'params' => $params ], $options 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 03/23] 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); } } From 7aa5d65ff56673b9da630ab867ac0662dbb8a67a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= Date: Wed, 19 Feb 2020 22:26:02 +0200 Subject: [PATCH 04/23] fix phpunit to 7.0 major version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3837e61a..2afbae27 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "require-dev": { "elasticsearch/elasticsearch": "^7.0", - "phpunit/phpunit": "~7.0", + "phpunit/phpunit": "^7.0", "squizlabs/php_codesniffer": "^3.0" }, "suggest": { From 08c74ce757b2198783baf0095f7a7139fda682b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= Date: Wed, 19 Feb 2020 22:27:12 +0200 Subject: [PATCH 05/23] upgrade elasticsearch version in the travis to the 7.5.2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a5322a80..a71d4d41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ php: - 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=7.5.2 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz install: - wget ${ES_DOWNLOAD_URL} - tar -xzf elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz From bb8d722f4d2aa76338f8ea931c06efcb6e0c205d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= Date: Thu, 20 Feb 2020 21:38:09 +0200 Subject: [PATCH 06/23] php 7.0 is not supported anymore with elasticsearch/elasticsearch --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a71d4d41..72abda75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: false language: php php: - - 7.0 - 7.1 - 7.2 - 7.3 From 10b6193258cbf4439f6fcf53596219ca502b00b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= Date: Thu, 20 Feb 2020 21:54:19 +0200 Subject: [PATCH 07/23] prefer stable instead of dist in the travis composer install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 72abda75..cea3feae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ install: - ./elasticsearch-${ES_VERSION}/bin/elasticsearch -d before_script: - if [ "$GITHUB_COMPOSER_AUTH" ]; then composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH; fi - - composer install --no-interaction --prefer-dist + - composer install --no-interaction --prefer-stable script: - wget -q --waitretry=1 --retry-connrefused -T 10 -O - http://127.0.0.1:9200 - vendor/bin/phpunit --coverage-clover=coverage.xml From bc7ee2f60ae4986e4e0f95ee688ae701c4f54952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= Date: Thu, 20 Feb 2020 22:19:21 +0200 Subject: [PATCH 08/23] rollback serializer to support v3 and v4 --- composer.json | 4 ++-- 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 +- src/Serializer/Normalizer/CustomReferencedNormalizer.php | 4 ++-- src/Serializer/OrderedSerializer.php | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 2afbae27..5a3e83e2 100644 --- a/composer.json +++ b/composer.json @@ -11,8 +11,8 @@ } ], "require": { - "php": "^7.0", - "symfony/serializer": "^3.0|^4.0|^5.0", + "php": "^7.1", + "symfony/serializer": "^3.0|^4.0", "paragonie/random_compat": "*" }, "require-dev": { diff --git a/src/SearchEndpoint/AggregationsEndpoint.php b/src/SearchEndpoint/AggregationsEndpoint.php index 3e035f43..079a6a5d 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, string $format = null, array $context = []) + public function normalize(NormalizerInterface $normalizer, $format = null, array $context = []) { $output = []; if (count($this->getAll()) > 0) { diff --git a/src/SearchEndpoint/HighlightEndpoint.php b/src/SearchEndpoint/HighlightEndpoint.php index aa57b3d7..f2b8d8e9 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, string $format = null, array $context = []) + public function normalize(NormalizerInterface $normalizer, $format = null, array $context = []) { if ($this->highlight) { return $this->highlight->toArray(); diff --git a/src/SearchEndpoint/InnerHitsEndpoint.php b/src/SearchEndpoint/InnerHitsEndpoint.php index 8428bd88..f1562fe6 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, string $format = null, array $context = []) + public function normalize(NormalizerInterface $normalizer, $format = null, array $context = []) { $output = []; if (count($this->getAll()) > 0) { diff --git a/src/SearchEndpoint/PostFilterEndpoint.php b/src/SearchEndpoint/PostFilterEndpoint.php index de3e263c..6055b7ed 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, string $format = null, array $context = []) + public function normalize(NormalizerInterface $normalizer, $format = null, array $context = []) { if (!$this->getBool()) { return null; diff --git a/src/SearchEndpoint/QueryEndpoint.php b/src/SearchEndpoint/QueryEndpoint.php index b7626910..6212b05d 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, string $format = null, array $context = []) + public function normalize(NormalizerInterface $normalizer, $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 cd00bb2f..2461c858 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, string $format = null, array $context = []) + public function normalize(NormalizerInterface $normalizer, $format = null, array $context = []) { $output = []; diff --git a/src/SearchEndpoint/SuggestEndpoint.php b/src/SearchEndpoint/SuggestEndpoint.php index 6d292239..2e2e16ac 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, string $format = null, array $context = []) + public function normalize(NormalizerInterface $normalizer, $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 99ca63db..6cd24a8e 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, string $format = null, array $context = []) + public function normalize($object, $format = null, array $context = []) { $object->setReferences($this->references); $data = parent::normalize($object, $format, $context); @@ -38,7 +38,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null) + public function supportsNormalization($data, $format = null) { return $data instanceof AbstractNormalizable; } diff --git a/src/Serializer/OrderedSerializer.php b/src/Serializer/OrderedSerializer.php index 7bc51118..bcbb9c3d 100644 --- a/src/Serializer/OrderedSerializer.php +++ b/src/Serializer/OrderedSerializer.php @@ -22,7 +22,7 @@ class OrderedSerializer extends Serializer /** * {@inheritdoc} */ - public function normalize($data, string $format = null, array $context = []) + public function normalize($data, $format = null, array $context = []) { return parent::normalize( is_array($data) ? $this->order($data) : $data, From 58bd293ef9609e4c502d1d23cdeed202f8c952f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= Date: Thu, 20 Feb 2020 22:25:14 +0200 Subject: [PATCH 09/23] make sure stable dependencies versions will be installed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cea3feae..f7d1fcdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ install: - ./elasticsearch-${ES_VERSION}/bin/elasticsearch -d before_script: - if [ "$GITHUB_COMPOSER_AUTH" ]; then composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH; fi - - composer install --no-interaction --prefer-stable + - composer update --no-interaction --prefer-stable script: - wget -q --waitretry=1 --retry-connrefused -T 10 -O - http://127.0.0.1:9200 - vendor/bin/phpunit --coverage-clover=coverage.xml From 1bfcd23999fb297fbaf141d10753d8400b9f6016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= Date: Thu, 20 Feb 2020 22:33:51 +0200 Subject: [PATCH 10/23] add elasticsearch/elasticsearch to the composer file --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5a3e83e2..42a9c342 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,8 @@ "require": { "php": "^7.1", "symfony/serializer": "^3.0|^4.0", - "paragonie/random_compat": "*" + "paragonie/random_compat": "*", + "elasticsearch/elasticsearch": "^7.0" }, "require-dev": { "elasticsearch/elasticsearch": "^7.0", From b7653ed32d6d5b65aeef3b7ef4f46e7ac069c393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= Date: Thu, 20 Feb 2020 22:35:10 +0200 Subject: [PATCH 11/23] support serializer v5 and upgrade php minimum requirement to the 7.2 --- .travis.yml | 1 - composer.json | 5 ++--- 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 +- src/Serializer/Normalizer/CustomReferencedNormalizer.php | 2 +- 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index f7d1fcdd..305617a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: false language: php php: - - 7.1 - 7.2 - 7.3 - 7.4 diff --git a/composer.json b/composer.json index 42a9c342..e5950fac 100644 --- a/composer.json +++ b/composer.json @@ -11,13 +11,12 @@ } ], "require": { - "php": "^7.1", - "symfony/serializer": "^3.0|^4.0", + "php": "^7.2", + "symfony/serializer": "^5.0", "paragonie/random_compat": "*", "elasticsearch/elasticsearch": "^7.0" }, "require-dev": { - "elasticsearch/elasticsearch": "^7.0", "phpunit/phpunit": "^7.0", "squizlabs/php_codesniffer": "^3.0" }, 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..fd32a89b 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); From 3b4424aed78fe680806ee8a4a62596548b1c674e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= Date: Thu, 20 Feb 2020 22:42:18 +0200 Subject: [PATCH 12/23] bump dev version up --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e5950fac..5547905e 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "7.1-dev" + "dev-master": "7.2-dev" } } } From 8c75b819a32a422c393272295fe5e81e8cbd7ec7 Mon Sep 17 00:00:00 2001 From: Chrysanthos <48060191+chrysanthos@users.noreply.github.com> Date: Sat, 14 Mar 2020 21:02:53 +0200 Subject: [PATCH 13/23] Rename MatrixStatsAggregation.php to MaxAggregation.php --- .../Matrix/{MatrixStatsAggregation.php => MaxAggregation.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Aggregation/Matrix/{MatrixStatsAggregation.php => MaxAggregation.php} (100%) diff --git a/src/Aggregation/Matrix/MatrixStatsAggregation.php b/src/Aggregation/Matrix/MaxAggregation.php similarity index 100% rename from src/Aggregation/Matrix/MatrixStatsAggregation.php rename to src/Aggregation/Matrix/MaxAggregation.php From 0db9dbb1c25a230548a623bf266cfb34f1aa0b4c Mon Sep 17 00:00:00 2001 From: Jacob Dreesen Date: Thu, 29 Oct 2020 11:37:14 +0100 Subject: [PATCH 14/23] Cleanup composer.json - `paragonie/random_compat` is not needed as it is a polyfill for PHP < 7 - `suggest: elasticsearch/elasticsearch` is not needed because it's already required --- composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/composer.json b/composer.json index 5547905e..37fac78f 100644 --- a/composer.json +++ b/composer.json @@ -13,16 +13,12 @@ "require": { "php": "^7.2", "symfony/serializer": "^5.0", - "paragonie/random_compat": "*", "elasticsearch/elasticsearch": "^7.0" }, "require-dev": { "phpunit/phpunit": "^7.0", "squizlabs/php_codesniffer": "^3.0" }, - "suggest": { - "elasticsearch/elasticsearch": "This library is for elasticsearch/elasticsearch client to enhance it with DSL functionality." - }, "autoload": { "psr-4": { "ONGR\\ElasticsearchDSL\\": "src/" From de0f077f375e25f28300cded82bec0d1f9cc677f Mon Sep 17 00:00:00 2001 From: Shyim <6224096+shyim@users.noreply.github.com> Date: Mon, 22 Feb 2021 21:45:59 +0000 Subject: [PATCH 15/23] Add Github Actions --- .github/wait_for_es.php | 26 +++++++++++++++++++ .github/workflows/phpunit.yml | 48 +++++++++++++++++++++++++++++++++++ .phpunit.result.cache | 1 - .travis.yml | 22 ---------------- composer.json | 1 - 5 files changed, 74 insertions(+), 24 deletions(-) create mode 100644 .github/wait_for_es.php create mode 100644 .github/workflows/phpunit.yml delete mode 100644 .phpunit.result.cache delete mode 100644 .travis.yml diff --git a/.github/wait_for_es.php b/.github/wait_for_es.php new file mode 100644 index 00000000..10501a6e --- /dev/null +++ b/.github/wait_for_es.php @@ -0,0 +1,26 @@ +build(); + $client->ping(); + echo 'Is up and running' . PHP_EOL; + exit(0); + } catch (NoNodesAvailableException $e) { + if ($retries === $maxRetries) { + echo 'Cannot reach elasticsearch server' . PHP_EOL; + exit(1); + } + + sleep(5); + $retries++; + } +} diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml new file mode 100644 index 00000000..eb3fc419 --- /dev/null +++ b/.github/workflows/phpunit.yml @@ -0,0 +1,48 @@ +name: PHPUnit + +on: + push: + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + services: + elasticsearch: + image: elastic/elasticsearch:7.4.0 + ports: + - 9200:9200 + env: + discovery.type: single-node + strategy: + matrix: + php: ['7.2', '7.3', '7.4'] + steps: + - uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + tools: composer:v2 + coverage: xdebug + + - name: Validate composer.json and composer.lock + run: composer validate + + - name: Install dependencies + run: composer install --prefer-dist --no-progress + + - name: Wait for Elasticsearch + run: php ./.github/wait_for_es.php + + - name: Run PHPUnit + run: vendor/bin/phpunit --coverage-clover=coverage.xml + + - name: Run PHPCS + run: vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/ ./ + + - name: Upload Codecov + uses: codecov/codecov-action@v1 + with: + file: ./coverage.xml diff --git a/.phpunit.result.cache b/.phpunit.result.cache deleted file mode 100644 index 5c86792d..00000000 --- a/.phpunit.result.cache +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 305617a2..00000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -sudo: false -language: php -php: - - 7.2 - - 7.3 - - 7.4 -env: - global: - - ES_VERSION=7.5.2 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz -install: - - wget ${ES_DOWNLOAD_URL} - - tar -xzf elasticsearch-${ES_VERSION}-linux-x86_64.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 - - composer update --no-interaction --prefer-stable -script: - - wget -q --waitretry=1 --retry-connrefused -T 10 -O - http://127.0.0.1:9200 - - vendor/bin/phpunit --coverage-clover=coverage.xml - - vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/ ./ -after_script: - - travis_retry bash <(curl -s https://codecov.io/bash) diff --git a/composer.json b/composer.json index 37fac78f..eb6d0b5e 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,6 @@ "ONGR\\ElasticsearchDSL\\Tests\\": "tests/" } }, - "minimum-stability": "dev", "extra": { "branch-alias": { "dev-master": "7.2-dev" From 03f2af90ef15a4a2b94535536acdb798788251a2 Mon Sep 17 00:00:00 2001 From: Marc Heying <84m@users.noreply.github.com> Date: Tue, 23 Feb 2021 01:19:53 +0100 Subject: [PATCH 16/23] fix wrong namespace according to dev psr-4 for unit tests --- .../Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php | 2 +- .../Aggregation/Bucketing/AudoDateHistogramAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/CompositeAggregationTest.php | 2 +- .../Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php | 2 +- .../Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php | 2 +- .../Aggregation/Bucketing/SignificantTermsAggregationTest.php | 2 +- .../Aggregation/Bucketing/SignificantTextAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php | 2 +- tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php | 2 +- tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php | 2 +- tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php | 2 +- .../Unit/Aggregation/Metric/PercentileRanksAggregationTest.php | 2 +- tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php | 2 +- tests/Unit/Aggregation/Metric/StatsAggregationTest.php | 2 +- tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php | 2 +- tests/Unit/SearchEndpoint/AggregationsEndpointTest.php | 2 +- tests/Unit/SearchEndpoint/HighlightEndpointTest.php | 2 +- tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php | 2 +- tests/Unit/SearchEndpoint/PostFilterEndpointTest.php | 2 +- tests/Unit/SearchEndpoint/QueryEndpointTest.php | 2 +- tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php | 2 +- tests/Unit/SearchEndpoint/SortEndpointTest.php | 2 +- tests/Unit/SearchEndpoint/SuggestEndpointTest.php | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php b/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php index f73cc612..5c457ba5 100644 --- a/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\AdjacencyMatrixAggregation; use ONGR\ElasticsearchDSL\BuilderInterface; diff --git a/tests/Unit/Aggregation/Bucketing/AudoDateHistogramAggregationTest.php b/tests/Unit/Aggregation/Bucketing/AudoDateHistogramAggregationTest.php index bece77d3..3a6c21c9 100644 --- a/tests/Unit/Aggregation/Bucketing/AudoDateHistogramAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/AudoDateHistogramAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\AutoDateHistogramAggregation; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php b/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php index f4cb6b3a..2b88d77d 100644 --- a/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\ChildrenAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/CompositeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/CompositeAggregationTest.php index b45c2233..a735dc37 100644 --- a/tests/Unit/Aggregation/Bucketing/CompositeAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/CompositeAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\CompositeAggregation; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php index 6f7544bb..c894de11 100644 --- a/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\DateHistogramAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php index ca32f902..fa0421f6 100644 --- a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\DateRangeAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php index c86757be..6052de56 100644 --- a/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\FilterAggregation; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\HistogramAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php index b3032a31..3ef083d5 100644 --- a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\FiltersAggregation; use ONGR\ElasticsearchDSL\BuilderInterface; diff --git a/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php index 96fd79fc..a784edef 100644 --- a/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\GeoDistanceAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php index 1ef28d34..2eda5142 100644 --- a/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\GeoHashGridAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php index 725ed283..5f8919b0 100644 --- a/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\GlobalAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php index 7566efe8..2079eec0 100644 --- a/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\Ipv4RangeAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php b/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php index 613d97ba..3e454375 100644 --- a/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\MissingAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php b/tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php index b4458f12..cfc4b4f4 100644 --- a/tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\NestedAggregation; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php index 55134a86..59f53acd 100644 --- a/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\RangeAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php b/tests/Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php index 11ed18f7..a88f58b0 100644 --- a/tests/Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\ReverseNestedAggregation; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php b/tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php index 0bbb209b..a0ee85f5 100644 --- a/tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\SamplerAggregation; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/SignificantTermsAggregationTest.php b/tests/Unit/Aggregation/Bucketing/SignificantTermsAggregationTest.php index c6cf2133..699fb5bb 100644 --- a/tests/Unit/Aggregation/Bucketing/SignificantTermsAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/SignificantTermsAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\SignificantTermsAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/SignificantTextAggregationTest.php b/tests/Unit/Aggregation/Bucketing/SignificantTextAggregationTest.php index 23b96f3f..d268eefe 100644 --- a/tests/Unit/Aggregation/Bucketing/SignificantTextAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/SignificantTextAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\SignificantTextAggregation; diff --git a/tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php b/tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php index 47924419..dc46b7df 100644 --- a/tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation; diff --git a/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php b/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php index 8ec9f2cf..7cba1d43 100644 --- a/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php +++ b/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Metric; use ONGR\ElasticsearchDSL\Aggregation\Metric\CardinalityAggregation; diff --git a/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php b/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php index efccb9ba..9aaf3b38 100644 --- a/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php +++ b/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Metric; use ONGR\ElasticsearchDSL\Aggregation\Metric\GeoBoundsAggregation; diff --git a/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php b/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php index dca14573..67f144d2 100644 --- a/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php +++ b/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Metric; use ONGR\ElasticsearchDSL\Aggregation\Metric\GeoCentroidAggregation; diff --git a/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php b/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php index ec613c5c..c0bdb4af 100644 --- a/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php +++ b/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Metric; use ONGR\ElasticsearchDSL\Aggregation\Metric\PercentileRanksAggregation; use phpDocumentor\Reflection\Types\Void_; diff --git a/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php b/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php index aa98aa3e..f7a09f50 100644 --- a/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php +++ b/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Metric; use ONGR\ElasticsearchDSL\Aggregation\Metric\PercentilesAggregation; diff --git a/tests/Unit/Aggregation/Metric/StatsAggregationTest.php b/tests/Unit/Aggregation/Metric/StatsAggregationTest.php index e130641e..991f18e2 100644 --- a/tests/Unit/Aggregation/Metric/StatsAggregationTest.php +++ b/tests/Unit/Aggregation/Metric/StatsAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Metric; use ONGR\ElasticsearchDSL\Aggregation\Metric\StatsAggregation; diff --git a/tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php b/tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php index f6018dc8..65824e92 100644 --- a/tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php +++ b/tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation; +namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Metric; use ONGR\ElasticsearchDSL\Aggregation\Metric\TopHitsAggregation; use ONGR\ElasticsearchDSL\Sort\FieldSort; diff --git a/tests/Unit/SearchEndpoint/AggregationsEndpointTest.php b/tests/Unit/SearchEndpoint/AggregationsEndpointTest.php index 016c1ff7..bc7489fd 100644 --- a/tests/Unit/SearchEndpoint/AggregationsEndpointTest.php +++ b/tests/Unit/SearchEndpoint/AggregationsEndpointTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint; +namespace ONGR\ElasticsearchDSL\Tests\Unit\SearchEndpoint; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\MissingAggregation; use ONGR\ElasticsearchDSL\SearchEndpoint\AggregationsEndpoint; diff --git a/tests/Unit/SearchEndpoint/HighlightEndpointTest.php b/tests/Unit/SearchEndpoint/HighlightEndpointTest.php index 55d6080f..45a48bc7 100644 --- a/tests/Unit/SearchEndpoint/HighlightEndpointTest.php +++ b/tests/Unit/SearchEndpoint/HighlightEndpointTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint; +namespace ONGR\ElasticsearchDSL\Tests\Unit\SearchEndpoint; use ONGR\ElasticsearchDSL\Highlight\Highlight; use ONGR\ElasticsearchDSL\SearchEndpoint\HighlightEndpoint; diff --git a/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php b/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php index 26e2a7a3..789512fc 100644 --- a/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php +++ b/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint; +namespace ONGR\ElasticsearchDSL\Tests\Unit\SearchEndpoint; use ONGR\ElasticsearchDSL\SearchEndpoint\InnerHitsEndpoint; diff --git a/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php b/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php index 36adfc3e..a4905468 100644 --- a/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php +++ b/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint; +namespace ONGR\ElasticsearchDSL\Tests\Unit\SearchEndpoint; use ONGR\ElasticsearchDSL\Query\MatchAllQuery; use ONGR\ElasticsearchDSL\SearchEndpoint\PostFilterEndpoint; diff --git a/tests/Unit/SearchEndpoint/QueryEndpointTest.php b/tests/Unit/SearchEndpoint/QueryEndpointTest.php index 5d28e152..0ae852ad 100644 --- a/tests/Unit/SearchEndpoint/QueryEndpointTest.php +++ b/tests/Unit/SearchEndpoint/QueryEndpointTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint; +namespace ONGR\ElasticsearchDSL\Tests\Unit\SearchEndpoint; use ONGR\ElasticsearchDSL\Query\MatchAllQuery; use ONGR\ElasticsearchDSL\SearchEndpoint\QueryEndpoint; diff --git a/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php b/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php index 3c0da38d..96afc6d5 100644 --- a/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php +++ b/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint; +namespace ONGR\ElasticsearchDSL\Tests\Unit\SearchEndpoint; use ONGR\ElasticsearchDSL\SearchEndpoint\AggregationsEndpoint; use ONGR\ElasticsearchDSL\SearchEndpoint\SearchEndpointFactory; diff --git a/tests/Unit/SearchEndpoint/SortEndpointTest.php b/tests/Unit/SearchEndpoint/SortEndpointTest.php index 7f825bcf..1800122b 100644 --- a/tests/Unit/SearchEndpoint/SortEndpointTest.php +++ b/tests/Unit/SearchEndpoint/SortEndpointTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint; +namespace ONGR\ElasticsearchDSL\Tests\Unit\SearchEndpoint; use ONGR\ElasticsearchDSL\SearchEndpoint\SortEndpoint; use ONGR\ElasticsearchDSL\Sort\FieldSort; diff --git a/tests/Unit/SearchEndpoint/SuggestEndpointTest.php b/tests/Unit/SearchEndpoint/SuggestEndpointTest.php index 34c8704b..30699f52 100644 --- a/tests/Unit/SearchEndpoint/SuggestEndpointTest.php +++ b/tests/Unit/SearchEndpoint/SuggestEndpointTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace ONGR\ElasticsearchDSL\Tests\Unit\Unit\SearchEndpoint; +namespace ONGR\ElasticsearchDSL\Tests\Unit\SearchEndpoint; use ONGR\ElasticsearchDSL\SearchEndpoint\SuggestEndpoint; use ONGR\ElasticsearchDSL\Suggest\Suggest; From 2b1ec11cc8476a18853a4b42725ef05ca0668f66 Mon Sep 17 00:00:00 2001 From: Marc Heying <84m@users.noreply.github.com> Date: Tue, 23 Feb 2021 01:21:23 +0100 Subject: [PATCH 17/23] bump phpunit to ^8.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index eb6d0b5e..5fc88dc9 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "elasticsearch/elasticsearch": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^7.0", + "phpunit/phpunit": "^8.0", "squizlabs/php_codesniffer": "^3.0" }, "autoload": { From f37eb40cd36adc1ae7fd5c990bcc2851208370d5 Mon Sep 17 00:00:00 2001 From: Marc Heying <84m@users.noreply.github.com> Date: Tue, 23 Feb 2021 01:24:35 +0100 Subject: [PATCH 18/23] remove phpunit 9.0 deprecations --- .../Bucketing/ChildrenAggregationTest.php | 3 +-- .../Bucketing/DateHistogramAggregationTest.php | 3 +-- .../Bucketing/DateRangeAggregationTest.php | 10 ++++------ .../Bucketing/FilterAggregationTest.php | 10 ++++------ .../Bucketing/FiltersAggregationTest.php | 5 ++--- .../Bucketing/GeoDistanceAggregationTest.php | 15 ++++++--------- .../Bucketing/GeoHashGridAggregationTest.php | 3 +-- .../Bucketing/GlobalAggregationTest.php | 3 +-- .../Bucketing/Ipv4RangeAggregationTest.php | 3 +-- .../Bucketing/MissingAggregationTest.php | 5 ++--- .../Metric/CardinalityAggregationTest.php | 5 ++--- .../Metric/GeoBoundsAggregationTest.php | 3 +-- .../Metric/GeoCentroidAggregationTest.php | 3 +-- .../Metric/PercentileRanksAggregationTest.php | 9 +++------ .../Metric/PercentilesAggregationTest.php | 5 ++--- .../Pipeline/BucketScriptAggregationTest.php | 5 ++--- .../Pipeline/BucketSelectorAggregationTest.php | 5 ++--- tests/Unit/Query/Compound/BoolQueryTest.php | 14 ++++++-------- tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php | 3 +-- tests/Unit/Query/Span/SpanOrQueryTest.php | 2 +- .../Unit/Query/Specialized/TemplateQueryTest.php | 3 +-- .../SearchEndpoint/SearchEndpointFactoryTest.php | 3 +-- 22 files changed, 46 insertions(+), 74 deletions(-) diff --git a/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php b/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php index 2b88d77d..8e10461a 100644 --- 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 index c894de11..5fce811a 100644 --- 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 index fa0421f6..46118702 100644 --- 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 index 6052de56..a5659a59 100644 --- 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'); $result = $aggregation->toArray(); diff --git a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php index 3ef083d5..924b4753 100644 --- 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 index a784edef..5f95f6d1 100644 --- a/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php @@ -17,12 +17,11 @@ 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(); @@ -30,12 +29,11 @@ public function testGeoDistanceAggregationExceptionWhenFieldIsNotSet() /** * 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(); @@ -43,12 +41,11 @@ public function testGeoDistanceAggregationExceptionWhenOriginIsNotSet() /** * 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 index 2eda5142..f2791195 100644 --- 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 index 5f8919b0..4e499f6f 100644 --- 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 index 2079eec0..28543c02 100644 --- 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 index 3e454375..d29c4f01 100644 --- 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 index 7cba1d43..7ebe6d1c 100644 --- 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 index 9aaf3b38..8e22e071 100644 --- 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 index 67f144d2..759b33f5 100644 --- 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 index c0bdb4af..c4187532 100644 --- a/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php +++ b/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php @@ -34,32 +34,29 @@ public function setUp(): void /** * 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 index f7a09f50..a22b80b8 100644 --- 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 index 16c85b62..9754ab46 100644 --- 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 index c8edbc9c..83a45453 100644 --- 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/Query/Compound/BoolQueryTest.php b/tests/Unit/Query/Compound/BoolQueryTest.php index 93fe2db7..959ca075 100644 --- a/tests/Unit/Query/Compound/BoolQueryTest.php +++ b/tests/Unit/Query/Compound/BoolQueryTest.php @@ -22,12 +22,11 @@ class BoolQueryTest extends \PHPUnit\Framework\TestCase { /** * Test for addToBool() without setting a correct bool operator. - * - * @expectedException \UnexpectedValueException - * @expectedExceptionMessage The bool operator acme is not supported */ public function testBoolAddToBoolException() { + $this->expectException(\UnexpectedValueException::class); + $this->expectExceptionMessage('The bool operator acme is not supported'); $bool = new BoolQuery(); $bool->add(new MatchAllQuery(), 'acme'); } @@ -81,12 +80,11 @@ public function testBoolConstructor() /** * Tests exception thrown if invalid BoolQuery type key is specified - * - * @expectedException \UnexpectedValueException - * @expectedExceptionMessage The bool operator acme is not supported */ public function testBoolConstructorException() { + $this->expectException(\UnexpectedValueException::class); + $this->expectExceptionMessage('The bool operator acme is not supported'); new BoolQuery([ 'acme' => [new TermQuery('key1', 'value1')], ]); @@ -190,7 +188,7 @@ public function testGetQueriesEmpty() { $bool = new BoolQuery(); - $this->assertInternalType('array', $bool->getQueries()); + $this->assertIsArray($bool->getQueries()); } /** @@ -215,7 +213,7 @@ public function testGetQueriesByBoolTypeEmpty() { $bool = new BoolQuery(); - $this->assertInternalType('array', $bool->getQueries(BoolQuery::MUST)); + $this->assertIsArray($bool->getQueries(BoolQuery::MUST)); } /** diff --git a/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php b/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php index bc9c01b1..6ff94107 100644 --- a/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php +++ b/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php @@ -17,11 +17,10 @@ class GeoBoundingBoxQueryTest extends \PHPUnit\Framework\TestCase { /** * Test if exception is thrown when geo points are not set. - * - * @expectedException \LogicException */ public function testGeoBoundBoxQueryException() { + $this->expectException(\LogicException::class); $query = new GeoBoundingBoxQuery('location', []); $query->toArray(); } diff --git a/tests/Unit/Query/Span/SpanOrQueryTest.php b/tests/Unit/Query/Span/SpanOrQueryTest.php index 537caf44..6aa203d3 100644 --- a/tests/Unit/Query/Span/SpanOrQueryTest.php +++ b/tests/Unit/Query/Span/SpanOrQueryTest.php @@ -43,7 +43,7 @@ public function testToArray() $this->assertEquals($result, $query->toArray()); $result = $query->getQueries(); - $this->assertInternalType('array', $result); + $this->assertIsArray($result); $this->assertEquals(1, count($result)); } } diff --git a/tests/Unit/Query/Specialized/TemplateQueryTest.php b/tests/Unit/Query/Specialized/TemplateQueryTest.php index 80e497a5..12c6e0d8 100644 --- a/tests/Unit/Query/Specialized/TemplateQueryTest.php +++ b/tests/Unit/Query/Specialized/TemplateQueryTest.php @@ -56,11 +56,10 @@ public function testToArrayFile() /** * Tests toArray() exception - * - * @expectedException \InvalidArgumentException */ public function testToArrayException() { + $this->expectException(\InvalidArgumentException::class); $query = new TemplateQuery(); $query->toArray(); } diff --git a/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php b/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php index 96afc6d5..c928f19c 100644 --- a/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php +++ b/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php @@ -22,11 +22,10 @@ class SearchEndpointFactoryTest extends \PHPUnit\Framework\TestCase { /** * Tests get method exception. - * - * @expectedException \RuntimeException */ public function testGet() { + $this->expectException(\RuntimeException::class); SearchEndpointFactory::get('foo'); } From 41b9b52a9d2cc1f29ca61abdc55e5a49d7b4d42d Mon Sep 17 00:00:00 2001 From: Marc Heying <84m@users.noreply.github.com> Date: Tue, 23 Feb 2021 11:53:22 +0100 Subject: [PATCH 19/23] bump phpunit to ^9.0 and php to ^7.3 since 7.2 is EOL anyways --- .github/workflows/phpunit.yml | 2 +- composer.json | 4 ++-- phpunit.xml.dist | 25 +++++++++++++------------ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index eb3fc419..b2f29dc1 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -16,7 +16,7 @@ jobs: discovery.type: single-node strategy: matrix: - php: ['7.2', '7.3', '7.4'] + php: ['7.3', '7.4'] steps: - uses: actions/checkout@v2 diff --git a/composer.json b/composer.json index 5fc88dc9..0202f975 100644 --- a/composer.json +++ b/composer.json @@ -11,12 +11,12 @@ } ], "require": { - "php": "^7.2", + "php": "^7.3", "symfony/serializer": "^5.0", "elasticsearch/elasticsearch": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^8.0", + "phpunit/phpunit": "^9.0", "squizlabs/php_codesniffer": "^3.0" }, "autoload": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 17185e94..7233b3df 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,7 @@ @@ -23,16 +24,16 @@ - - + + ./ - - ./tests - ./vendor - - - - - - + + + ./tests + ./vendor + + + + + From b45d6642f1f4bf3a1eae63bcbd171022944a136a Mon Sep 17 00:00:00 2001 From: Marc Heying <84m@users.noreply.github.com> Date: Tue, 23 Feb 2021 11:53:55 +0100 Subject: [PATCH 20/23] remove deprecated annotations of PHPUnit_Framework_MockObject_MockObject --- .../Bucketing/AdjacencyMatrixAggregationTest.php | 3 --- .../Unit/Aggregation/Bucketing/DateRangeAggregationTest.php | 1 - tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php | 3 --- tests/Unit/BuilderBagTest.php | 3 ++- tests/Unit/Query/Compound/FunctionScoreQueryTest.php | 6 +----- tests/Unit/Query/Span/SpanContainingQueryTest.php | 3 ++- tests/Unit/Query/Span/SpanWithinQueryTest.php | 3 ++- tests/Unit/SearchEndpoint/HighlightEndpointTest.php | 2 -- tests/Unit/SearchEndpoint/PostFilterEndpointTest.php | 3 --- tests/Unit/SearchEndpoint/QueryEndpointTest.php | 3 --- tests/Unit/SearchEndpoint/SortEndpointTest.php | 3 --- tests/Unit/SearchEndpoint/SuggestEndpointTest.php | 3 --- 12 files changed, 7 insertions(+), 29 deletions(-) diff --git a/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php b/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php index 5c457ba5..d45bd090 100644 --- a/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php @@ -12,7 +12,6 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\AdjacencyMatrixAggregation; -use ONGR\ElasticsearchDSL\BuilderInterface; /** * Unit test for adjacency matrix aggregation. @@ -95,9 +94,7 @@ public function testToArray() */ public function testFilterConstructor() { - /** @var BuilderInterface|\PHPUnit_Framework_MockObject_MockObject $builderInterface1 */ $builderInterface1 = $this->getMockForAbstractClass('ONGR\ElasticsearchDSL\BuilderInterface'); - /** @var BuilderInterface|\PHPUnit_Framework_MockObject_MockObject $builderInterface2 */ $builderInterface2 = $this->getMockForAbstractClass('ONGR\ElasticsearchDSL\BuilderInterface'); $aggregation = new AdjacencyMatrixAggregation( diff --git a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php index 46118702..49966b9b 100644 --- a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php @@ -114,7 +114,6 @@ public function getDateRangeAggregationConstructorProvider() */ public function testDateRangeAggregationConstructor($field = null, $format = null, array $ranges = null) { - /** @var DateRangeAggregation|\PHPUnit_Framework_MockObject_MockObject $aggregation */ $aggregation = $this->getMockBuilder('ONGR\ElasticsearchDSL\Aggregation\Bucketing\DateRangeAggregation') ->setMethods(['setField', 'setFormat', 'addRange']) ->disableOriginalConstructor() diff --git a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php index 924b4753..4d9656ec 100644 --- a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php @@ -12,7 +12,6 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\FiltersAggregation; -use ONGR\ElasticsearchDSL\BuilderInterface; /** * Unit test for filters aggregation. @@ -94,9 +93,7 @@ public function testToArray() */ public function testConstructorFilter() { - /** @var BuilderInterface|\PHPUnit_Framework_MockObject_MockObject $builderInterface1 */ $builderInterface1 = $this->getMockForAbstractClass('ONGR\ElasticsearchDSL\BuilderInterface'); - /** @var BuilderInterface|\PHPUnit_Framework_MockObject_MockObject $builderInterface2 */ $builderInterface2 = $this->getMockForAbstractClass('ONGR\ElasticsearchDSL\BuilderInterface'); $aggregation = new FiltersAggregation( diff --git a/tests/Unit/BuilderBagTest.php b/tests/Unit/BuilderBagTest.php index 49d6a2ff..0f436da2 100644 --- a/tests/Unit/BuilderBagTest.php +++ b/tests/Unit/BuilderBagTest.php @@ -13,6 +13,7 @@ use ONGR\ElasticsearchDSL\BuilderBag; use ONGR\ElasticsearchDSL\BuilderInterface; +use PHPUnit\Framework\MockObject\MockBuilder; class BuilderBagTest extends \PHPUnit\Framework\TestCase { @@ -79,7 +80,7 @@ public function testGet() * * @param string $name * - * @return \PHPUnit_Framework_MockObject_MockObject|BuilderInterface + * @return MockBuilder|BuilderInterface */ private function getBuilder($name) { diff --git a/tests/Unit/Query/Compound/FunctionScoreQueryTest.php b/tests/Unit/Query/Compound/FunctionScoreQueryTest.php index c5a6097d..7904aa72 100644 --- a/tests/Unit/Query/Compound/FunctionScoreQueryTest.php +++ b/tests/Unit/Query/Compound/FunctionScoreQueryTest.php @@ -11,10 +11,8 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound; -use ONGR\ElasticsearchDSL\BuilderInterface; use ONGR\ElasticsearchDSL\Query\Compound\FunctionScoreQuery; use ONGR\ElasticsearchDSL\Query\MatchAllQuery; -use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * Tests for FunctionScoreQuery. @@ -66,7 +64,6 @@ public function addRandomFunctionProvider() */ public function testAddRandomFunction($seed, $expectedArray) { - /** @var MatchAllQuery|MockObject $matchAllQuery */ $matchAllQuery = $this->getMockBuilder(MatchAllQuery::class)->getMock(); $functionScoreQuery = new FunctionScoreQuery($matchAllQuery); @@ -74,13 +71,12 @@ public function testAddRandomFunction($seed, $expectedArray) $this->assertEquals(['function_score' => $expectedArray], $functionScoreQuery->toArray()); } - + /** * Tests default argument values. */ public function testAddFieldValueFactorFunction() { - /** @var BuilderInterface|MockObject $builderInterface */ $builderInterface = $this->getMockForAbstractClass('ONGR\ElasticsearchDSL\BuilderInterface'); $functionScoreQuery = new FunctionScoreQuery($builderInterface); $functionScoreQuery->addFieldValueFactorFunction('field1', 2); diff --git a/tests/Unit/Query/Span/SpanContainingQueryTest.php b/tests/Unit/Query/Span/SpanContainingQueryTest.php index 71411abf..a6cd16a0 100644 --- a/tests/Unit/Query/Span/SpanContainingQueryTest.php +++ b/tests/Unit/Query/Span/SpanContainingQueryTest.php @@ -12,6 +12,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Span; use ONGR\ElasticsearchDSL\Query\Span\SpanContainingQuery; +use PHPUnit\Framework\MockObject\MockBuilder; /** * Unit test for SpanContainingQuery. @@ -43,7 +44,7 @@ public function testToArray() /** * @param string $value * - * @returns \PHPUnit_Framework_MockObject_MockObject + * @returns MockBuilder */ private function getSpanQueryMock($value) { diff --git a/tests/Unit/Query/Span/SpanWithinQueryTest.php b/tests/Unit/Query/Span/SpanWithinQueryTest.php index d0a7c160..550e37be 100644 --- a/tests/Unit/Query/Span/SpanWithinQueryTest.php +++ b/tests/Unit/Query/Span/SpanWithinQueryTest.php @@ -12,6 +12,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Span; use ONGR\ElasticsearchDSL\Query\Span\SpanWithinQuery; +use PHPUnit\Framework\MockObject\MockBuilder; /** * Unit test for SpanWithinQuery. @@ -43,7 +44,7 @@ public function testToArray() /** * @param string $value * - * @returns \PHPUnit_Framework_MockObject_MockObject + * @returns MockBuilder */ private function getSpanQueryMock($value) { diff --git a/tests/Unit/SearchEndpoint/HighlightEndpointTest.php b/tests/Unit/SearchEndpoint/HighlightEndpointTest.php index 45a48bc7..6306b694 100644 --- a/tests/Unit/SearchEndpoint/HighlightEndpointTest.php +++ b/tests/Unit/SearchEndpoint/HighlightEndpointTest.php @@ -14,7 +14,6 @@ use ONGR\ElasticsearchDSL\Highlight\Highlight; use ONGR\ElasticsearchDSL\SearchEndpoint\HighlightEndpoint; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * Class HighlightEndpointTest. @@ -35,7 +34,6 @@ public function testItCanBeInstantiated() public function testNormalization() { $instance = new HighlightEndpoint(); - /** @var NormalizerInterface|MockObject $normalizerInterface */ $normalizerInterface = $this->getMockForAbstractClass( NormalizerInterface::class ); diff --git a/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php b/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php index a4905468..52cdb05e 100644 --- a/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php +++ b/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php @@ -13,8 +13,6 @@ use ONGR\ElasticsearchDSL\Query\MatchAllQuery; use ONGR\ElasticsearchDSL\SearchEndpoint\PostFilterEndpoint; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * Class PostFilterEndpointTest. @@ -44,7 +42,6 @@ public function testGetOrder() public function testNormalization() { $instance = new PostFilterEndpoint(); - /** @var NormalizerInterface|MockObject $normalizerInterface */ $normalizerInterface = $this->getMockForAbstractClass( 'Symfony\Component\Serializer\Normalizer\NormalizerInterface' ); diff --git a/tests/Unit/SearchEndpoint/QueryEndpointTest.php b/tests/Unit/SearchEndpoint/QueryEndpointTest.php index 0ae852ad..a72813c8 100644 --- a/tests/Unit/SearchEndpoint/QueryEndpointTest.php +++ b/tests/Unit/SearchEndpoint/QueryEndpointTest.php @@ -13,8 +13,6 @@ use ONGR\ElasticsearchDSL\Query\MatchAllQuery; use ONGR\ElasticsearchDSL\SearchEndpoint\QueryEndpoint; -use PHPUnit_Framework_MockObject_MockObject as MockObject; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; /** * Unit test class for the QueryEndpoint. @@ -44,7 +42,6 @@ public function testGetOrder() public function testEndpoint() { $instance = new QueryEndpoint(); - /** @var NormalizerInterface|MockObject $normalizerInterface */ $normalizerInterface = $this->getMockForAbstractClass( 'Symfony\Component\Serializer\Normalizer\NormalizerInterface' ); diff --git a/tests/Unit/SearchEndpoint/SortEndpointTest.php b/tests/Unit/SearchEndpoint/SortEndpointTest.php index 1800122b..0bafd84a 100644 --- a/tests/Unit/SearchEndpoint/SortEndpointTest.php +++ b/tests/Unit/SearchEndpoint/SortEndpointTest.php @@ -13,8 +13,6 @@ use ONGR\ElasticsearchDSL\SearchEndpoint\SortEndpoint; use ONGR\ElasticsearchDSL\Sort\FieldSort; -use PHPUnit_Framework_MockObject_MockObject as MockObject; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; /** * Class SortEndpointTest. @@ -36,7 +34,6 @@ public function testNormalize() { $instance = new SortEndpoint(); - /** @var NormalizerInterface|MockObject $normalizerInterface */ $normalizerInterface = $this->getMockForAbstractClass( 'Symfony\Component\Serializer\Normalizer\NormalizerInterface' ); diff --git a/tests/Unit/SearchEndpoint/SuggestEndpointTest.php b/tests/Unit/SearchEndpoint/SuggestEndpointTest.php index 30699f52..41b0550c 100644 --- a/tests/Unit/SearchEndpoint/SuggestEndpointTest.php +++ b/tests/Unit/SearchEndpoint/SuggestEndpointTest.php @@ -13,8 +13,6 @@ use ONGR\ElasticsearchDSL\SearchEndpoint\SuggestEndpoint; use ONGR\ElasticsearchDSL\Suggest\Suggest; -use PHPUnit_Framework_MockObject_MockObject as MockObject; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; class SuggestEndpointTest extends \PHPUnit\Framework\TestCase { @@ -49,7 +47,6 @@ public function testNormalize() { $instance = new SuggestEndpoint(); - /** @var NormalizerInterface|MockObject $normalizerInterface */ $normalizerInterface = $this->getMockForAbstractClass( 'Symfony\Component\Serializer\Normalizer\NormalizerInterface' ); From 95e06d5eb2cb93be7ecf27fd67c00b0c357ebbf0 Mon Sep 17 00:00:00 2001 From: Marc Heying <84m@users.noreply.github.com> Date: Tue, 23 Feb 2021 11:53:59 +0100 Subject: [PATCH 21/23] reactivate unit test --- .../AdjacencyMatrixAggregationTest.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php b/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php index d45bd090..62d070e8 100644 --- a/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php @@ -12,24 +12,24 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing; use ONGR\ElasticsearchDSL\Aggregation\Bucketing\AdjacencyMatrixAggregation; +use ONGR\ElasticsearchDSL\Aggregation\Bucketing\FiltersAggregation; /** * Unit test for adjacency matrix aggregation. */ class AdjacencyMatrixAggregationTest 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() -// { -// $mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')->getMock(); -// $aggregation = new FiltersAggregation('test_agg'); -// $aggregation->addFilter($mock); -// } + /** + * Test if exception is thrown when not anonymous filter is without name. + */ + 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); + } /** * Test GetArray method. From c0789c35e8738c2b1138c8d33ec9fbcd740c909d Mon Sep 17 00:00:00 2001 From: Lennart Tinkloh Date: Tue, 16 Feb 2021 14:51:00 +0100 Subject: [PATCH 22/23] Fixed for PHP 8 Compatibility --- .github/workflows/phpunit.yml | 2 +- composer.json | 2 +- src/Serializer/OrderedSerializer.php | 2 +- .../Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php | 2 +- .../Unit/Aggregation/Bucketing/DateRangeAggregationTest.php | 2 +- tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php | 2 +- tests/Unit/BuilderBagTest.php | 3 ++- tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php | 3 ++- tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php | 5 ++--- tests/Unit/Sort/FieldSortTest.php | 1 - tests/Unit/Sort/NestedSortTest.php | 3 --- tests/Unit/Suggest/SuggestTest.php | 2 -- 12 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index b2f29dc1..c8b58315 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -16,7 +16,7 @@ jobs: discovery.type: single-node strategy: matrix: - php: ['7.3', '7.4'] + php: ['7.4', '8.0'] steps: - uses: actions/checkout@v2 diff --git a/composer.json b/composer.json index 0202f975..5592e2c5 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": "^7.3", + "php": "^7.4 || ^8.0", "symfony/serializer": "^5.0", "elasticsearch/elasticsearch": "^7.0" }, diff --git a/src/Serializer/OrderedSerializer.php b/src/Serializer/OrderedSerializer.php index bcbb9c3d..9019e43e 100644 --- a/src/Serializer/OrderedSerializer.php +++ b/src/Serializer/OrderedSerializer.php @@ -59,7 +59,7 @@ private function order(array $data) uasort( $filteredData, function (OrderedNormalizerInterface $a, OrderedNormalizerInterface $b) { - return $a->getOrder() > $b->getOrder(); + return $a->getOrder() <=> $b->getOrder(); } ); diff --git a/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php b/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php index 62d070e8..038da8c7 100644 --- a/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php @@ -60,7 +60,7 @@ public function testToArray() { $aggregation = new AdjacencyMatrixAggregation('test_agg'); $filter = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface') - ->setMethods(['toArray', 'getType']) + ->onlyMethods(['toArray', 'getType']) ->getMockForAbstractClass(); $filter->expects($this->any()) ->method('toArray') diff --git a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php index 49966b9b..c86ebb55 100644 --- a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php @@ -115,7 +115,7 @@ public function getDateRangeAggregationConstructorProvider() public function testDateRangeAggregationConstructor($field = null, $format = null, array $ranges = null) { $aggregation = $this->getMockBuilder('ONGR\ElasticsearchDSL\Aggregation\Bucketing\DateRangeAggregation') - ->setMethods(['setField', 'setFormat', 'addRange']) + ->onlyMethods(['setField', 'setFormat', 'addRange']) ->disableOriginalConstructor() ->getMock(); $aggregation->expects($this->once())->method('setField')->with($field); diff --git a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php index 4d9656ec..174bacd8 100644 --- a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php @@ -60,7 +60,7 @@ public function testToArray() { $aggregation = new FiltersAggregation('test_agg'); $filter = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface') - ->setMethods(['toArray', 'getType']) + ->onlyMethods(['toArray', 'getType']) ->getMockForAbstractClass(); $filter->expects($this->any()) ->method('toArray') diff --git a/tests/Unit/BuilderBagTest.php b/tests/Unit/BuilderBagTest.php index 0f436da2..7749c4c4 100644 --- a/tests/Unit/BuilderBagTest.php +++ b/tests/Unit/BuilderBagTest.php @@ -85,7 +85,8 @@ public function testGet() private function getBuilder($name) { $friendlyBuilderMock = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface') - ->setMethods(['getName', 'toArray', 'getType']) + ->onlyMethods(['toArray', 'getType']) + ->addMethods(['getName']) ->disableOriginalConstructor() ->getMock(); diff --git a/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php b/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php index 789512fc..c726cbdf 100644 --- a/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php +++ b/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php @@ -54,7 +54,8 @@ public function testNormalization() ->getMock(); $innerHit = $this ->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface') - ->setMethods(['getName', 'toArray', 'getType']) + ->onlyMethods(['toArray', 'getType']) + ->addMethods(['getName']) ->getMock(); $innerHit->expects($this->any())->method('getName')->willReturn('foo'); $innerHit->expects($this->any())->method('toArray')->willReturn(['foo' => 'bar']); diff --git a/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php b/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php index c928f19c..8b350909 100644 --- a/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php +++ b/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php @@ -34,8 +34,7 @@ public function testGet() */ public function testFactory() { - $endpoinnt = SearchEndpointFactory::get(AggregationsEndpoint::NAME); - - $this->assertInstanceOf(SearchEndpointInterface::class, $endpoinnt); + $endpoint = SearchEndpointFactory::get(AggregationsEndpoint::NAME); + $this->assertInstanceOf(SearchEndpointInterface::class, $endpoint); } } diff --git a/tests/Unit/Sort/FieldSortTest.php b/tests/Unit/Sort/FieldSortTest.php index d8863785..8219283b 100644 --- a/tests/Unit/Sort/FieldSortTest.php +++ b/tests/Unit/Sort/FieldSortTest.php @@ -19,7 +19,6 @@ class FieldSortTest extends \PHPUnit\Framework\TestCase { /** * Test for toArray() method. - * */ public function testToArray() { diff --git a/tests/Unit/Sort/NestedSortTest.php b/tests/Unit/Sort/NestedSortTest.php index 5fb970f1..e49640dc 100644 --- a/tests/Unit/Sort/NestedSortTest.php +++ b/tests/Unit/Sort/NestedSortTest.php @@ -18,7 +18,6 @@ class NestedSortTest extends \PHPUnit\Framework\TestCase { /** * Test for single nested. - * */ public function testSingle() { @@ -37,7 +36,6 @@ public function testSingle() /** * Test for single nested, no filter. - * */ public function testNoFilter() { @@ -51,7 +49,6 @@ public function testNoFilter() /** * Test for single nested. - * */ public function testMultipleNesting() { diff --git a/tests/Unit/Suggest/SuggestTest.php b/tests/Unit/Suggest/SuggestTest.php index 7ae17892..829ae0dc 100644 --- a/tests/Unit/Suggest/SuggestTest.php +++ b/tests/Unit/Suggest/SuggestTest.php @@ -26,8 +26,6 @@ public function testSuggestGetType() /** * Data provider for testToArray() - * - * @return array[] */ public function getTestToArrayData() { From a4edd08f6701b043f2830d8a24ba85acf111f894 Mon Sep 17 00:00:00 2001 From: Dickriven Chellemboyee Date: Fri, 31 May 2024 11:11:15 +0400 Subject: [PATCH 23/23] use serializer 8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5592e2c5..2b633cab 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": "^7.4 || ^8.0", - "symfony/serializer": "^5.0", + "symfony/serializer": "^7.0", "elasticsearch/elasticsearch": "^7.0" }, "require-dev": {