Merge pull request #9 from smoench/phpunit10

Phpunit10

.github/workflows/test-application.yaml

@@ -79,7 +79,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '8.0', '8.1', '8.2' ]
+        php-version: [ '8.1', '8.2' ]
 
     steps:
       - name: Checkout project

composer.json

@@ -19,15 +19,15 @@
         }
     ],
     "require": {
-        "php": "8.0.* || 8.1.* || 8.2.*",
+        "php": "8.1.* || 8.2.*",
         "opensearch-project/opensearch-php": "^1.0 || ^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6",
-        "phpstan/phpstan": "1.10.21",
-        "phpstan/phpstan-phpunit": "1.3.13",
-        "rector/rector": "^0.14.5",
-        "symplify/easy-coding-standard": "^11.5.0"
+        "phpunit/phpunit": "^10.4.1",
+        "phpstan/phpstan": "1.10.38",
+        "phpstan/phpstan-phpunit": "1.3.15",
+        "rector/rector": "^0.18.5",
+        "symplify/easy-coding-standard": "^12.0.8"
     },
     "autoload": {
         "psr-4": {

ecs.php

@@ -25,5 +25,6 @@
         SetList::PHPUNIT,
         SetList::PSR_12,
         SetList::SPACES,
+        SetList::STRICT,
     ]);
 };

phpstan.neon.dist

@@ -1,5 +1,4 @@
 includes:
-  - phpstan-baseline.neon
   - vendor/phpstan/phpstan-phpunit/extension.neon
 
 parameters:

phpunit.xml.dist

@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         colors="true"
-         bootstrap="vendor/autoload.php"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd">
-    <coverage>
-        <include>
-            <directory>./</directory>
-        </include>
-        <exclude>
-            <directory>./tests</directory>
-            <directory>./vendor</directory>
-        </exclude>
-        <report>
-            <text outputFile="php://stdout" showOnlySummary="true"/>
-        </report>
-    </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd">
     <testsuites>
         <testsuite name="unit">
             <directory>./tests/Unit/</directory>
@@ -26,4 +12,13 @@
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory>./</directory>
+        </include>
+        <exclude>
+            <directory>./tests</directory>
+            <directory>./vendor</directory>
+        </exclude>
+    </source>
 </phpunit>

rector.php

@@ -3,9 +3,12 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\Php74\Rector\Property\TypedPropertyRector;
+use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
+use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
+use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;
+use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictGetterMethodReturnTypeRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
@@ -16,10 +19,15 @@
     // register a single rule
     //$rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
 
-    $rectorConfig->rule(TypedPropertyRector::class);
+    $rectorConfig->rules([
+        TypedPropertyFromAssignsRector::class,
+        TypedPropertyFromStrictConstructorRector::class,
+        TypedPropertyFromStrictGetterMethodReturnTypeRector::class,
+    ]);
 
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_80,
-        SetList::CODE_QUALITY
+        LevelSetList::UP_TO_PHP_81,
+        PHPUnitSetList::PHPUNIT_100,
+        SetList::CODE_QUALITY,
     ]);
 };

