support PHP 8.5

.github/workflows/test-application.yaml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout project
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install and configure PHP
         uses: shivammathur/setup-php@v2
@@ -26,7 +26,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: composer-cache
         with:
           path: ${{ steps.composer-cache-dir.outputs.dir }}
@@ -38,14 +38,14 @@ jobs:
         run: composer install --no-interaction --prefer-dist
 
       - name: Check code style
-        run: vendor/bin/ecs
+        run: vendor/bin/php-cs-fixer fix --dry-run
 
   phpstan:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout project
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install and configure PHP
         uses: shivammathur/setup-php@v2
@@ -58,7 +58,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: composer-cache
         with:
           path: ${{ steps.composer-cache-dir.outputs.dir }}
@@ -79,11 +79,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
+        php-version: ['8.3', '8.4', '8.5' ]
 
     steps:
       - name: Checkout project
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install and configure PHP
         uses: shivammathur/setup-php@v2
@@ -96,7 +96,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: composer-cache
         with:
           path: ${{ steps.composer-cache-dir.outputs.dir }}
@@ -120,14 +120,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - opensearch-version: '1'
-            opensearch-composer-version: '^1'
           - opensearch-version: '2'
             opensearch-composer-version: '^2'
+          - opensearch-version: '3'
+            opensearch-composer-version: '^2'
 
     steps:
       - name: Checkout project
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install and configure PHP
         uses: shivammathur/setup-php@v2
@@ -140,7 +140,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: composer-cache
         with:
           path: ${{ steps.composer-cache-dir.outputs.dir }}

composer.json

@@ -2,12 +2,10 @@
     "name": "smoench/opensearch-dsl",
     "description": "OpenSearch DSL library",
     "type": "library",
-    "homepage": "http://ongr.io",
     "license": "MIT",
     "authors": [
         {
-            "name": "ONGR team",
-            "homepage": "http://www.ongr.io"
+            "name": "ONGR team"
         },
         {
             "name": "Handcrafted in the Alps Team",
@@ -19,15 +17,15 @@
         }
     ],
     "require": {
-        "php": "8.1.* || 8.2.* || 8.3.* || 8.4.*",
-        "opensearch-project/opensearch-php": "^1.0 || ^2.3.1"
+        "php": "8.3.* || 8.4.* || 8.5.*",
+        "opensearch-project/opensearch-php": "^2.3.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.5.40",
-        "phpstan/phpstan": "1.12.14",
-        "phpstan/phpstan-phpunit": "1.4.2",
-        "rector/rector": "^1.2.10",
-        "symplify/easy-coding-standard": "^12.5.5"
+        "phpunit/phpunit": "^12.5.2",
+        "phpstan/phpstan": "2.1.33",
+        "phpstan/phpstan-phpunit": "2.0.10",
+        "rector/rector": "2.2.14",
+        "friendsofphp/php-cs-fixer": "3.91.3"
     },
     "autoload": {
         "psr-4": {

rector.php

@@ -12,7 +12,7 @@
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
         __DIR__ . '/src',
-        __DIR__ . '/tests'
+        __DIR__ . '/tests',
     ]);
 
     // register a single rule
@@ -24,8 +24,8 @@
     ]);
 
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_81,
-        PHPUnitSetList::PHPUNIT_100,
+        LevelSetList::UP_TO_PHP_83,
+        PHPUnitSetList::PHPUNIT_120,
         SetList::CODE_QUALITY,
     ]);
 };

src/Aggregation/Bucketing/AdjacencyMatrixAggregation.php

