Update

.github/wait_for_es.php

@@ -0,0 +1,26 @@
+<?php
+
+use Elasticsearch\ClientBuilder;
+use Elasticsearch\Common\Exceptions\NoNodesAvailableException;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+$retries = 0;
+$maxRetries = 10;
+
+while (true) {
+    try {
+        $client = ClientBuilder::create()->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++;
+    }
+}

.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.4', '8.0']
+    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

composer.json

@@ -11,18 +11,14 @@
         }
     ],
     "require": {
-        "php": "^7.0",
-        "symfony/serializer": "^3.0|^4.0",
-        "paragonie/random_compat": "*"
+        "php": "^7.4 || ^8.0",
+        "symfony/serializer": "^7.0",
+        "elasticsearch/elasticsearch": "^7.0"
     },
     "require-dev": {
-        "elasticsearch/elasticsearch": "^7.0",
-        "phpunit/phpunit": "~6.0",
+        "phpunit/phpunit": "^9.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/"
@@ -33,10 +29,9 @@
             "ONGR\\ElasticsearchDSL\\Tests\\": "tests/"
         }
     },
-    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "7.0-dev"
+            "dev-master": "7.2-dev"
         }
     }
 }

phpunit.xml.dist

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
         backupGlobals="false"
         backupStaticAttributes="false"
         colors="true"
@@ -8,7 +10,6 @@
         convertWarningsToExceptions="true"
         processIsolation="false"
         stopOnFailure="false"
-        syntaxCheck="false"
         bootstrap="vendor/autoload.php">
 
     <testsuites>
@@ -23,16 +24,16 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./</directory>
-            <exclude>
-                <directory>./tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-text" target="php://stdout" showOnlySummary="true"/>
-    </logging>
+        </include>
+        <exclude>
+            <directory>./tests</directory>
+            <directory>./vendor</directory>
+        </exclude>
+        <report>
+            <text outputFile="php://stdout" showOnlySummary="true"/>
+        </report>
+    </coverage>
 </phpunit>

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|float|bool|\stdClass $value
+     * @return $this
      */
     public function addParameter($name, $value)
     {
         $this->parameters[$name] = $value;
+
+        return $this;
     }
 
     /**

src/Query/Compound/FunctionScoreQuery.php

@@ -181,15 +181,15 @@ 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
      *
      * @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

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) {

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();

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) {

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;

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 */

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 = [];
 

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) {

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);

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();
                 }
             );
 

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();

tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php

@@ -9,28 +9,27 @@
  * 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;
+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.
@@ -61,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')
@@ -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(