src/Aggregation/AbstractAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *
@@ -52,7 +54,7 @@ public function getField(): ?string
 
     public function addAggregation(AbstractAggregation $abstractAggregation): static
     {
-        if ($this->aggregations === null) {
+        if (! $this->aggregations instanceof \OpenSearchDSL\BuilderBag) {
             $this->aggregations = $this->createBuilderBag();
         }
 
@@ -68,7 +70,7 @@ public function addAggregation(AbstractAggregation $abstractAggregation): static
      */
     public function getAggregations(): array
     {
-        if ($this->aggregations !== null) {
+        if ($this->aggregations instanceof \OpenSearchDSL\BuilderBag) {
             return $this->aggregations->all();
         }
 
@@ -97,7 +99,7 @@ public function toArray(): array
         if ($this->supportsNesting()) {
             $nestedResult = $this->collectNestedAggregations();
 
-            if (! empty($nestedResult)) {
+            if ($nestedResult !== []) {
                 $result['aggregations'] = $nestedResult;
             }
         }

src/Aggregation/Bucketing/AdjacencyMatrixAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *
@@ -24,7 +26,7 @@ class AdjacencyMatrixAggregation extends AbstractAggregation
 {
     use BucketingTrait;
 
-    public const FILTERS = 'filters';
+    final public const FILTERS = 'filters';
 
     /**
      * @var array<string, array<string, array|null>>

src/Aggregation/Bucketing/AutoDateHistogramAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *

src/Aggregation/Bucketing/ChildrenAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *
@@ -52,7 +54,7 @@ public function getType(): string
 
     public function getArray(): array
     {
-        if (count($this->getAggregations()) == 0) {
+        if ($this->getAggregations() === []) {
             throw new LogicException("Children aggregation `{$this->getName()}` has no aggregations added");
         }
 

src/Aggregation/Bucketing/CompositeAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *

src/Aggregation/Bucketing/DateHistogramAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *
@@ -72,7 +74,7 @@ public function getArray(): array
             'interval' => $this->getInterval(),
         ];
 
-        if (! empty($this->format)) {
+        if ($this->format !== null && $this->format !== '') {
             $out['format'] = $this->format;
         }
 

src/Aggregation/Bucketing/DateRangeAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *
@@ -99,10 +101,10 @@ public function addRange($from = null, $to = null, $key = null)
                 'to' => $to,
                 'key' => $key,
             ],
-            fn ($v) => ! is_null($v)
+            fn ($v) => null !== $v
         );
 
-        if (empty($range)) {
+        if ($range === []) {
             throw new LogicException('Either from or to must be set. Both cannot be null.');
         }
 
@@ -113,7 +115,7 @@ public function addRange($from = null, $to = null, $key = null)
 
     public function getArray(): array
     {
-        if ($this->getField() && $this->getFormat() && ! empty($this->ranges)) {
+        if ($this->getField() && $this->getFormat() && $this->ranges !== []) {
             return [
                 'format' => $this->getFormat(),
                 'field' => $this->getField(),

src/Aggregation/Bucketing/DiversifiedSamplerAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *

src/Aggregation/Bucketing/FilterAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *
@@ -31,7 +33,7 @@ public function __construct(string $name, ?BuilderInterface $filter = null)
     {
         parent::__construct($name);
 
-        if ($filter !== null) {
+        if ($filter instanceof \OpenSearchDSL\BuilderInterface) {
             $this->setFilter($filter);
         }
     }
@@ -55,7 +57,7 @@ public function setField($field): static
 
     public function getArray(): array
     {
-        if ($this->filter === null) {
+        if (! $this->filter instanceof \OpenSearchDSL\BuilderInterface) {
             throw new LogicException("Filter aggregation `{$this->getName()}` has no filter added");
         }
 

src/Aggregation/Bucketing/FiltersAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *
@@ -61,11 +63,11 @@ public function setAnonymous(bool $anonymous): self
      */
     public function addFilter(BuilderInterface $filter, string $name = ''): self
     {
-        if (! $this->anonymous && empty($name)) {
+        if (! $this->anonymous && $name === '') {
             throw new LogicException('In not anonymous filters filter name must be set.');
         }
 
-        if (! $this->anonymous && ! empty($name)) {
+        if (! $this->anonymous && $name !== '') {
             $this->filters['filters'][$name] = $filter->toArray() ?: null;
         } else {
             $this->filters['filters'][] = $filter->toArray() ?: null;

src/Aggregation/Bucketing/GeoDistanceAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *
@@ -110,7 +112,7 @@ public function addRange($from = null, $to = null)
             ],
         );
 
-        if (empty($range)) {
+        if ($range === []) {
             throw new LogicException('Either from or to must be set. Both cannot be null.');
         }
 

src/Aggregation/Bucketing/GeoHashGridAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *

src/Aggregation/Bucketing/GlobalAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *

src/Aggregation/Bucketing/HistogramAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *
@@ -24,9 +26,9 @@ class HistogramAggregation extends AbstractAggregation
 {
     use BucketingTrait;
 
-    public const DIRECTION_ASC = 'asc';
+    final public const DIRECTION_ASC = 'asc';
 
-    public const DIRECTION_DESC = 'desc';
+    final public const DIRECTION_DESC = 'desc';
 
     private ?int $interval = null;
 

src/Aggregation/Bucketing/Ipv4RangeAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *
@@ -75,7 +77,7 @@ public function getType(): string
 
     public function getArray(): array
     {
-        if ($this->getField() && ! empty($this->ranges)) {
+        if ($this->getField() && $this->ranges !== []) {
             return [
                 'field' => $this->getField(),
                 'ranges' => array_values($this->ranges),

src/Aggregation/Bucketing/MissingAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *

src/Aggregation/Bucketing/NestedAggregation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the ONGR package.
  *