@@ -26,7 +26,7 @@ class AdjacencyMatrixAggregation extends AbstractAggregation
 {
     use BucketingTrait;
 
-    final public const FILTERS = 'filters';
+    final public const string FILTERS = 'filters';
 
     /**
      * @var array<string, array<string, array|null>>

src/Aggregation/Bucketing/DateRangeAggregation.php

@@ -101,7 +101,7 @@ public function addRange($from = null, $to = null, $key = null)
                 'to' => $to,
                 'key' => $key,
             ],
-            fn ($v) => null !== $v
+            fn($v) => null !== $v
         );
 
         if ($range === []) {

src/Aggregation/Bucketing/FilterAggregation.php

@@ -50,6 +50,7 @@ public function getFilter(): ?BuilderInterface
         return $this->filter;
     }
 
+    #[\Override]
     public function setField($field): static
     {
         throw new LogicException("Filter aggregation, doesn't support `field` parameter");

src/Aggregation/Bucketing/GlobalAggregation.php

@@ -27,6 +27,7 @@ class GlobalAggregation extends AbstractAggregation
 {
     use BucketingTrait;
 
+    #[\Override]
     public function setField($field): static
     {
         throw new LogicException("Global aggregation, doesn't support `field` parameter");

src/Aggregation/Bucketing/HistogramAggregation.php

@@ -26,9 +26,9 @@ class HistogramAggregation extends AbstractAggregation
 {
     use BucketingTrait;
 
-    final public const DIRECTION_ASC = 'asc';
+    final public const string DIRECTION_ASC = 'asc';
 
-    final public const DIRECTION_DESC = 'desc';
+    final public const string DIRECTION_DESC = 'desc';
 
     private ?int $interval = null;
 
@@ -161,7 +161,7 @@ public function getArray(): array
                 'keyed' => $this->isKeyed(),
                 'order' => $this->getOrder(),
             ],
-            fn ($val) => $val || is_numeric($val)
+            fn($val) => $val || is_numeric($val)
         );
         $this->checkRequiredParameters($out, ['field', 'interval']);
 

src/Aggregation/Bucketing/SignificantTermsAggregation.php

@@ -20,6 +20,7 @@
  */
 class SignificantTermsAggregation extends TermsAggregation
 {
+    #[\Override]
     public function getType(): string
     {
         return 'significant_terms';

src/Aggregation/Bucketing/SignificantTextAggregation.php

@@ -20,6 +20,7 @@
  */
 class SignificantTextAggregation extends TermsAggregation
 {
+    #[\Override]
     public function getType(): string
     {
         return 'significant_text';

src/Aggregation/Metric/AvgAggregation.php

@@ -20,6 +20,7 @@
  */
 class AvgAggregation extends StatsAggregation
 {
+    #[\Override]
     public function getType(): string
     {
         return 'avg';

src/Aggregation/Metric/CardinalityAggregation.php

@@ -41,7 +41,7 @@ public function getArray(): array
                 'precision_threshold' => $this->getPrecisionThreshold(),
                 'rehash' => $this->isRehash(),
             ],
-            fn ($val) => $val || is_bool($val)
+            fn($val) => $val || is_bool($val)
         );
 
         $this->checkRequiredFields($out);

src/Aggregation/Metric/ExtendedStatsAggregation.php

@@ -79,7 +79,7 @@ public function getArray(): array
                 'script' => $this->getScript(),
                 'sigma' => $this->getSigma(),
             ],
-            fn ($val) => $val || is_numeric($val)
+            fn($val) => $val || is_numeric($val)
         );
     }
 }

src/Aggregation/Metric/MaxAggregation.php

@@ -20,6 +20,7 @@
  */
 class MaxAggregation extends StatsAggregation
 {
+    #[\Override]
     public function getType(): string
     {
         return 'max';

src/Aggregation/Metric/MinAggregation.php

@@ -20,6 +20,7 @@
  */
 class MinAggregation extends StatsAggregation
 {
+    #[\Override]
     public function getType(): string
     {
         return 'min';

src/Aggregation/Metric/PercentileRanksAggregation.php

@@ -88,7 +88,7 @@ public function getArray(): array
                 'values' => $this->getValues(),
                 'compression' => $this->getCompression(),
             ],
-            fn ($val) => $val || is_numeric($val)
+            fn($val) => $val || is_numeric($val)
         );
 
         $this->isRequiredParametersSet($out);

src/Aggregation/Metric/PercentilesAggregation.php

@@ -85,7 +85,7 @@ public function getArray(): array
                 'field' => $this->getField(),
                 'script' => $this->getScript(),
             ],
-            fn ($val) => $val || is_numeric($val)
+            fn($val) => $val || is_numeric($val)
         );
 
         $this->isRequiredParametersSet($out);

src/Aggregation/Metric/SumAggregation.php

@@ -20,6 +20,7 @@
  */
 class SumAggregation extends StatsAggregation
 {
+    #[\Override]
     public function getType(): string
     {
         return 'sum';

src/Aggregation/Metric/TopHitsAggregation.php

@@ -132,7 +132,7 @@ public function getArray(): array|stdClass
                 'size' => $this->getSize(),
                 'from' => $this->getFrom(),
             ],
-            static fn ($value) => $value !== null
+            static fn($value) => $value !== null
         );
 
         return $output === [] ? new stdClass() : $output;

src/Aggregation/Metric/ValueCountAggregation.php

@@ -20,6 +20,7 @@
  */
 class ValueCountAggregation extends StatsAggregation
 {
+    #[\Override]
     public function getType(): string
     {
         return 'value_count';

src/Aggregation/Pipeline/BucketScriptAggregation.php

@@ -47,6 +47,7 @@ public function getType(): string
         return 'bucket_script';
     }
 
+    #[\Override]
     public function getArray(): array
     {
         if ($this->getScript() === null) {

src/Aggregation/Pipeline/BucketSelectorAggregation.php

@@ -20,6 +20,7 @@
  */
 class BucketSelectorAggregation extends BucketScriptAggregation
 {
+    #[\Override]
     public function getType(): string
     {
         return 'bucket_selector';

src/Aggregation/Pipeline/BucketSortAggregation.php

@@ -46,6 +46,7 @@ public function getType(): string
         return 'bucket_sort';
     }
 
+    #[\Override]
     public function getArray(): array
     {
         return array_filter(

src/Aggregation/Pipeline/PercentilesBucketAggregation.php

@@ -45,6 +45,7 @@ public function setPercents(array $percents)
         return $this;
     }
 
+    #[\Override]
     public function getArray(): array
     {
         $data = [

src/BuilderBag.php

@@ -85,7 +85,7 @@ public function all(?string $type = null): array
     {
         return array_filter(
             $this->bag,
-            static fn (BuilderInterface $builder) => $type === null || $builder->getType() === $type
+            static fn(BuilderInterface $builder) => $type === null || $builder->getType() === $type
         );
     }
 

src/FieldCollapse/FieldCollapse.php

@@ -19,8 +19,7 @@ class FieldCollapse implements BuilderInterface
 
     public function __construct(
         private readonly string $field
-    ) {
-    }
+    ) {}
 
     public function addInnerHits(InnerHits $innerHits): self
     {
@@ -42,7 +41,7 @@ public function toArray(): array|stdClass
 
         if ($this->innerHits !== []) {
             $array['inner_hits'] = array_map(
-                static fn (InnerHits $innerHits) => $innerHits->toArray(),
+                static fn(InnerHits $innerHits) => $innerHits->toArray(),
                 $this->innerHits
             );
         }