From c5e6d8c4cd3bf9510773765f2c13534145f82024 Mon Sep 17 00:00:00 2001
From: Oleg Zhulnev <plbsid@gmail.com>
Date: Sun, 24 Mar 2024 17:33:38 +0300
Subject: [PATCH 1/8] Add strict types to Aggregation namespace

---
 src/Aggregation/AbstractAggregation.php       | 2 ++
 src/Aggregation/AbstractSimpleAggregation.php | 2 ++
 src/Aggregation/AbstractTermsAggregation.php  | 2 ++
 src/Aggregation/AdjacencyMatrix.php           | 2 ++
 src/Aggregation/AutoDateHistogram.php         | 2 ++
 src/Aggregation/Avg.php                       | 2 ++
 src/Aggregation/AvgBucket.php                 | 2 ++
 src/Aggregation/BucketScript.php              | 2 ++
 src/Aggregation/BucketSelector.php            | 2 ++
 src/Aggregation/Cardinality.php               | 2 ++
 src/Aggregation/Children.php                  | 2 ++
 src/Aggregation/Composite.php                 | 2 ++
 src/Aggregation/CumulativeSum.php             | 2 ++
 src/Aggregation/DateHistogram.php             | 2 ++
 src/Aggregation/DateRange.php                 | 2 ++
 src/Aggregation/Derivative.php                | 2 ++
 src/Aggregation/DiversifiedSampler.php        | 2 ++
 src/Aggregation/ExtendedStats.php             | 2 ++
 src/Aggregation/ExtendedStatsBucket.php       | 2 ++
 src/Aggregation/Filter.php                    | 2 ++
 src/Aggregation/Filters.php                   | 2 ++
 src/Aggregation/GapPolicyInterface.php        | 2 ++
 src/Aggregation/GeoBounds.php                 | 2 ++
 src/Aggregation/GeoCentroid.php               | 2 ++
 src/Aggregation/GeoDistance.php               | 2 ++
 src/Aggregation/GeohashGrid.php               | 4 +++-
 src/Aggregation/GeotileGridAggregation.php    | 2 ++
 src/Aggregation/GlobalAggregation.php         | 2 ++
 src/Aggregation/Histogram.php                 | 2 ++
 src/Aggregation/IpRange.php                   | 2 ++
 src/Aggregation/Max.php                       | 2 ++
 src/Aggregation/Min.php                       | 2 ++
 src/Aggregation/Missing.php                   | 2 ++
 src/Aggregation/Nested.php                    | 2 ++
 src/Aggregation/NormalizeAggregation.php      | 2 ++
 src/Aggregation/ParentAggregation.php         | 2 ++
 src/Aggregation/Percentiles.php               | 2 ++
 src/Aggregation/PercentilesBucket.php         | 2 ++
 src/Aggregation/Range.php                     | 2 ++
 src/Aggregation/ReverseNested.php             | 2 ++
 src/Aggregation/Sampler.php                   | 2 ++
 src/Aggregation/ScriptedMetric.php            | 2 ++
 src/Aggregation/SerialDiff.php                | 2 ++
 src/Aggregation/SignificantTerms.php          | 2 ++
 src/Aggregation/Stats.php                     | 2 ++
 src/Aggregation/StatsBucket.php               | 2 ++
 src/Aggregation/Sum.php                       | 2 ++
 src/Aggregation/SumBucket.php                 | 2 ++
 src/Aggregation/Terms.php                     | 2 ++
 src/Aggregation/TopHits.php                   | 2 ++
 src/Aggregation/Traits/BucketsPathTrait.php   | 2 ++
 src/Aggregation/Traits/GapPolicyTrait.php     | 2 ++
 src/Aggregation/Traits/KeyedTrait.php         | 2 ++
 src/Aggregation/Traits/MissingTrait.php       | 2 ++
 src/Aggregation/Traits/ShardSizeTrait.php     | 2 ++
 src/Aggregation/ValueCount.php                | 2 ++
 src/Aggregation/WeightedAvg.php               | 2 ++
 57 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/src/Aggregation/AbstractAggregation.php b/src/Aggregation/AbstractAggregation.php
index 0f06504016..914274396f 100644
--- a/src/Aggregation/AbstractAggregation.php
+++ b/src/Aggregation/AbstractAggregation.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Aggregation/AbstractSimpleAggregation.php b/src/Aggregation/AbstractSimpleAggregation.php
index ad836c3ef9..7168a70eb3 100644
--- a/src/Aggregation/AbstractSimpleAggregation.php
+++ b/src/Aggregation/AbstractSimpleAggregation.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Aggregation/AbstractTermsAggregation.php b/src/Aggregation/AbstractTermsAggregation.php
index bd1c416044..31c6193e98 100644
--- a/src/Aggregation/AbstractTermsAggregation.php
+++ b/src/Aggregation/AbstractTermsAggregation.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/AdjacencyMatrix.php b/src/Aggregation/AdjacencyMatrix.php
index add0f4afa0..4d20b3d97a 100644
--- a/src/Aggregation/AdjacencyMatrix.php
+++ b/src/Aggregation/AdjacencyMatrix.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Query\AbstractQuery;
diff --git a/src/Aggregation/AutoDateHistogram.php b/src/Aggregation/AutoDateHistogram.php
index 63b7a9d086..f38646b110 100644
--- a/src/Aggregation/AutoDateHistogram.php
+++ b/src/Aggregation/AutoDateHistogram.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Aggregation\Traits\MissingTrait;
diff --git a/src/Aggregation/Avg.php b/src/Aggregation/Avg.php
index ddd5d6d448..17849ff064 100644
--- a/src/Aggregation/Avg.php
+++ b/src/Aggregation/Avg.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/AvgBucket.php b/src/Aggregation/AvgBucket.php
index 7571f2121b..387b5f318a 100644
--- a/src/Aggregation/AvgBucket.php
+++ b/src/Aggregation/AvgBucket.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/BucketScript.php b/src/Aggregation/BucketScript.php
index 14c2998ab4..a1e0f7959b 100644
--- a/src/Aggregation/BucketScript.php
+++ b/src/Aggregation/BucketScript.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/BucketSelector.php b/src/Aggregation/BucketSelector.php
index 1627e07a32..160d16950b 100644
--- a/src/Aggregation/BucketSelector.php
+++ b/src/Aggregation/BucketSelector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Cardinality.php b/src/Aggregation/Cardinality.php
index 56009d5c8e..ccb1487cea 100644
--- a/src/Aggregation/Cardinality.php
+++ b/src/Aggregation/Cardinality.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Children.php b/src/Aggregation/Children.php
index 2def12b4e0..7e4bb4f310 100644
--- a/src/Aggregation/Children.php
+++ b/src/Aggregation/Children.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Composite.php b/src/Aggregation/Composite.php
index cd0a328f60..e46b0ea7cd 100644
--- a/src/Aggregation/Composite.php
+++ b/src/Aggregation/Composite.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 class Composite extends AbstractAggregation
diff --git a/src/Aggregation/CumulativeSum.php b/src/Aggregation/CumulativeSum.php
index 397a01dfbd..a93a610b46 100644
--- a/src/Aggregation/CumulativeSum.php
+++ b/src/Aggregation/CumulativeSum.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/DateHistogram.php b/src/Aggregation/DateHistogram.php
index 208acb72e9..39e6398a3c 100644
--- a/src/Aggregation/DateHistogram.php
+++ b/src/Aggregation/DateHistogram.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/DateRange.php b/src/Aggregation/DateRange.php
index 250feb6312..6c2ef65ad3 100644
--- a/src/Aggregation/DateRange.php
+++ b/src/Aggregation/DateRange.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Derivative.php b/src/Aggregation/Derivative.php
index a26dbd5610..cb9b22132d 100644
--- a/src/Aggregation/Derivative.php
+++ b/src/Aggregation/Derivative.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/DiversifiedSampler.php b/src/Aggregation/DiversifiedSampler.php
index 40e30bbf5b..1dfa1106ff 100755
--- a/src/Aggregation/DiversifiedSampler.php
+++ b/src/Aggregation/DiversifiedSampler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/ExtendedStats.php b/src/Aggregation/ExtendedStats.php
index 5f0f17a5ce..a7cdfdee8c 100644
--- a/src/Aggregation/ExtendedStats.php
+++ b/src/Aggregation/ExtendedStats.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/ExtendedStatsBucket.php b/src/Aggregation/ExtendedStatsBucket.php
index 8bd3cddf67..66475516a4 100644
--- a/src/Aggregation/ExtendedStatsBucket.php
+++ b/src/Aggregation/ExtendedStatsBucket.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Filter.php b/src/Aggregation/Filter.php
index e3fc9e5d16..74d1c749d6 100644
--- a/src/Aggregation/Filter.php
+++ b/src/Aggregation/Filter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Aggregation/Filters.php b/src/Aggregation/Filters.php
index 4adf573062..371ceca049 100644
--- a/src/Aggregation/Filters.php
+++ b/src/Aggregation/Filters.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Aggregation/GapPolicyInterface.php b/src/Aggregation/GapPolicyInterface.php
index a34bee9607..1d175fd339 100644
--- a/src/Aggregation/GapPolicyInterface.php
+++ b/src/Aggregation/GapPolicyInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Aggregation\Traits\GapPolicyTrait;
diff --git a/src/Aggregation/GeoBounds.php b/src/Aggregation/GeoBounds.php
index f2aeade669..1c4a1a1b6b 100644
--- a/src/Aggregation/GeoBounds.php
+++ b/src/Aggregation/GeoBounds.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/GeoCentroid.php b/src/Aggregation/GeoCentroid.php
index 6cbbec08e7..b151a5375d 100644
--- a/src/Aggregation/GeoCentroid.php
+++ b/src/Aggregation/GeoCentroid.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/GeoDistance.php b/src/Aggregation/GeoDistance.php
index a85309bbbf..7f98e112c9 100644
--- a/src/Aggregation/GeoDistance.php
+++ b/src/Aggregation/GeoDistance.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Aggregation/GeohashGrid.php b/src/Aggregation/GeohashGrid.php
index 1d1f4c18e4..bf90d001c3 100644
--- a/src/Aggregation/GeohashGrid.php
+++ b/src/Aggregation/GeohashGrid.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
@@ -46,7 +48,7 @@ public function setField(string $field): self
     public function setPrecision($precision): self
     {
         if (!\is_int($precision) && !\is_string($precision)) {
-            throw new \TypeError(\sprintf('Argument 1 passed to "%s()" must be of type int|string, %s given.', __METHOD__, \is_object($precision) ? \get_class($precision) : \gettype($precision)));
+            throw new \TypeError(\sprintf('Argument 1 passed to "%s()" must be of type int|string, %s given.', __METHOD__, \is_object($precision) ? $precision::class : \gettype($precision)));
         }
 
         return $this->setParam('precision', $precision);
diff --git a/src/Aggregation/GeotileGridAggregation.php b/src/Aggregation/GeotileGridAggregation.php
index aa41687313..aa2b6ec2cc 100644
--- a/src/Aggregation/GeotileGridAggregation.php
+++ b/src/Aggregation/GeotileGridAggregation.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/GlobalAggregation.php b/src/Aggregation/GlobalAggregation.php
index 365c08ea27..9ab9ccb088 100644
--- a/src/Aggregation/GlobalAggregation.php
+++ b/src/Aggregation/GlobalAggregation.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Histogram.php b/src/Aggregation/Histogram.php
index d951e9f3bd..89be9cad4e 100644
--- a/src/Aggregation/Histogram.php
+++ b/src/Aggregation/Histogram.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/IpRange.php b/src/Aggregation/IpRange.php
index ac78dcdbd9..a44d4805dd 100644
--- a/src/Aggregation/IpRange.php
+++ b/src/Aggregation/IpRange.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Aggregation/Max.php b/src/Aggregation/Max.php
index c97475c6c6..a0c7a21746 100644
--- a/src/Aggregation/Max.php
+++ b/src/Aggregation/Max.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Min.php b/src/Aggregation/Min.php
index 97114e6d5f..8fdc482131 100644
--- a/src/Aggregation/Min.php
+++ b/src/Aggregation/Min.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Missing.php b/src/Aggregation/Missing.php
index c1de19e3d4..aae6808ac1 100644
--- a/src/Aggregation/Missing.php
+++ b/src/Aggregation/Missing.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Nested.php b/src/Aggregation/Nested.php
index 6324952f83..1a7bf37443 100644
--- a/src/Aggregation/Nested.php
+++ b/src/Aggregation/Nested.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/NormalizeAggregation.php b/src/Aggregation/NormalizeAggregation.php
index 536900d211..398b1853ec 100644
--- a/src/Aggregation/NormalizeAggregation.php
+++ b/src/Aggregation/NormalizeAggregation.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/ParentAggregation.php b/src/Aggregation/ParentAggregation.php
index f8610de6f0..2d5b971e92 100644
--- a/src/Aggregation/ParentAggregation.php
+++ b/src/Aggregation/ParentAggregation.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Percentiles.php b/src/Aggregation/Percentiles.php
index 8fc717f6ea..7b1ac27d64 100644
--- a/src/Aggregation/Percentiles.php
+++ b/src/Aggregation/Percentiles.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/PercentilesBucket.php b/src/Aggregation/PercentilesBucket.php
index c0d7e63464..607ced188c 100644
--- a/src/Aggregation/PercentilesBucket.php
+++ b/src/Aggregation/PercentilesBucket.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Range.php b/src/Aggregation/Range.php
index 4f92495689..785d2ac133 100644
--- a/src/Aggregation/Range.php
+++ b/src/Aggregation/Range.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Aggregation/ReverseNested.php b/src/Aggregation/ReverseNested.php
index b1f059451e..7bf58bafdc 100644
--- a/src/Aggregation/ReverseNested.php
+++ b/src/Aggregation/ReverseNested.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Sampler.php b/src/Aggregation/Sampler.php
index c4a944f5b8..f683e4cf17 100644
--- a/src/Aggregation/Sampler.php
+++ b/src/Aggregation/Sampler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/ScriptedMetric.php b/src/Aggregation/ScriptedMetric.php
index dbae414940..ee3dbc2c71 100644
--- a/src/Aggregation/ScriptedMetric.php
+++ b/src/Aggregation/ScriptedMetric.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/SerialDiff.php b/src/Aggregation/SerialDiff.php
index 79c1b187ef..7af527c2c1 100644
--- a/src/Aggregation/SerialDiff.php
+++ b/src/Aggregation/SerialDiff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/SignificantTerms.php b/src/Aggregation/SignificantTerms.php
index 77dff1d202..f7237504ec 100644
--- a/src/Aggregation/SignificantTerms.php
+++ b/src/Aggregation/SignificantTerms.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Query\AbstractQuery;
diff --git a/src/Aggregation/Stats.php b/src/Aggregation/Stats.php
index 1dc5fbda1e..5e7741cdba 100644
--- a/src/Aggregation/Stats.php
+++ b/src/Aggregation/Stats.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/StatsBucket.php b/src/Aggregation/StatsBucket.php
index b55753d1e7..3bcdf36f09 100644
--- a/src/Aggregation/StatsBucket.php
+++ b/src/Aggregation/StatsBucket.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Sum.php b/src/Aggregation/Sum.php
index a778cd0cce..f1009e8488 100644
--- a/src/Aggregation/Sum.php
+++ b/src/Aggregation/Sum.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/SumBucket.php b/src/Aggregation/SumBucket.php
index 88bf4b61cd..137b36d817 100644
--- a/src/Aggregation/SumBucket.php
+++ b/src/Aggregation/SumBucket.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/Terms.php b/src/Aggregation/Terms.php
index 385a2bac3b..42e3658bd8 100644
--- a/src/Aggregation/Terms.php
+++ b/src/Aggregation/Terms.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/TopHits.php b/src/Aggregation/TopHits.php
index 269f4c635c..03914bc9f1 100644
--- a/src/Aggregation/TopHits.php
+++ b/src/Aggregation/TopHits.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Script\AbstractScript;
diff --git a/src/Aggregation/Traits/BucketsPathTrait.php b/src/Aggregation/Traits/BucketsPathTrait.php
index 353230c81b..be70f4875e 100644
--- a/src/Aggregation/Traits/BucketsPathTrait.php
+++ b/src/Aggregation/Traits/BucketsPathTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation\Traits;
 
 trait BucketsPathTrait
diff --git a/src/Aggregation/Traits/GapPolicyTrait.php b/src/Aggregation/Traits/GapPolicyTrait.php
index a5bff2ffb8..3f3ed1b1c1 100644
--- a/src/Aggregation/Traits/GapPolicyTrait.php
+++ b/src/Aggregation/Traits/GapPolicyTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation\Traits;
 
 use Elastica\Aggregation\GapPolicyInterface;
diff --git a/src/Aggregation/Traits/KeyedTrait.php b/src/Aggregation/Traits/KeyedTrait.php
index ec1989277c..90f203ac59 100644
--- a/src/Aggregation/Traits/KeyedTrait.php
+++ b/src/Aggregation/Traits/KeyedTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation\Traits;
 
 trait KeyedTrait
diff --git a/src/Aggregation/Traits/MissingTrait.php b/src/Aggregation/Traits/MissingTrait.php
index f71747facb..386d96291e 100644
--- a/src/Aggregation/Traits/MissingTrait.php
+++ b/src/Aggregation/Traits/MissingTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation\Traits;
 
 trait MissingTrait
diff --git a/src/Aggregation/Traits/ShardSizeTrait.php b/src/Aggregation/Traits/ShardSizeTrait.php
index 1394b07b74..31f701bbbf 100644
--- a/src/Aggregation/Traits/ShardSizeTrait.php
+++ b/src/Aggregation/Traits/ShardSizeTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation\Traits;
 
 trait ShardSizeTrait
diff --git a/src/Aggregation/ValueCount.php b/src/Aggregation/ValueCount.php
index 9d7e8426a6..888916b7cf 100644
--- a/src/Aggregation/ValueCount.php
+++ b/src/Aggregation/ValueCount.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 /**
diff --git a/src/Aggregation/WeightedAvg.php b/src/Aggregation/WeightedAvg.php
index a7b6f26aa6..d3cf339d67 100644
--- a/src/Aggregation/WeightedAvg.php
+++ b/src/Aggregation/WeightedAvg.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Aggregation;
 
 use Elastica\Exception\InvalidException;

From 308188efad3ab17c4bc6ddfa648e3800c57b9df5 Mon Sep 17 00:00:00 2001
From: Oleg Zhulnev <plbsid@gmail.com>
Date: Sun, 24 Mar 2024 17:59:00 +0300
Subject: [PATCH 2/8] Add strict types to Query namespace

---
 src/Query/AbstractGeoDistance.php | 2 ++
 src/Query/AbstractGeoShape.php    | 2 ++
 src/Query/AbstractQuery.php       | 2 ++
 src/Query/AbstractSpanQuery.php   | 2 ++
 src/Query/BoolQuery.php           | 2 ++
 src/Query/Boosting.php            | 2 ++
 src/Query/CombinedFields.php      | 2 ++
 src/Query/ConstantScore.php       | 2 ++
 src/Query/DisMax.php              | 2 ++
 src/Query/DistanceFeature.php     | 2 ++
 src/Query/Exists.php              | 2 ++
 src/Query/FunctionScore.php       | 2 ++
 src/Query/Fuzzy.php               | 2 ++
 src/Query/GeoBoundingBox.php      | 2 ++
 src/Query/GeoDistance.php         | 2 ++
 src/Query/GeoPolygon.php          | 2 ++
 src/Query/GeoShapePreIndexed.php  | 2 ++
 src/Query/GeoShapeProvided.php    | 2 ++
 src/Query/HasChild.php            | 2 ++
 src/Query/HasParent.php           | 2 ++
 src/Query/Ids.php                 | 2 ++
 src/Query/InnerHits.php           | 2 ++
 src/Query/Limit.php               | 2 ++
 src/Query/MatchAll.php            | 2 ++
 src/Query/MatchNone.php           | 2 ++
 src/Query/MatchPhrase.php         | 2 ++
 src/Query/MatchPhrasePrefix.php   | 2 ++
 src/Query/MatchQuery.php          | 2 ++
 src/Query/MoreLikeThis.php        | 2 ++
 src/Query/MultiMatch.php          | 2 ++
 src/Query/Nested.php              | 2 ++
 src/Query/ParentId.php            | 2 ++
 src/Query/Percolate.php           | 2 ++
 src/Query/Prefix.php              | 2 ++
 src/Query/QueryString.php         | 2 ++
 src/Query/Range.php               | 2 ++
 src/Query/Regexp.php              | 2 ++
 src/Query/Script.php              | 2 ++
 src/Query/Simple.php              | 2 ++
 src/Query/SimpleQueryString.php   | 2 ++
 src/Query/SpanContaining.php      | 2 ++
 src/Query/SpanFirst.php           | 2 ++
 src/Query/SpanMulti.php           | 2 ++
 src/Query/SpanNear.php            | 2 ++
 src/Query/SpanNot.php             | 2 ++
 src/Query/SpanOr.php              | 2 ++
 src/Query/SpanTerm.php            | 2 ++
 src/Query/SpanWithin.php          | 2 ++
 src/Query/Term.php                | 2 ++
 src/Query/Terms.php               | 4 +++-
 src/Query/TermsSet.php            | 4 +++-
 src/Query/Wildcard.php            | 2 ++
 52 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/src/Query/AbstractGeoDistance.php b/src/Query/AbstractGeoDistance.php
index d2665743e3..627610c5d2 100644
--- a/src/Query/AbstractGeoDistance.php
+++ b/src/Query/AbstractGeoDistance.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Query/AbstractGeoShape.php b/src/Query/AbstractGeoShape.php
index af4bc3b315..99e9ff0fc4 100644
--- a/src/Query/AbstractGeoShape.php
+++ b/src/Query/AbstractGeoShape.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/AbstractQuery.php b/src/Query/AbstractQuery.php
index d594687846..dc6e1c800f 100644
--- a/src/Query/AbstractQuery.php
+++ b/src/Query/AbstractQuery.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Param;
diff --git a/src/Query/AbstractSpanQuery.php b/src/Query/AbstractSpanQuery.php
index 341cb9cbd1..2046f343e1 100644
--- a/src/Query/AbstractSpanQuery.php
+++ b/src/Query/AbstractSpanQuery.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/BoolQuery.php b/src/Query/BoolQuery.php
index a7d56e28a6..30fb549baa 100644
--- a/src/Query/BoolQuery.php
+++ b/src/Query/BoolQuery.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Query/Boosting.php b/src/Query/Boosting.php
index d3c168661a..f629770800 100644
--- a/src/Query/Boosting.php
+++ b/src/Query/Boosting.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/CombinedFields.php b/src/Query/CombinedFields.php
index cefb8fc10d..bb0a759121 100644
--- a/src/Query/CombinedFields.php
+++ b/src/Query/CombinedFields.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/ConstantScore.php b/src/Query/ConstantScore.php
index 9a5be6978b..6c477921e7 100644
--- a/src/Query/ConstantScore.php
+++ b/src/Query/ConstantScore.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/DisMax.php b/src/Query/DisMax.php
index 2d7475b20a..5502d62ed6 100644
--- a/src/Query/DisMax.php
+++ b/src/Query/DisMax.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Query/DistanceFeature.php b/src/Query/DistanceFeature.php
index 58d7b19dcf..da126f0c04 100644
--- a/src/Query/DistanceFeature.php
+++ b/src/Query/DistanceFeature.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/Exists.php b/src/Query/Exists.php
index 7873c27bae..6a1e3bc242 100644
--- a/src/Query/Exists.php
+++ b/src/Query/Exists.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/FunctionScore.php b/src/Query/FunctionScore.php
index a8e2a8bba8..71d939aa9c 100644
--- a/src/Query/FunctionScore.php
+++ b/src/Query/FunctionScore.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Script\AbstractScript;
diff --git a/src/Query/Fuzzy.php b/src/Query/Fuzzy.php
index b0a5b108fb..073e35c720 100644
--- a/src/Query/Fuzzy.php
+++ b/src/Query/Fuzzy.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Query/GeoBoundingBox.php b/src/Query/GeoBoundingBox.php
index 174d559db5..dca51940f1 100644
--- a/src/Query/GeoBoundingBox.php
+++ b/src/Query/GeoBoundingBox.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Query/GeoDistance.php b/src/Query/GeoDistance.php
index c868793833..a3917f9338 100644
--- a/src/Query/GeoDistance.php
+++ b/src/Query/GeoDistance.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/GeoPolygon.php b/src/Query/GeoPolygon.php
index cc0cfcfddd..583f58aed5 100644
--- a/src/Query/GeoPolygon.php
+++ b/src/Query/GeoPolygon.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/GeoShapePreIndexed.php b/src/Query/GeoShapePreIndexed.php
index cd7097f931..328f3c9e64 100644
--- a/src/Query/GeoShapePreIndexed.php
+++ b/src/Query/GeoShapePreIndexed.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/GeoShapeProvided.php b/src/Query/GeoShapeProvided.php
index 42d0056a0c..7bcf6aceb2 100644
--- a/src/Query/GeoShapeProvided.php
+++ b/src/Query/GeoShapeProvided.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/HasChild.php b/src/Query/HasChild.php
index 198611fca1..cdbeaa5b92 100644
--- a/src/Query/HasChild.php
+++ b/src/Query/HasChild.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Query as BaseQuery;
diff --git a/src/Query/HasParent.php b/src/Query/HasParent.php
index 7e473b44ae..be14a818a2 100644
--- a/src/Query/HasParent.php
+++ b/src/Query/HasParent.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Query as BaseQuery;
diff --git a/src/Query/Ids.php b/src/Query/Ids.php
index 09c83b219b..3353262432 100644
--- a/src/Query/Ids.php
+++ b/src/Query/Ids.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/InnerHits.php b/src/Query/InnerHits.php
index de1671978a..c03ae7a904 100644
--- a/src/Query/InnerHits.php
+++ b/src/Query/InnerHits.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Script\AbstractScript;
diff --git a/src/Query/Limit.php b/src/Query/Limit.php
index 19fb67ef88..414df8bd2d 100644
--- a/src/Query/Limit.php
+++ b/src/Query/Limit.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/MatchAll.php b/src/Query/MatchAll.php
index 0f15bdf2d3..fb3dca0f34 100644
--- a/src/Query/MatchAll.php
+++ b/src/Query/MatchAll.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/MatchNone.php b/src/Query/MatchNone.php
index 38a4ebce2e..f0399abe9b 100644
--- a/src/Query/MatchNone.php
+++ b/src/Query/MatchNone.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/MatchPhrase.php b/src/Query/MatchPhrase.php
index 85c9236e24..922f93b201 100644
--- a/src/Query/MatchPhrase.php
+++ b/src/Query/MatchPhrase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/MatchPhrasePrefix.php b/src/Query/MatchPhrasePrefix.php
index 4cb97040bb..e0d2b56354 100644
--- a/src/Query/MatchPhrasePrefix.php
+++ b/src/Query/MatchPhrasePrefix.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/MatchQuery.php b/src/Query/MatchQuery.php
index dd64e476f1..23ba6e6726 100644
--- a/src/Query/MatchQuery.php
+++ b/src/Query/MatchQuery.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/MoreLikeThis.php b/src/Query/MoreLikeThis.php
index bcf0acb2e7..c0bc5be965 100644
--- a/src/Query/MoreLikeThis.php
+++ b/src/Query/MoreLikeThis.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Document;
diff --git a/src/Query/MultiMatch.php b/src/Query/MultiMatch.php
index e6c77a2850..e6f8dc2858 100644
--- a/src/Query/MultiMatch.php
+++ b/src/Query/MultiMatch.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/Nested.php b/src/Query/Nested.php
index 6924dce185..a052dac747 100644
--- a/src/Query/Nested.php
+++ b/src/Query/Nested.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/ParentId.php b/src/Query/ParentId.php
index 098b77761d..8c53224cb2 100644
--- a/src/Query/ParentId.php
+++ b/src/Query/ParentId.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/Percolate.php b/src/Query/Percolate.php
index e04217cada..6dbe54599f 100644
--- a/src/Query/Percolate.php
+++ b/src/Query/Percolate.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Document;
diff --git a/src/Query/Prefix.php b/src/Query/Prefix.php
index c26c488847..37a1274cb2 100644
--- a/src/Query/Prefix.php
+++ b/src/Query/Prefix.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/QueryString.php b/src/Query/QueryString.php
index 9acb544a71..9e25480d58 100644
--- a/src/Query/QueryString.php
+++ b/src/Query/QueryString.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/Range.php b/src/Query/Range.php
index 038451629b..42a286141c 100644
--- a/src/Query/Range.php
+++ b/src/Query/Range.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/Regexp.php b/src/Query/Regexp.php
index 368f6235ec..94c57d7665 100644
--- a/src/Query/Regexp.php
+++ b/src/Query/Regexp.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/Script.php b/src/Query/Script.php
index 2328e60be6..08ea4ef765 100644
--- a/src/Query/Script.php
+++ b/src/Query/Script.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Script\AbstractScript;
diff --git a/src/Query/Simple.php b/src/Query/Simple.php
index 218c4ada2c..b5d298ba8a 100644
--- a/src/Query/Simple.php
+++ b/src/Query/Simple.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/SimpleQueryString.php b/src/Query/SimpleQueryString.php
index ea02cc0aeb..2803eee351 100644
--- a/src/Query/SimpleQueryString.php
+++ b/src/Query/SimpleQueryString.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/SpanContaining.php b/src/Query/SpanContaining.php
index c4ad06c843..a1b93e33fa 100644
--- a/src/Query/SpanContaining.php
+++ b/src/Query/SpanContaining.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/SpanFirst.php b/src/Query/SpanFirst.php
index cef8831a51..99fd030f51 100644
--- a/src/Query/SpanFirst.php
+++ b/src/Query/SpanFirst.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Query/SpanMulti.php b/src/Query/SpanMulti.php
index d0ccd0c4a1..10c5894505 100644
--- a/src/Query/SpanMulti.php
+++ b/src/Query/SpanMulti.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Query/SpanNear.php b/src/Query/SpanNear.php
index 99fd172022..4a7951c35a 100644
--- a/src/Query/SpanNear.php
+++ b/src/Query/SpanNear.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Query/SpanNot.php b/src/Query/SpanNot.php
index 2448e554a4..9a97366f7a 100644
--- a/src/Query/SpanNot.php
+++ b/src/Query/SpanNot.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/SpanOr.php b/src/Query/SpanOr.php
index c95e5ba531..2bb1196dec 100644
--- a/src/Query/SpanOr.php
+++ b/src/Query/SpanOr.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Query/SpanTerm.php b/src/Query/SpanTerm.php
index 4c78c92b24..d515a89995 100644
--- a/src/Query/SpanTerm.php
+++ b/src/Query/SpanTerm.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/SpanWithin.php b/src/Query/SpanWithin.php
index e2260254c5..4f634d12a3 100644
--- a/src/Query/SpanWithin.php
+++ b/src/Query/SpanWithin.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/Term.php b/src/Query/Term.php
index 67ee8f7ddc..107e763f04 100644
--- a/src/Query/Term.php
+++ b/src/Query/Term.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**
diff --git a/src/Query/Terms.php b/src/Query/Terms.php
index 2b418c60bb..17e3e0d620 100644
--- a/src/Query/Terms.php
+++ b/src/Query/Terms.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Exception\InvalidException;
@@ -50,7 +52,7 @@ public function setTerms(array $terms): self
     public function addTerm($term): self
     {
         if (!\is_scalar($term)) {
-            throw new \TypeError(\sprintf('Argument 1 passed to "%s()" must be a scalar, %s given.', __METHOD__, \is_object($term) ? \get_class($term) : \gettype($term)));
+            throw new \TypeError(\sprintf('Argument 1 passed to "%s()" must be a scalar, %s given.', __METHOD__, \is_object($term) ? $term::class : \gettype($term)));
         }
 
         $terms = $this->getParam($this->field);
diff --git a/src/Query/TermsSet.php b/src/Query/TermsSet.php
index ab52d42db0..68032be1ce 100644
--- a/src/Query/TermsSet.php
+++ b/src/Query/TermsSet.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 use Elastica\Exception\InvalidException;
@@ -33,7 +35,7 @@ public function __construct(string $field, array $terms, $minimumShouldMatch)
         } elseif ($minimumShouldMatch instanceof AbstractScript) {
             $this->setMinimumShouldMatchScript($minimumShouldMatch);
         } else {
-            throw new \TypeError(\sprintf('Argument 3 passed to "%s()" must be of type %s|string, %s given.', __METHOD__, AbstractScript::class, \is_object($minimumShouldMatch) ? \get_class($minimumShouldMatch) : \gettype($minimumShouldMatch)));
+            throw new \TypeError(\sprintf('Argument 3 passed to "%s()" must be of type %s|string, %s given.', __METHOD__, AbstractScript::class, \is_object($minimumShouldMatch) ? $minimumShouldMatch::class : \gettype($minimumShouldMatch)));
         }
     }
 
diff --git a/src/Query/Wildcard.php b/src/Query/Wildcard.php
index 1bc20e13d9..e62f4180b2 100644
--- a/src/Query/Wildcard.php
+++ b/src/Query/Wildcard.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Query;
 
 /**

From 0b40f26fd4ff1006e714fe0143186f2eff2fff9e Mon Sep 17 00:00:00 2001
From: Oleg Zhulnev <plbsid@gmail.com>
Date: Sun, 24 Mar 2024 18:17:03 +0300
Subject: [PATCH 3/8] Add strict types to other namespace

---
 src/Bulk/Action.php                                       | 2 ++
 src/Bulk/Action/AbstractDocument.php                      | 2 ++
 src/Bulk/Action/CreateDocument.php                        | 2 ++
 src/Bulk/Action/DeleteDocument.php                        | 2 ++
 src/Bulk/Action/IndexDocument.php                         | 2 ++
 src/Bulk/Action/UpdateDocument.php                        | 2 ++
 src/Bulk/Response.php                                     | 2 ++
 src/Bulk/ResponseSet.php                                  | 2 ++
 src/Client.php                                            | 2 ++
 src/Cluster/Health.php                                    | 2 ++
 src/Cluster/Health/Index.php                              | 2 ++
 src/Cluster/Health/Shard.php                              | 2 ++
 src/Cluster/Settings.php                                  | 4 +++-
 src/Collapse/InnerHits.php                                | 2 ++
 src/Exception/Bulk/Response/ActionException.php           | 2 ++
 src/Exception/Bulk/ResponseException.php                  | 2 ++
 src/Exception/BulkException.php                           | 2 ++
 src/Exception/ClientException.php                         | 2 ++
 src/Exception/DeprecatedException.php                     | 2 ++
 src/Exception/ExceptionInterface.php                      | 2 ++
 src/Exception/InvalidException.php                        | 2 ++
 src/Exception/NotFoundException.php                       | 2 ++
 src/Exception/NotImplementedException.php                 | 2 ++
 src/Exception/QueryBuilderException.php                   | 2 ++
 src/Exception/RequestEntityTooLargeException.php          | 2 ++
 src/Exception/RuntimeException.php                        | 2 ++
 src/Index/Recovery.php                                    | 2 ++
 src/Index/Settings.php                                    | 8 +++++---
 src/Index/Stats.php                                       | 2 ++
 src/Multi/MultiBuilder.php                                | 2 ++
 src/Multi/MultiBuilderInterface.php                       | 2 ++
 src/Multi/ResultSet.php                                   | 2 ++
 src/Multi/Search.php                                      | 2 ++
 src/Node/Info.php                                         | 2 ++
 src/Node/Stats.php                                        | 2 ++
 src/Processor/AbstractProcessor.php                       | 2 ++
 src/Processor/AppendProcessor.php                         | 2 ++
 src/Processor/AttachmentProcessor.php                     | 2 ++
 src/Processor/BytesProcessor.php                          | 2 ++
 src/Processor/ConvertProcessor.php                        | 2 ++
 src/Processor/DateIndexNameProcessor.php                  | 2 ++
 src/Processor/DateProcessor.php                           | 2 ++
 src/Processor/DotExpanderProcessor.php                    | 2 ++
 src/Processor/FailProcessor.php                           | 2 ++
 src/Processor/ForeachProcessor.php                        | 4 +++-
 src/Processor/JoinProcessor.php                           | 2 ++
 src/Processor/JsonProcessor.php                           | 2 ++
 src/Processor/KvProcessor.php                             | 2 ++
 src/Processor/LowercaseProcessor.php                      | 2 ++
 src/Processor/RemoveProcessor.php                         | 2 ++
 src/Processor/RenameProcessor.php                         | 2 ++
 src/Processor/SetProcessor.php                            | 2 ++
 src/Processor/SortProcessor.php                           | 2 ++
 src/Processor/SplitProcessor.php                          | 2 ++
 src/Processor/Traits/FieldTrait.php                       | 2 ++
 src/Processor/Traits/IgnoreFailureTrait.php               | 2 ++
 src/Processor/Traits/IgnoreMissingTrait.php               | 2 ++
 src/Processor/Traits/TargetFieldTrait.php                 | 2 ++
 src/Processor/TrimProcessor.php                           | 2 ++
 src/Processor/UppercaseProcessor.php                      | 2 ++
 src/QueryBuilder/DSL.php                                  | 2 ++
 src/QueryBuilder/DSL/Aggregation.php                      | 2 ++
 src/QueryBuilder/DSL/Collapse.php                         | 2 ++
 src/QueryBuilder/DSL/Query.php                            | 4 +++-
 src/QueryBuilder/DSL/Suggest.php                          | 2 ++
 src/QueryBuilder/Facade.php                               | 2 ++
 src/QueryBuilder/Version.php                              | 2 ++
 src/QueryBuilder/Version/Latest.php                       | 2 ++
 src/QueryBuilder/Version/Version700.php                   | 2 ++
 src/Rescore/AbstractRescore.php                           | 2 ++
 src/Rescore/Query.php                                     | 2 ++
 src/ResultSet/BuilderInterface.php                        | 2 ++
 src/ResultSet/ChainProcessor.php                          | 2 ++
 src/ResultSet/DefaultBuilder.php                          | 2 ++
 src/ResultSet/ProcessingBuilder.php                       | 2 ++
 src/ResultSet/ProcessorInterface.php                      | 2 ++
 src/Script/AbstractScript.php                             | 2 ++
 src/Script/Script.php                                     | 2 ++
 src/Script/ScriptFields.php                               | 2 ++
 src/Script/ScriptId.php                                   | 2 ++
 src/Suggest/AbstractSuggest.php                           | 2 ++
 .../CandidateGenerator/AbstractCandidateGenerator.php     | 2 ++
 src/Suggest/CandidateGenerator/DirectGenerator.php        | 2 ++
 src/Suggest/Completion.php                                | 2 ++
 src/Suggest/Phrase.php                                    | 2 ++
 src/Suggest/Term.php                                      | 2 ++
 86 files changed, 178 insertions(+), 6 deletions(-)

diff --git a/src/Bulk/Action.php b/src/Bulk/Action.php
index d74775888a..7f94d3d79c 100644
--- a/src/Bulk/Action.php
+++ b/src/Bulk/Action.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Bulk;
 
 use Elastica\Bulk;
diff --git a/src/Bulk/Action/AbstractDocument.php b/src/Bulk/Action/AbstractDocument.php
index 0f4bfdf330..391b2c8b29 100644
--- a/src/Bulk/Action/AbstractDocument.php
+++ b/src/Bulk/Action/AbstractDocument.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Bulk\Action;
 
 use Elastica\AbstractUpdateAction;
diff --git a/src/Bulk/Action/CreateDocument.php b/src/Bulk/Action/CreateDocument.php
index ae868b49ca..47962f7d68 100644
--- a/src/Bulk/Action/CreateDocument.php
+++ b/src/Bulk/Action/CreateDocument.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Bulk\Action;
 
 class CreateDocument extends IndexDocument
diff --git a/src/Bulk/Action/DeleteDocument.php b/src/Bulk/Action/DeleteDocument.php
index bcbd5d857b..a41a037099 100644
--- a/src/Bulk/Action/DeleteDocument.php
+++ b/src/Bulk/Action/DeleteDocument.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Bulk\Action;
 
 use Elastica\AbstractUpdateAction;
diff --git a/src/Bulk/Action/IndexDocument.php b/src/Bulk/Action/IndexDocument.php
index 29c81375a0..0259d5c807 100644
--- a/src/Bulk/Action/IndexDocument.php
+++ b/src/Bulk/Action/IndexDocument.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Bulk\Action;
 
 use Elastica\AbstractUpdateAction;
diff --git a/src/Bulk/Action/UpdateDocument.php b/src/Bulk/Action/UpdateDocument.php
index f0f234844f..394c744105 100644
--- a/src/Bulk/Action/UpdateDocument.php
+++ b/src/Bulk/Action/UpdateDocument.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Bulk\Action;
 
 use Elastica\Document;
diff --git a/src/Bulk/Response.php b/src/Bulk/Response.php
index ff593d95b0..040ac0b809 100644
--- a/src/Bulk/Response.php
+++ b/src/Bulk/Response.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Bulk;
 
 use Elastica\Response as BaseResponse;
diff --git a/src/Bulk/ResponseSet.php b/src/Bulk/ResponseSet.php
index 5f2589494f..15c4ecf063 100644
--- a/src/Bulk/ResponseSet.php
+++ b/src/Bulk/ResponseSet.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Bulk;
 
 use Elastica\Response as BaseResponse;
diff --git a/src/Client.php b/src/Client.php
index 6481946798..31236ebdd1 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\ClientInterface;
diff --git a/src/Cluster/Health.php b/src/Cluster/Health.php
index fa6e067f15..44d2257c01 100644
--- a/src/Cluster/Health.php
+++ b/src/Cluster/Health.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Cluster;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/Cluster/Health/Index.php b/src/Cluster/Health/Index.php
index cee0f939f3..52d0ca676e 100644
--- a/src/Cluster/Health/Index.php
+++ b/src/Cluster/Health/Index.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Cluster\Health;
 
 /**
diff --git a/src/Cluster/Health/Shard.php b/src/Cluster/Health/Shard.php
index a945d9f3b8..04b7c8b14a 100644
--- a/src/Cluster/Health/Shard.php
+++ b/src/Cluster/Health/Shard.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Cluster\Health;
 
 /**
diff --git a/src/Cluster/Settings.php b/src/Cluster/Settings.php
index b733b3ab9f..5a8702ec11 100644
--- a/src/Cluster/Settings.php
+++ b/src/Cluster/Settings.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Cluster;
 
 use Elastica\Client;
@@ -79,7 +81,7 @@ public function getTransient(string $setting = '')
                 return $settings[$setting];
             }
 
-            if (false !== \strpos($setting, '.')) {
+            if (\str_contains($setting, '.')) {
                 // convert dot notation to nested arrays
                 $keys = \explode('.', $setting);
                 foreach ($keys as $key) {
diff --git a/src/Collapse/InnerHits.php b/src/Collapse/InnerHits.php
index b3123c6e75..a3dfd8588e 100644
--- a/src/Collapse/InnerHits.php
+++ b/src/Collapse/InnerHits.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Collapse;
 
 use Elastica\Collapse;
diff --git a/src/Exception/Bulk/Response/ActionException.php b/src/Exception/Bulk/Response/ActionException.php
index d8e9a0eb6a..e360538247 100644
--- a/src/Exception/Bulk/Response/ActionException.php
+++ b/src/Exception/Bulk/Response/ActionException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Exception\Bulk\Response;
 
 use Elastica\Bulk\Action;
diff --git a/src/Exception/Bulk/ResponseException.php b/src/Exception/Bulk/ResponseException.php
index 9be64c358a..fd5d9e1ed3 100644
--- a/src/Exception/Bulk/ResponseException.php
+++ b/src/Exception/Bulk/ResponseException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Exception\Bulk;
 
 use Elastica\Bulk\ResponseSet;
diff --git a/src/Exception/BulkException.php b/src/Exception/BulkException.php
index 6d38455687..52d8fce28f 100644
--- a/src/Exception/BulkException.php
+++ b/src/Exception/BulkException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Exception;
 
 class BulkException extends \RuntimeException implements ExceptionInterface
diff --git a/src/Exception/ClientException.php b/src/Exception/ClientException.php
index 0fe7ce0750..f4ea1f7e6d 100644
--- a/src/Exception/ClientException.php
+++ b/src/Exception/ClientException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Exception;
 
 /**
diff --git a/src/Exception/DeprecatedException.php b/src/Exception/DeprecatedException.php
index e7d0bd8479..63c68acb7d 100644
--- a/src/Exception/DeprecatedException.php
+++ b/src/Exception/DeprecatedException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Exception;
 
 /**
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index 2a3ccbbce5..df071362ad 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Exception;
 
 /**
diff --git a/src/Exception/InvalidException.php b/src/Exception/InvalidException.php
index ad115122c2..04282bbd17 100644
--- a/src/Exception/InvalidException.php
+++ b/src/Exception/InvalidException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Exception;
 
 /**
diff --git a/src/Exception/NotFoundException.php b/src/Exception/NotFoundException.php
index 364c7f5f82..c70033ba92 100644
--- a/src/Exception/NotFoundException.php
+++ b/src/Exception/NotFoundException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Exception;
 
 /**
diff --git a/src/Exception/NotImplementedException.php b/src/Exception/NotImplementedException.php
index e73b584d82..f2e02a318b 100644
--- a/src/Exception/NotImplementedException.php
+++ b/src/Exception/NotImplementedException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Exception;
 
 /**
diff --git a/src/Exception/QueryBuilderException.php b/src/Exception/QueryBuilderException.php
index e047c67eae..fdf3ceefd4 100644
--- a/src/Exception/QueryBuilderException.php
+++ b/src/Exception/QueryBuilderException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Exception;
 
 /**
diff --git a/src/Exception/RequestEntityTooLargeException.php b/src/Exception/RequestEntityTooLargeException.php
index 169882aa4d..bbd2d5b60d 100644
--- a/src/Exception/RequestEntityTooLargeException.php
+++ b/src/Exception/RequestEntityTooLargeException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Exception;
 
 class RequestEntityTooLargeException extends \RuntimeException implements ExceptionInterface
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index e9977e942a..ca4520c668 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Exception;
 
 /**
diff --git a/src/Index/Recovery.php b/src/Index/Recovery.php
index 3869c3fc72..2aaa0e221a 100644
--- a/src/Index/Recovery.php
+++ b/src/Index/Recovery.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Index;
 
 use Elastica\Index as BaseIndex;
diff --git a/src/Index/Settings.php b/src/Index/Settings.php
index df166e685f..a5c069d0e8 100644
--- a/src/Index/Settings.php
+++ b/src/Index/Settings.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Index;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
@@ -110,7 +112,7 @@ public function get(string $setting = '', bool $includeDefaults = false)
             return $settings[$setting];
         }
 
-        if (false !== \strpos($setting, '.')) {
+        if (\str_contains($setting, '.')) {
             // translate old dot-notation settings to nested arrays
             $keys = \explode('.', $setting);
             foreach ($keys as $key) {
@@ -178,7 +180,7 @@ public function setNumberOfReplicas(int $replicas): Response
      */
     public function getNumberOfReplicas(): int
     {
-        return $this->get('number_of_replicas') ?? self::DEFAULT_NUMBER_OF_REPLICAS;
+        return (int) ($this->get('number_of_replicas') ?? self::DEFAULT_NUMBER_OF_REPLICAS);
     }
 
     /**
@@ -195,7 +197,7 @@ public function getNumberOfReplicas(): int
      */
     public function getNumberOfShards(): int
     {
-        return $this->get('number_of_shards') ?? self::DEFAULT_NUMBER_OF_SHARDS;
+        return (int) ($this->get('number_of_shards') ?? self::DEFAULT_NUMBER_OF_SHARDS);
     }
 
     /**
diff --git a/src/Index/Stats.php b/src/Index/Stats.php
index e986500355..93269b5703 100644
--- a/src/Index/Stats.php
+++ b/src/Index/Stats.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Index;
 
 use Elastica\Index;
diff --git a/src/Multi/MultiBuilder.php b/src/Multi/MultiBuilder.php
index 4c96eb223c..a58c22dd81 100644
--- a/src/Multi/MultiBuilder.php
+++ b/src/Multi/MultiBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Multi;
 
 use Elastica\Response;
diff --git a/src/Multi/MultiBuilderInterface.php b/src/Multi/MultiBuilderInterface.php
index 6b757536c7..5a6ef4346a 100644
--- a/src/Multi/MultiBuilderInterface.php
+++ b/src/Multi/MultiBuilderInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Multi;
 
 use Elastica\Response;
diff --git a/src/Multi/ResultSet.php b/src/Multi/ResultSet.php
index 9ef6768217..c3225c1229 100644
--- a/src/Multi/ResultSet.php
+++ b/src/Multi/ResultSet.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Multi;
 
 use Elastica\Response;
diff --git a/src/Multi/Search.php b/src/Multi/Search.php
index b82a5ad59b..ff2fb778b4 100644
--- a/src/Multi/Search.php
+++ b/src/Multi/Search.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Multi;
 
 use Elastica\Client;
diff --git a/src/Node/Info.php b/src/Node/Info.php
index 462ead4e5c..78a4ace09f 100644
--- a/src/Node/Info.php
+++ b/src/Node/Info.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Node;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/Node/Stats.php b/src/Node/Stats.php
index a3f3050cda..160230fda1 100644
--- a/src/Node/Stats.php
+++ b/src/Node/Stats.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Node;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/Processor/AbstractProcessor.php b/src/Processor/AbstractProcessor.php
index 284d88db77..d29d95fc21 100644
--- a/src/Processor/AbstractProcessor.php
+++ b/src/Processor/AbstractProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 use Elastica\Param;
diff --git a/src/Processor/AppendProcessor.php b/src/Processor/AppendProcessor.php
index ac3ac84d8d..f6da14bbce 100644
--- a/src/Processor/AppendProcessor.php
+++ b/src/Processor/AppendProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/AttachmentProcessor.php b/src/Processor/AttachmentProcessor.php
index b159207a5e..c9caa15ac8 100644
--- a/src/Processor/AttachmentProcessor.php
+++ b/src/Processor/AttachmentProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/BytesProcessor.php b/src/Processor/BytesProcessor.php
index 5530eafa67..92e2b4e829 100644
--- a/src/Processor/BytesProcessor.php
+++ b/src/Processor/BytesProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/ConvertProcessor.php b/src/Processor/ConvertProcessor.php
index 124a521d0d..c7a0df90f6 100644
--- a/src/Processor/ConvertProcessor.php
+++ b/src/Processor/ConvertProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/DateIndexNameProcessor.php b/src/Processor/DateIndexNameProcessor.php
index 566b1c8092..26be1cfcdb 100644
--- a/src/Processor/DateIndexNameProcessor.php
+++ b/src/Processor/DateIndexNameProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/DateProcessor.php b/src/Processor/DateProcessor.php
index 1a049d4413..e230ea5d6e 100644
--- a/src/Processor/DateProcessor.php
+++ b/src/Processor/DateProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/DotExpanderProcessor.php b/src/Processor/DotExpanderProcessor.php
index bb65b1d903..ac3ed32970 100644
--- a/src/Processor/DotExpanderProcessor.php
+++ b/src/Processor/DotExpanderProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/FailProcessor.php b/src/Processor/FailProcessor.php
index a020f072cb..aa0beaf866 100644
--- a/src/Processor/FailProcessor.php
+++ b/src/Processor/FailProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/ForeachProcessor.php b/src/Processor/ForeachProcessor.php
index 4fb92d2aec..4d25684166 100644
--- a/src/Processor/ForeachProcessor.php
+++ b/src/Processor/ForeachProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
@@ -30,7 +32,7 @@ public function __construct(string $field, $processor)
         } elseif (\is_array($processor)) {
             $this->setRawProcessor($processor);
         } else {
-            throw new \TypeError(\sprintf('Argument 2 passed to %s::__construct() must be of type %s|array, %s given.', self::class, AbstractProcessor::class, \is_object($processor) ? \get_class($processor) : \gettype($processor)));
+            throw new \TypeError(\sprintf('Argument 2 passed to %s::__construct() must be of type %s|array, %s given.', self::class, AbstractProcessor::class, \is_object($processor) ? $processor::class : \gettype($processor)));
         }
     }
 
diff --git a/src/Processor/JoinProcessor.php b/src/Processor/JoinProcessor.php
index d3d786b3fa..52ddcf6b1d 100644
--- a/src/Processor/JoinProcessor.php
+++ b/src/Processor/JoinProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/JsonProcessor.php b/src/Processor/JsonProcessor.php
index 786c85f7d0..6e6895cde3 100644
--- a/src/Processor/JsonProcessor.php
+++ b/src/Processor/JsonProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/KvProcessor.php b/src/Processor/KvProcessor.php
index d28e43fcdf..38d8f944f2 100644
--- a/src/Processor/KvProcessor.php
+++ b/src/Processor/KvProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/LowercaseProcessor.php b/src/Processor/LowercaseProcessor.php
index 440045c91d..abd06400aa 100644
--- a/src/Processor/LowercaseProcessor.php
+++ b/src/Processor/LowercaseProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/RemoveProcessor.php b/src/Processor/RemoveProcessor.php
index 525157bf46..b81d5ea129 100644
--- a/src/Processor/RemoveProcessor.php
+++ b/src/Processor/RemoveProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/RenameProcessor.php b/src/Processor/RenameProcessor.php
index 99f3d97a0b..81f0eb8465 100644
--- a/src/Processor/RenameProcessor.php
+++ b/src/Processor/RenameProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/SetProcessor.php b/src/Processor/SetProcessor.php
index 9b9422b3da..1c2044bd73 100644
--- a/src/Processor/SetProcessor.php
+++ b/src/Processor/SetProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/SortProcessor.php b/src/Processor/SortProcessor.php
index 13e6d5b990..56eaf50f33 100644
--- a/src/Processor/SortProcessor.php
+++ b/src/Processor/SortProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/SplitProcessor.php b/src/Processor/SplitProcessor.php
index a3d4bcd9b4..ee966e5c93 100644
--- a/src/Processor/SplitProcessor.php
+++ b/src/Processor/SplitProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/Traits/FieldTrait.php b/src/Processor/Traits/FieldTrait.php
index e8da306501..3b51730716 100644
--- a/src/Processor/Traits/FieldTrait.php
+++ b/src/Processor/Traits/FieldTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor\Traits;
 
 trait FieldTrait
diff --git a/src/Processor/Traits/IgnoreFailureTrait.php b/src/Processor/Traits/IgnoreFailureTrait.php
index e6aceb3e94..fe01022a7e 100644
--- a/src/Processor/Traits/IgnoreFailureTrait.php
+++ b/src/Processor/Traits/IgnoreFailureTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor\Traits;
 
 trait IgnoreFailureTrait
diff --git a/src/Processor/Traits/IgnoreMissingTrait.php b/src/Processor/Traits/IgnoreMissingTrait.php
index 381b01e2d4..02fd9c6cc7 100644
--- a/src/Processor/Traits/IgnoreMissingTrait.php
+++ b/src/Processor/Traits/IgnoreMissingTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor\Traits;
 
 trait IgnoreMissingTrait
diff --git a/src/Processor/Traits/TargetFieldTrait.php b/src/Processor/Traits/TargetFieldTrait.php
index 3850554ba0..671ba32a62 100644
--- a/src/Processor/Traits/TargetFieldTrait.php
+++ b/src/Processor/Traits/TargetFieldTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor\Traits;
 
 trait TargetFieldTrait
diff --git a/src/Processor/TrimProcessor.php b/src/Processor/TrimProcessor.php
index 48c1c0299c..f1228a0921 100644
--- a/src/Processor/TrimProcessor.php
+++ b/src/Processor/TrimProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/Processor/UppercaseProcessor.php b/src/Processor/UppercaseProcessor.php
index 95a9e4ee36..1f3a09e4fa 100644
--- a/src/Processor/UppercaseProcessor.php
+++ b/src/Processor/UppercaseProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Processor;
 
 /**
diff --git a/src/QueryBuilder/DSL.php b/src/QueryBuilder/DSL.php
index bfade3ab55..42fbe62a2f 100644
--- a/src/QueryBuilder/DSL.php
+++ b/src/QueryBuilder/DSL.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\QueryBuilder;
 
 /**
diff --git a/src/QueryBuilder/DSL/Aggregation.php b/src/QueryBuilder/DSL/Aggregation.php
index 333a10bbcd..ef4b846a46 100644
--- a/src/QueryBuilder/DSL/Aggregation.php
+++ b/src/QueryBuilder/DSL/Aggregation.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\QueryBuilder\DSL;
 
 use Elastica\Aggregation\AdjacencyMatrix;
diff --git a/src/QueryBuilder/DSL/Collapse.php b/src/QueryBuilder/DSL/Collapse.php
index 217efa3023..b8ca297014 100644
--- a/src/QueryBuilder/DSL/Collapse.php
+++ b/src/QueryBuilder/DSL/Collapse.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\QueryBuilder\DSL;
 
 use Elastica\Collapse\InnerHits;
diff --git a/src/QueryBuilder/DSL/Query.php b/src/QueryBuilder/DSL/Query.php
index 012a876e3e..90c9c598b2 100644
--- a/src/QueryBuilder/DSL/Query.php
+++ b/src/QueryBuilder/DSL/Query.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\QueryBuilder\DSL;
 
 use Elastica\Query\AbstractQuery;
@@ -299,7 +301,7 @@ public function nested(): Nested
      */
     public function parent_id(string $type, $id, bool $ignoreUnmapped = false): ParentId
     {
-        return new ParentId($type, $id, $ignoreUnmapped);
+        return new ParentId($type, (string) $id, $ignoreUnmapped);
     }
 
     /**
diff --git a/src/QueryBuilder/DSL/Suggest.php b/src/QueryBuilder/DSL/Suggest.php
index 801a619f84..00042dcf93 100644
--- a/src/QueryBuilder/DSL/Suggest.php
+++ b/src/QueryBuilder/DSL/Suggest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\QueryBuilder\DSL;
 
 use Elastica\QueryBuilder\DSL;
diff --git a/src/QueryBuilder/Facade.php b/src/QueryBuilder/Facade.php
index 6e3e829847..cf27a8302e 100644
--- a/src/QueryBuilder/Facade.php
+++ b/src/QueryBuilder/Facade.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\QueryBuilder;
 
 use Elastica\Exception\QueryBuilderException;
diff --git a/src/QueryBuilder/Version.php b/src/QueryBuilder/Version.php
index 83d1efd7d7..0ba118c0b9 100644
--- a/src/QueryBuilder/Version.php
+++ b/src/QueryBuilder/Version.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\QueryBuilder;
 
 /**
diff --git a/src/QueryBuilder/Version/Latest.php b/src/QueryBuilder/Version/Latest.php
index 42a36874e8..2196c22de6 100644
--- a/src/QueryBuilder/Version/Latest.php
+++ b/src/QueryBuilder/Version/Latest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\QueryBuilder\Version;
 
 /**
diff --git a/src/QueryBuilder/Version/Version700.php b/src/QueryBuilder/Version/Version700.php
index 247a915cd5..03efe793a9 100644
--- a/src/QueryBuilder/Version/Version700.php
+++ b/src/QueryBuilder/Version/Version700.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\QueryBuilder\Version;
 
 use Elastica\QueryBuilder\Version;
diff --git a/src/Rescore/AbstractRescore.php b/src/Rescore/AbstractRescore.php
index 5d6e8dd4b1..7d169f3964 100644
--- a/src/Rescore/AbstractRescore.php
+++ b/src/Rescore/AbstractRescore.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Rescore;
 
 use Elastica\Param;
diff --git a/src/Rescore/Query.php b/src/Rescore/Query.php
index e80ad0a6b7..d6eef0aa80 100644
--- a/src/Rescore/Query.php
+++ b/src/Rescore/Query.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Rescore;
 
 use Elastica\Query\AbstractQuery;
diff --git a/src/ResultSet/BuilderInterface.php b/src/ResultSet/BuilderInterface.php
index b7a3ac8fe3..a3751e1b9d 100644
--- a/src/ResultSet/BuilderInterface.php
+++ b/src/ResultSet/BuilderInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\ResultSet;
 
 use Elastica\Query;
diff --git a/src/ResultSet/ChainProcessor.php b/src/ResultSet/ChainProcessor.php
index 723adf6884..352f92af95 100644
--- a/src/ResultSet/ChainProcessor.php
+++ b/src/ResultSet/ChainProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\ResultSet;
 
 use Elastica\ResultSet;
diff --git a/src/ResultSet/DefaultBuilder.php b/src/ResultSet/DefaultBuilder.php
index 7dc8f9a3e0..fdbbd1a844 100644
--- a/src/ResultSet/DefaultBuilder.php
+++ b/src/ResultSet/DefaultBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\ResultSet;
 
 use Elastica\Query;
diff --git a/src/ResultSet/ProcessingBuilder.php b/src/ResultSet/ProcessingBuilder.php
index 8d5e87e51c..62e56a1530 100644
--- a/src/ResultSet/ProcessingBuilder.php
+++ b/src/ResultSet/ProcessingBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\ResultSet;
 
 use Elastica\Query;
diff --git a/src/ResultSet/ProcessorInterface.php b/src/ResultSet/ProcessorInterface.php
index 4d04991496..5f16f18a34 100644
--- a/src/ResultSet/ProcessorInterface.php
+++ b/src/ResultSet/ProcessorInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\ResultSet;
 
 use Elastica\ResultSet;
diff --git a/src/Script/AbstractScript.php b/src/Script/AbstractScript.php
index 08b322eb1c..1941059839 100644
--- a/src/Script/AbstractScript.php
+++ b/src/Script/AbstractScript.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Script;
 
 use Elastica\AbstractUpdateAction;
diff --git a/src/Script/Script.php b/src/Script/Script.php
index d6dee4645a..48ee7d0568 100644
--- a/src/Script/Script.php
+++ b/src/Script/Script.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Script;
 
 /**
diff --git a/src/Script/ScriptFields.php b/src/Script/ScriptFields.php
index 67385becac..5d3fbc6a27 100644
--- a/src/Script/ScriptFields.php
+++ b/src/Script/ScriptFields.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Script;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Script/ScriptId.php b/src/Script/ScriptId.php
index f5e746760b..6a38130fd1 100644
--- a/src/Script/ScriptId.php
+++ b/src/Script/ScriptId.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Script;
 
 /**
diff --git a/src/Suggest/AbstractSuggest.php b/src/Suggest/AbstractSuggest.php
index 732843e788..013b12a6ed 100644
--- a/src/Suggest/AbstractSuggest.php
+++ b/src/Suggest/AbstractSuggest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Suggest;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Suggest/CandidateGenerator/AbstractCandidateGenerator.php b/src/Suggest/CandidateGenerator/AbstractCandidateGenerator.php
index eb0eeed6c9..91c499d41f 100644
--- a/src/Suggest/CandidateGenerator/AbstractCandidateGenerator.php
+++ b/src/Suggest/CandidateGenerator/AbstractCandidateGenerator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Suggest\CandidateGenerator;
 
 use Elastica\Param;
diff --git a/src/Suggest/CandidateGenerator/DirectGenerator.php b/src/Suggest/CandidateGenerator/DirectGenerator.php
index bc66350f0c..3c5a249da8 100644
--- a/src/Suggest/CandidateGenerator/DirectGenerator.php
+++ b/src/Suggest/CandidateGenerator/DirectGenerator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Suggest\CandidateGenerator;
 
 /**
diff --git a/src/Suggest/Completion.php b/src/Suggest/Completion.php
index 4ef87ccad9..160faef3f3 100644
--- a/src/Suggest/Completion.php
+++ b/src/Suggest/Completion.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Suggest;
 
 /**
diff --git a/src/Suggest/Phrase.php b/src/Suggest/Phrase.php
index 13dc58a8e5..d280e22e32 100644
--- a/src/Suggest/Phrase.php
+++ b/src/Suggest/Phrase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Suggest;
 
 use Elastica\Suggest\CandidateGenerator\DirectGenerator;
diff --git a/src/Suggest/Term.php b/src/Suggest/Term.php
index 66d6407540..3d765af1de 100644
--- a/src/Suggest/Term.php
+++ b/src/Suggest/Term.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Suggest;
 
 /**

From 1046d27b7e8fae18fad153714f2d4dba456ad967 Mon Sep 17 00:00:00 2001
From: Oleg Zhulnev <plbsid@gmail.com>
Date: Sun, 24 Mar 2024 18:33:38 +0300
Subject: [PATCH 4/8] Add strict types to root namespace

---
 src/AbstractUpdateAction.php | 2 ++
 src/ArrayableInterface.php   | 2 ++
 src/Bulk.php                 | 2 ++
 src/ClientConfiguration.php  | 2 ++
 src/Cluster.php              | 2 ++
 src/Collapse.php             | 2 ++
 src/Document.php             | 2 ++
 src/Index.php                | 2 ++
 src/IndexTemplate.php        | 2 ++
 src/Mapping.php              | 2 ++
 src/NameableInterface.php    | 2 ++
 src/Node.php                 | 2 ++
 src/Param.php                | 2 ++
 src/Pipeline.php             | 2 ++
 src/PointInTime.php          | 2 ++
 src/Query.php                | 2 ++
 src/QueryBuilder.php         | 2 ++
 src/Reindex.php              | 2 ++
 src/Request.php              | 2 ++
 src/Result.php               | 2 ++
 src/ResultSet.php            | 2 ++
 src/Scroll.php               | 2 ++
 src/Search.php               | 2 ++
 src/SearchableInterface.php  | 2 ++
 src/Snapshot.php             | 2 ++
 src/Status.php               | 6 +++---
 src/Suggest.php              | 2 ++
 src/Task.php                 | 2 ++
 src/Util.php                 | 6 ++++--
 29 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/src/AbstractUpdateAction.php b/src/AbstractUpdateAction.php
index 6ddbf84163..508f63df84 100644
--- a/src/AbstractUpdateAction.php
+++ b/src/AbstractUpdateAction.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/ArrayableInterface.php b/src/ArrayableInterface.php
index 5e6b4debf3..2e5af6c22b 100644
--- a/src/ArrayableInterface.php
+++ b/src/ArrayableInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 /**
diff --git a/src/Bulk.php b/src/Bulk.php
index cb31b6eeef..6d887f2592 100644
--- a/src/Bulk.php
+++ b/src/Bulk.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/ClientConfiguration.php b/src/ClientConfiguration.php
index f518e5d18f..d4920c114e 100644
--- a/src/ClientConfiguration.php
+++ b/src/ClientConfiguration.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Cluster.php b/src/Cluster.php
index 8b79780a88..0769bdade9 100644
--- a/src/Cluster.php
+++ b/src/Cluster.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/Collapse.php b/src/Collapse.php
index f5035d2613..b136bdedf7 100644
--- a/src/Collapse.php
+++ b/src/Collapse.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Collapse\InnerHits;
diff --git a/src/Document.php b/src/Document.php
index b0f216b7d0..17f9bccd11 100644
--- a/src/Document.php
+++ b/src/Document.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Bulk\Action;
diff --git a/src/Index.php b/src/Index.php
index 534e820514..4f001e3a5f 100644
--- a/src/Index.php
+++ b/src/Index.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/IndexTemplate.php b/src/IndexTemplate.php
index 9283c41aa6..8db743f980 100644
--- a/src/IndexTemplate.php
+++ b/src/IndexTemplate.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/Mapping.php b/src/Mapping.php
index 37facc0337..5d8ccc3c07 100644
--- a/src/Mapping.php
+++ b/src/Mapping.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/NameableInterface.php b/src/NameableInterface.php
index d5f097f77a..e8d1c8186e 100644
--- a/src/NameableInterface.php
+++ b/src/NameableInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 /**
diff --git a/src/Node.php b/src/Node.php
index 3bcd5d9fc2..a5e23e35f0 100644
--- a/src/Node.php
+++ b/src/Node.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Node\Info;
diff --git a/src/Param.php b/src/Param.php
index 74acc157de..86cf202a85 100644
--- a/src/Param.php
+++ b/src/Param.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Pipeline.php b/src/Pipeline.php
index 390db8b061..33dee1069b 100644
--- a/src/Pipeline.php
+++ b/src/Pipeline.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/PointInTime.php b/src/PointInTime.php
index ccdfc26ce3..f37dca4837 100644
--- a/src/PointInTime.php
+++ b/src/PointInTime.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 /**
diff --git a/src/Query.php b/src/Query.php
index 585d79c45e..fe1e975e6c 100644
--- a/src/Query.php
+++ b/src/Query.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Aggregation\AbstractAggregation;
diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php
index c1d885da3e..c8cd6b7f66 100644
--- a/src/QueryBuilder.php
+++ b/src/QueryBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Exception\QueryBuilderException;
diff --git a/src/Reindex.php b/src/Reindex.php
index a74b12ad42..2d8fb1fcf9 100644
--- a/src/Reindex.php
+++ b/src/Reindex.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/Request.php b/src/Request.php
index b221a93d6e..0f456689df 100644
--- a/src/Request.php
+++ b/src/Request.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 /**
diff --git a/src/Result.php b/src/Result.php
index a411723e3a..511e8c990f 100644
--- a/src/Result.php
+++ b/src/Result.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 /**
diff --git a/src/ResultSet.php b/src/ResultSet.php
index fe6352d62c..a04f58c54e 100644
--- a/src/ResultSet.php
+++ b/src/ResultSet.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Exception\InvalidException;
diff --git a/src/Scroll.php b/src/Scroll.php
index e5e985ec7c..c19cde2ddd 100644
--- a/src/Scroll.php
+++ b/src/Scroll.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/Search.php b/src/Search.php
index 43edb58a76..4294d7388b 100644
--- a/src/Search.php
+++ b/src/Search.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/SearchableInterface.php b/src/SearchableInterface.php
index 3126495823..12dd384caf 100644
--- a/src/SearchableInterface.php
+++ b/src/SearchableInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/Snapshot.php b/src/Snapshot.php
index 5a5da70e34..e624212840 100644
--- a/src/Snapshot.php
+++ b/src/Snapshot.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/Status.php b/src/Status.php
index 8ce9487c30..d1fda717a5 100644
--- a/src/Status.php
+++ b/src/Status.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
@@ -63,9 +65,7 @@ public function getIndexNames()
     {
         $data = $this->getData();
 
-        return \array_map(static function ($name): string {
-            return (string) $name;
-        }, \array_keys($data['indices']));
+        return \array_map(static fn ($name): string => (string) $name, \array_keys($data['indices']));
     }
 
     /**
diff --git a/src/Suggest.php b/src/Suggest.php
index dfe604b84b..1fa1536d9d 100644
--- a/src/Suggest.php
+++ b/src/Suggest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Exception\NotImplementedException;
diff --git a/src/Task.php b/src/Task.php
index be02d89d71..1d4209ae2a 100644
--- a/src/Task.php
+++ b/src/Task.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/src/Util.php b/src/Util.php
index 7e23ac5c28..4a6ff2fa09 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 /**
@@ -28,7 +30,7 @@ class Util
     public static function isDateMathEscaped($requestUri)
     {
         // In practice, the only symbol that really needs to be escaped in URI is '/' => '%2F'
-        return false !== \strpos(\strtoupper($requestUri), '%2F');
+        return \str_contains(\strtoupper($requestUri), '%2F');
     }
 
     /**
@@ -64,7 +66,7 @@ public static function escapeDateMath($requestUri)
         $escapedUriSegment = \str_replace(static::$dateMathSymbols, static::$escapedDateMathSymbols, $uriSegment);
 
         // '\\{' and '\\}' should not be escaped
-        if (false !== \strpos($uriSegment, '\\\\')) {
+        if (\str_contains($uriSegment, '\\\\')) {
             $escapedUriSegment = \str_replace(['\\\\%7B', '\\\\%7D'], ['\\\\{', '\\\\}'], $escapedUriSegment);
         }
 

From 49a378a9f9cfab9040b49f5deb2054d57273ad98 Mon Sep 17 00:00:00 2001
From: Oleg Zhulnev <plbsid@gmail.com>
Date: Sun, 24 Mar 2024 18:43:32 +0300
Subject: [PATCH 5/8] Fix test and cast document ID to string

---
 src/Index.php  | 2 +-
 tests/Base.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Index.php b/src/Index.php
index 4f001e3a5f..f5a91e8749 100644
--- a/src/Index.php
+++ b/src/Index.php
@@ -297,7 +297,7 @@ public function getDocument($id, array $options = []): Document
                 $data = [];
             }
 
-            $doc = new Document($id, $data, $this->getName());
+            $doc = new Document((string) $id, $data, $this->getName());
             $doc->setVersionParams($result);
 
             return $doc;
diff --git a/tests/Base.php b/tests/Base.php
index 6adf4d6209..e77ab3dd5e 100644
--- a/tests/Base.php
+++ b/tests/Base.php
@@ -46,11 +46,11 @@ protected static function showDeprecated(): void
     }
 
     /**
-     * @param array $params Additional configuration params. Host and Port are already set
+     * @param array $config Additional configuration params. Host and Port are already set
      */
-    protected function _getClient(array $params = [], ?LoggerInterface $logger = null): Client
+    protected function _getClient(array $config = [], ?LoggerInterface $logger = null): Client
     {
-        $config = $params ?: [$this->_getHost().':'.$this->_getPort()];
+        $config['hosts'] ??= [$this->_getHost().':'.$this->_getPort()];
 
         $config['transport_config']['node_pool'] = $config['transport_config']['node_pool'] ?? new TraceableSimpleNodePool(
             new RoundRobin(),

From 98334b861c9e796eb7fc9e9a824bb86fd9e32a38 Mon Sep 17 00:00:00 2001
From: Oleg Zhulnev <plbsid@gmail.com>
Date: Sun, 24 Mar 2024 18:49:46 +0300
Subject: [PATCH 6/8] Add strict types in tests

---
 .../AbstractSimpleAggregationTest.php            |  2 ++
 tests/Aggregation/AdjacencyMatrixTest.php        |  2 ++
 tests/Aggregation/AggregationMetadataTest.php    |  2 ++
 tests/Aggregation/AutoDateHistogramTest.php      |  2 ++
 tests/Aggregation/AvgBucketTest.php              |  2 ++
 tests/Aggregation/AvgTest.php                    |  2 ++
 tests/Aggregation/BaseAggregationTest.php        |  2 ++
 tests/Aggregation/BucketScriptTest.php           |  2 ++
 tests/Aggregation/BucketSelectorTest.php         |  2 ++
 tests/Aggregation/CardinalityTest.php            |  2 ++
 tests/Aggregation/ChildrenTest.php               |  2 ++
 tests/Aggregation/CompositeTest.php              |  2 ++
 tests/Aggregation/CumulativeSumTest.php          |  2 ++
 tests/Aggregation/DateHistogramTest.php          |  2 ++
 tests/Aggregation/DateRangeTest.php              |  2 ++
 tests/Aggregation/DerivativeTest.php             |  2 ++
 tests/Aggregation/DiversifiedSamplerTest.php     |  2 ++
 tests/Aggregation/ExtendedStatsBucketTest.php    |  2 ++
 tests/Aggregation/ExtendedStatsTest.php          |  2 ++
 tests/Aggregation/FilterTest.php                 |  2 ++
 tests/Aggregation/FiltersTest.php                |  2 ++
 tests/Aggregation/GeoBoundsTest.php              |  2 ++
 tests/Aggregation/GeoCentroidTest.php            |  2 ++
 tests/Aggregation/GeoDistanceTest.php            |  2 ++
 tests/Aggregation/GeohashGridTest.php            |  2 ++
 tests/Aggregation/GeotileGridAggregationTest.php |  2 ++
 tests/Aggregation/GlobalAggregationTest.php      |  2 ++
 tests/Aggregation/HistogramTest.php              |  2 ++
 tests/Aggregation/IpRangeTest.php                |  2 ++
 tests/Aggregation/MaxTest.php                    |  2 ++
 tests/Aggregation/MinTest.php                    |  2 ++
 tests/Aggregation/MissingTest.php                |  2 ++
 tests/Aggregation/NestedTest.php                 |  2 ++
 tests/Aggregation/NormalizeAggregationTest.php   |  2 ++
 tests/Aggregation/ParentAggregationTest.php      |  2 ++
 tests/Aggregation/PercentilesBucketTest.php      |  2 ++
 tests/Aggregation/PercentilesTest.php            |  2 ++
 tests/Aggregation/RangeTest.php                  |  2 ++
 tests/Aggregation/ReverseNestedTest.php          |  2 ++
 tests/Aggregation/SamplerTest.php                |  2 ++
 tests/Aggregation/ScriptTest.php                 |  2 ++
 tests/Aggregation/ScriptedMetricTest.php         |  2 ++
 tests/Aggregation/SerialDiffTest.php             |  2 ++
 tests/Aggregation/SignificantTermsTest.php       |  2 ++
 tests/Aggregation/StatsBucketTest.php            |  2 ++
 tests/Aggregation/StatsTest.php                  |  2 ++
 tests/Aggregation/SumBucketTest.php              |  2 ++
 tests/Aggregation/SumTest.php                    |  2 ++
 tests/Aggregation/TermsTest.php                  |  2 ++
 tests/Aggregation/TopHitsTest.php                |  2 ++
 tests/Aggregation/ValueCountTest.php             |  2 ++
 tests/Aggregation/WeightedAvgTest.php            |  2 ++
 tests/Base.php                                   |  4 +++-
 tests/BasePipeline.php                           |  2 ++
 tests/Bulk/Action/AbstractDocumentTest.php       |  2 ++
 tests/Bulk/Action/UpdateDocumentTest.php         | 14 ++++++++------
 tests/Bulk/ActionTest.php                        |  2 ++
 tests/Bulk/ResponseSetTest.php                   |  2 ++
 tests/BulkTest.php                               | 16 +++++++++-------
 tests/ClientConfigurationTest.php                |  2 ++
 tests/ClientFunctionalTest.php                   |  4 +++-
 tests/ClientTest.php                             |  2 ++
 tests/Cluster/Health/IndexTest.php               |  2 ++
 tests/Cluster/Health/ShardTest.php               |  2 ++
 tests/Cluster/HealthTest.php                     |  2 ++
 tests/Cluster/SettingsTest.php                   |  2 ++
 tests/ClusterTest.php                            |  2 ++
 tests/Collapse/CollapseTest.php                  |  2 ++
 tests/DeprecatedClassBase.php                    |  2 ++
 tests/DocumentTest.php                           |  2 ++
 tests/ExampleTest.php                            |  2 ++
 tests/Exception/AbstractExceptionTest.php        |  2 ++
 .../Bulk/Response/ActionExceptionTest.php        |  2 ++
 tests/Exception/Bulk/ResponseExceptionTest.php   |  2 ++
 tests/Exception/BulkExceptionTest.php            |  2 ++
 tests/Exception/ClientExceptionTest.php          |  2 ++
 tests/Exception/InvalidExceptionTest.php         |  2 ++
 tests/Exception/NotFoundExceptionTest.php        |  2 ++
 tests/Exception/NotImplementedExceptionTest.php  |  2 ++
 tests/Exception/QueryBuilderExceptionTest.php    |  2 ++
 tests/Exception/RuntimeExceptionTest.php         |  2 ++
 tests/Index/RecoveryTest.php                     |  2 ++
 tests/Index/SettingsTest.php                     |  2 ++
 tests/Index/StatsTest.php                        |  2 ++
 tests/IndexTemplateTest.php                      |  2 ++
 tests/IndexTest.php                              |  2 ++
 tests/JSONTest.php                               |  2 ++
 tests/MappingTest.php                            |  2 ++
 tests/Multi/MultiBuilderTest.php                 |  2 ++
 tests/Multi/SearchTest.php                       |  2 ++
 tests/Node/InfoTest.php                          |  2 ++
 tests/NodeTest.php                               |  2 ++
 tests/ParamTest.php                              |  2 ++
 tests/PipelineTest.php                           |  2 ++
 tests/PointInTimeTest.php                        |  2 ++
 tests/Processor/AppendProcessorTest.php          |  2 ++
 tests/Processor/AttachmentProcessorTest.php      |  2 ++
 tests/Processor/BytesProcessorTest.php           |  2 ++
 tests/Processor/ConvertProcessorTest.php         |  2 ++
 tests/Processor/DateIndexNameProcessorTest.php   |  2 ++
 tests/Processor/DateProcessorTest.php            |  2 ++
 tests/Processor/DotExpanderProcessorTest.php     |  2 ++
 tests/Processor/FailProcessorTest.php            |  2 ++
 tests/Processor/ForeachProcessorTest.php         |  2 ++
 tests/Processor/JoinProcessorTest.php            |  2 ++
 tests/Processor/JsonProcessorTest.php            |  2 ++
 tests/Processor/KvProcessorTest.php              |  2 ++
 tests/Processor/LowercaseProcessorTest.php       |  2 ++
 tests/Processor/RemoveProcessorTest.php          |  2 ++
 tests/Processor/RenameProcessorTest.php          |  2 ++
 tests/Processor/SetProcessorTest.php             |  2 ++
 tests/Processor/SortProcessorTest.php            |  2 ++
 tests/Processor/SplitProcessorTest.php           |  2 ++
 tests/Processor/TrimProcessorTest.php            |  2 ++
 tests/Processor/UppercaseProcessorTest.php       |  2 ++
 tests/Query/BoolQueryTest.php                    |  2 ++
 tests/Query/BoostingTest.php                     |  2 ++
 tests/Query/CombinedFieldsQueryTest.php          |  2 ++
 tests/Query/ConstantScoreTest.php                |  2 ++
 tests/Query/DisMaxTest.php                       |  2 ++
 tests/Query/DistanceFeatureTest.php              |  2 ++
 tests/Query/EscapeStringTest.php                 |  2 ++
 tests/Query/ExistsTest.php                       |  2 ++
 tests/Query/FunctionScoreTest.php                |  2 ++
 tests/Query/FuzzyTest.php                        |  2 ++
 tests/Query/GeoBoundingBoxTest.php               |  2 ++
 tests/Query/GeoDistanceTest.php                  |  2 ++
 tests/Query/GeoPolygonTest.php                   |  2 ++
 tests/Query/GeoShapePreIndexedTest.php           |  2 ++
 tests/Query/GeoShapeProvidedTest.php             |  2 ++
 tests/Query/HasChildTest.php                     |  2 ++
 tests/Query/HasParentTest.php                    |  2 ++
 tests/Query/HighlightTest.php                    |  2 ++
 tests/Query/IdsTest.php                          |  2 ++
 tests/Query/InnerHitsTest.php                    |  2 ++
 tests/Query/LimitTest.php                        |  2 ++
 tests/Query/MatchAllTest.php                     |  2 ++
 tests/Query/MatchNoneTest.php                    |  2 ++
 tests/Query/MatchPhrasePrefixTest.php            |  2 ++
 tests/Query/MatchPhraseTest.php                  |  2 ++
 tests/Query/MatchQueryTest.php                   |  2 ++
 tests/Query/MoreLikeThisTest.php                 |  2 ++
 tests/Query/MultiMatchTest.php                   |  2 ++
 tests/Query/NestedTest.php                       |  2 ++
 tests/Query/ParentIdTest.php                     |  2 ++
 tests/Query/PercolateTest.php                    |  2 ++
 tests/Query/PostFilterTest.php                   |  2 ++
 tests/Query/PrefixTest.php                       |  2 ++
 tests/Query/QueryStringTest.php                  |  4 +++-
 tests/Query/RangeTest.php                        |  2 ++
 tests/Query/RegexpTest.php                       |  2 ++
 tests/Query/RescoreTest.php                      |  2 ++
 tests/Query/ScriptTest.php                       |  2 ++
 tests/Query/SimpleQueryStringTest.php            |  2 ++
 tests/Query/SimpleTest.php                       |  2 ++
 tests/Query/SpanContainingTest.php               |  2 ++
 tests/Query/SpanFirstTest.php                    |  2 ++
 tests/Query/SpanMultiTest.php                    |  2 ++
 tests/Query/SpanNearTest.php                     |  2 ++
 tests/Query/SpanNotTest.php                      |  2 ++
 tests/Query/SpanOrTest.php                       |  2 ++
 tests/Query/SpanTermTest.php                     |  2 ++
 tests/Query/SpanWithinTest.php                   |  2 ++
 tests/Query/TermTest.php                         |  2 ++
 tests/Query/TermsSetTest.php                     |  2 ++
 tests/Query/TermsTest.php                        |  2 ++
 tests/Query/WildcardTest.php                     |  2 ++
 tests/QueryBuilder/DSL/AbstractDSLTest.php       |  4 +++-
 tests/QueryBuilder/DSL/AggregationTest.php       |  2 ++
 tests/QueryBuilder/DSL/CollapseTest.php          |  2 ++
 tests/QueryBuilder/DSL/QueryTest.php             |  2 ++
 tests/QueryBuilder/DSL/SuggestTest.php           |  2 ++
 tests/QueryBuilder/VersionTest.php               | 10 ++++++----
 tests/QueryBuilderTest.php                       |  2 ++
 tests/QueryTest.php                              |  2 ++
 tests/ReindexTest.php                            |  2 ++
 tests/ResponseFunctionalTest.php                 |  2 ++
 tests/ResponseTest.php                           |  2 ++
 tests/ResultSet/BuilderTest.php                  |  2 ++
 tests/ResultSet/ChainProcessorTest.php           |  2 ++
 tests/ResultSet/ProcessingBuilderTest.php        |  2 ++
 tests/ResultSetTest.php                          |  2 ++
 tests/ResultTest.php                             |  2 ++
 tests/Script/ScriptFieldsTest.php                |  2 ++
 tests/Script/ScriptIdTest.php                    |  2 ++
 tests/Script/ScriptTest.php                      |  2 ++
 tests/ScrollTest.php                             |  2 ++
 tests/SearchTest.php                             |  2 ++
 tests/SnapshotTest.php                           |  2 ++
 tests/StatusTest.php                             |  6 +++---
 tests/Suggest/CompletionTest.php                 |  2 ++
 tests/Suggest/PhraseTest.php                     |  2 ++
 tests/Suggest/TermTest.php                       |  2 ++
 tests/SuggestTest.php                            |  2 ++
 tests/TaskTest.php                               |  2 ++
 tests/UtilTest.php                               |  2 ++
 tests/bootstrap.php                              |  2 ++
 197 files changed, 416 insertions(+), 24 deletions(-)

diff --git a/tests/Aggregation/AbstractSimpleAggregationTest.php b/tests/Aggregation/AbstractSimpleAggregationTest.php
index 2580fb5822..2e2740917a 100644
--- a/tests/Aggregation/AbstractSimpleAggregationTest.php
+++ b/tests/Aggregation/AbstractSimpleAggregationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\AbstractSimpleAggregation;
diff --git a/tests/Aggregation/AdjacencyMatrixTest.php b/tests/Aggregation/AdjacencyMatrixTest.php
index ac02034b0e..af9f28960d 100644
--- a/tests/Aggregation/AdjacencyMatrixTest.php
+++ b/tests/Aggregation/AdjacencyMatrixTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\AdjacencyMatrix;
diff --git a/tests/Aggregation/AggregationMetadataTest.php b/tests/Aggregation/AggregationMetadataTest.php
index 0372a6d0f8..771c1a34ed 100644
--- a/tests/Aggregation/AggregationMetadataTest.php
+++ b/tests/Aggregation/AggregationMetadataTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Cardinality;
diff --git a/tests/Aggregation/AutoDateHistogramTest.php b/tests/Aggregation/AutoDateHistogramTest.php
index 244714bebd..7e4927b048 100644
--- a/tests/Aggregation/AutoDateHistogramTest.php
+++ b/tests/Aggregation/AutoDateHistogramTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\AutoDateHistogram;
diff --git a/tests/Aggregation/AvgBucketTest.php b/tests/Aggregation/AvgBucketTest.php
index 5f8767b8b6..48f8d34f36 100644
--- a/tests/Aggregation/AvgBucketTest.php
+++ b/tests/Aggregation/AvgBucketTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Avg;
diff --git a/tests/Aggregation/AvgTest.php b/tests/Aggregation/AvgTest.php
index aa234cbec0..73aae6fb43 100644
--- a/tests/Aggregation/AvgTest.php
+++ b/tests/Aggregation/AvgTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Avg;
diff --git a/tests/Aggregation/BaseAggregationTest.php b/tests/Aggregation/BaseAggregationTest.php
index 60062e913b..3aa73d3a6f 100644
--- a/tests/Aggregation/BaseAggregationTest.php
+++ b/tests/Aggregation/BaseAggregationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Test\Base;
diff --git a/tests/Aggregation/BucketScriptTest.php b/tests/Aggregation/BucketScriptTest.php
index 7c5ff05377..58dad1130d 100644
--- a/tests/Aggregation/BucketScriptTest.php
+++ b/tests/Aggregation/BucketScriptTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\BucketScript;
diff --git a/tests/Aggregation/BucketSelectorTest.php b/tests/Aggregation/BucketSelectorTest.php
index cb31a88036..50d8224020 100644
--- a/tests/Aggregation/BucketSelectorTest.php
+++ b/tests/Aggregation/BucketSelectorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\BucketSelector;
diff --git a/tests/Aggregation/CardinalityTest.php b/tests/Aggregation/CardinalityTest.php
index 8c18cca1d7..997467be42 100644
--- a/tests/Aggregation/CardinalityTest.php
+++ b/tests/Aggregation/CardinalityTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Cardinality;
diff --git a/tests/Aggregation/ChildrenTest.php b/tests/Aggregation/ChildrenTest.php
index 0d3e6876a8..4687e0db7b 100644
--- a/tests/Aggregation/ChildrenTest.php
+++ b/tests/Aggregation/ChildrenTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Children;
diff --git a/tests/Aggregation/CompositeTest.php b/tests/Aggregation/CompositeTest.php
index f1e87163ed..de750576d9 100644
--- a/tests/Aggregation/CompositeTest.php
+++ b/tests/Aggregation/CompositeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Composite;
diff --git a/tests/Aggregation/CumulativeSumTest.php b/tests/Aggregation/CumulativeSumTest.php
index d985823e5f..61892cb09b 100644
--- a/tests/Aggregation/CumulativeSumTest.php
+++ b/tests/Aggregation/CumulativeSumTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\CumulativeSum;
diff --git a/tests/Aggregation/DateHistogramTest.php b/tests/Aggregation/DateHistogramTest.php
index d164be9a45..af93c6d238 100644
--- a/tests/Aggregation/DateHistogramTest.php
+++ b/tests/Aggregation/DateHistogramTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\DateHistogram;
diff --git a/tests/Aggregation/DateRangeTest.php b/tests/Aggregation/DateRangeTest.php
index 846405061c..9e0dea6616 100644
--- a/tests/Aggregation/DateRangeTest.php
+++ b/tests/Aggregation/DateRangeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/tests/Aggregation/DerivativeTest.php b/tests/Aggregation/DerivativeTest.php
index 8be63a119f..a0859a7292 100644
--- a/tests/Aggregation/DerivativeTest.php
+++ b/tests/Aggregation/DerivativeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\DateHistogram;
diff --git a/tests/Aggregation/DiversifiedSamplerTest.php b/tests/Aggregation/DiversifiedSamplerTest.php
index 477bbe755b..8dd4cf7938 100755
--- a/tests/Aggregation/DiversifiedSamplerTest.php
+++ b/tests/Aggregation/DiversifiedSamplerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\DiversifiedSampler;
diff --git a/tests/Aggregation/ExtendedStatsBucketTest.php b/tests/Aggregation/ExtendedStatsBucketTest.php
index f7d5404f0a..5f726b7b11 100644
--- a/tests/Aggregation/ExtendedStatsBucketTest.php
+++ b/tests/Aggregation/ExtendedStatsBucketTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\ExtendedStatsBucket;
diff --git a/tests/Aggregation/ExtendedStatsTest.php b/tests/Aggregation/ExtendedStatsTest.php
index b10b56b18f..a189d93e52 100644
--- a/tests/Aggregation/ExtendedStatsTest.php
+++ b/tests/Aggregation/ExtendedStatsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\ExtendedStats;
diff --git a/tests/Aggregation/FilterTest.php b/tests/Aggregation/FilterTest.php
index 3aec7e4068..2a692845e4 100644
--- a/tests/Aggregation/FilterTest.php
+++ b/tests/Aggregation/FilterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Avg;
diff --git a/tests/Aggregation/FiltersTest.php b/tests/Aggregation/FiltersTest.php
index 65aab2375c..c102194e88 100644
--- a/tests/Aggregation/FiltersTest.php
+++ b/tests/Aggregation/FiltersTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Avg;
diff --git a/tests/Aggregation/GeoBoundsTest.php b/tests/Aggregation/GeoBoundsTest.php
index 63e0867b7d..e67fabd838 100644
--- a/tests/Aggregation/GeoBoundsTest.php
+++ b/tests/Aggregation/GeoBoundsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\GeoBounds;
diff --git a/tests/Aggregation/GeoCentroidTest.php b/tests/Aggregation/GeoCentroidTest.php
index a79301030c..075e925f3f 100644
--- a/tests/Aggregation/GeoCentroidTest.php
+++ b/tests/Aggregation/GeoCentroidTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\GeoCentroid;
diff --git a/tests/Aggregation/GeoDistanceTest.php b/tests/Aggregation/GeoDistanceTest.php
index 4fa3f08251..d4246cc067 100644
--- a/tests/Aggregation/GeoDistanceTest.php
+++ b/tests/Aggregation/GeoDistanceTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\GeoDistance;
diff --git a/tests/Aggregation/GeohashGridTest.php b/tests/Aggregation/GeohashGridTest.php
index 551aa211c0..0d516a5c39 100644
--- a/tests/Aggregation/GeohashGridTest.php
+++ b/tests/Aggregation/GeohashGridTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\GeohashGrid;
diff --git a/tests/Aggregation/GeotileGridAggregationTest.php b/tests/Aggregation/GeotileGridAggregationTest.php
index 8d6069cf43..58927b95e3 100644
--- a/tests/Aggregation/GeotileGridAggregationTest.php
+++ b/tests/Aggregation/GeotileGridAggregationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\GeotileGridAggregation;
diff --git a/tests/Aggregation/GlobalAggregationTest.php b/tests/Aggregation/GlobalAggregationTest.php
index 595724ce9c..8e2c08ccf2 100644
--- a/tests/Aggregation/GlobalAggregationTest.php
+++ b/tests/Aggregation/GlobalAggregationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Avg;
diff --git a/tests/Aggregation/HistogramTest.php b/tests/Aggregation/HistogramTest.php
index 1aa9411421..3fb4d7f4ab 100644
--- a/tests/Aggregation/HistogramTest.php
+++ b/tests/Aggregation/HistogramTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Histogram;
diff --git a/tests/Aggregation/IpRangeTest.php b/tests/Aggregation/IpRangeTest.php
index 337f344712..2d989267b2 100644
--- a/tests/Aggregation/IpRangeTest.php
+++ b/tests/Aggregation/IpRangeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\IpRange;
diff --git a/tests/Aggregation/MaxTest.php b/tests/Aggregation/MaxTest.php
index c7e0a9477c..b2482800f3 100644
--- a/tests/Aggregation/MaxTest.php
+++ b/tests/Aggregation/MaxTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Max;
diff --git a/tests/Aggregation/MinTest.php b/tests/Aggregation/MinTest.php
index 1367cce6b7..dfcca34c80 100644
--- a/tests/Aggregation/MinTest.php
+++ b/tests/Aggregation/MinTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Min;
diff --git a/tests/Aggregation/MissingTest.php b/tests/Aggregation/MissingTest.php
index 06f72a4f80..53ecfb061a 100644
--- a/tests/Aggregation/MissingTest.php
+++ b/tests/Aggregation/MissingTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Missing;
diff --git a/tests/Aggregation/NestedTest.php b/tests/Aggregation/NestedTest.php
index f50345c769..a134d992cb 100644
--- a/tests/Aggregation/NestedTest.php
+++ b/tests/Aggregation/NestedTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Min;
diff --git a/tests/Aggregation/NormalizeAggregationTest.php b/tests/Aggregation/NormalizeAggregationTest.php
index cc830453bb..3f873a20ef 100644
--- a/tests/Aggregation/NormalizeAggregationTest.php
+++ b/tests/Aggregation/NormalizeAggregationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\DateHistogram;
diff --git a/tests/Aggregation/ParentAggregationTest.php b/tests/Aggregation/ParentAggregationTest.php
index dd63b953e8..aff7383767 100644
--- a/tests/Aggregation/ParentAggregationTest.php
+++ b/tests/Aggregation/ParentAggregationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\ParentAggregation;
diff --git a/tests/Aggregation/PercentilesBucketTest.php b/tests/Aggregation/PercentilesBucketTest.php
index c8a934c29e..73b249e83f 100644
--- a/tests/Aggregation/PercentilesBucketTest.php
+++ b/tests/Aggregation/PercentilesBucketTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Avg;
diff --git a/tests/Aggregation/PercentilesTest.php b/tests/Aggregation/PercentilesTest.php
index 5fd7c0f242..6733b2a5e6 100644
--- a/tests/Aggregation/PercentilesTest.php
+++ b/tests/Aggregation/PercentilesTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Percentiles;
diff --git a/tests/Aggregation/RangeTest.php b/tests/Aggregation/RangeTest.php
index d9485d2458..7c49223b75 100644
--- a/tests/Aggregation/RangeTest.php
+++ b/tests/Aggregation/RangeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Range;
diff --git a/tests/Aggregation/ReverseNestedTest.php b/tests/Aggregation/ReverseNestedTest.php
index 66bf18d307..1f5984835a 100644
--- a/tests/Aggregation/ReverseNestedTest.php
+++ b/tests/Aggregation/ReverseNestedTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Nested;
diff --git a/tests/Aggregation/SamplerTest.php b/tests/Aggregation/SamplerTest.php
index f3ecf67337..6e2e0d160e 100644
--- a/tests/Aggregation/SamplerTest.php
+++ b/tests/Aggregation/SamplerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Sampler;
diff --git a/tests/Aggregation/ScriptTest.php b/tests/Aggregation/ScriptTest.php
index 0b0ad23ba8..94d2bde6eb 100644
--- a/tests/Aggregation/ScriptTest.php
+++ b/tests/Aggregation/ScriptTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Sum;
diff --git a/tests/Aggregation/ScriptedMetricTest.php b/tests/Aggregation/ScriptedMetricTest.php
index 42d2c451fa..31b579f99d 100644
--- a/tests/Aggregation/ScriptedMetricTest.php
+++ b/tests/Aggregation/ScriptedMetricTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\ScriptedMetric;
diff --git a/tests/Aggregation/SerialDiffTest.php b/tests/Aggregation/SerialDiffTest.php
index 5439147519..89923172de 100644
--- a/tests/Aggregation/SerialDiffTest.php
+++ b/tests/Aggregation/SerialDiffTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\DateHistogram;
diff --git a/tests/Aggregation/SignificantTermsTest.php b/tests/Aggregation/SignificantTermsTest.php
index fd08f29fe7..ad210eff5f 100644
--- a/tests/Aggregation/SignificantTermsTest.php
+++ b/tests/Aggregation/SignificantTermsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\SignificantTerms;
diff --git a/tests/Aggregation/StatsBucketTest.php b/tests/Aggregation/StatsBucketTest.php
index 0e692f3fbd..be72d1f54d 100644
--- a/tests/Aggregation/StatsBucketTest.php
+++ b/tests/Aggregation/StatsBucketTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\GapPolicyInterface;
diff --git a/tests/Aggregation/StatsTest.php b/tests/Aggregation/StatsTest.php
index a65db25736..352576625c 100644
--- a/tests/Aggregation/StatsTest.php
+++ b/tests/Aggregation/StatsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Stats;
diff --git a/tests/Aggregation/SumBucketTest.php b/tests/Aggregation/SumBucketTest.php
index 9833d64de7..b622da6160 100644
--- a/tests/Aggregation/SumBucketTest.php
+++ b/tests/Aggregation/SumBucketTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\GapPolicyInterface;
diff --git a/tests/Aggregation/SumTest.php b/tests/Aggregation/SumTest.php
index bad6588a14..5fef5daaa4 100644
--- a/tests/Aggregation/SumTest.php
+++ b/tests/Aggregation/SumTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Sum;
diff --git a/tests/Aggregation/TermsTest.php b/tests/Aggregation/TermsTest.php
index 41659f7b92..befeb274db 100644
--- a/tests/Aggregation/TermsTest.php
+++ b/tests/Aggregation/TermsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\Composite;
diff --git a/tests/Aggregation/TopHitsTest.php b/tests/Aggregation/TopHitsTest.php
index 43eddab24a..0cfe0e3126 100644
--- a/tests/Aggregation/TopHitsTest.php
+++ b/tests/Aggregation/TopHitsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\AbstractAggregation;
diff --git a/tests/Aggregation/ValueCountTest.php b/tests/Aggregation/ValueCountTest.php
index 4f122ac269..7ec62c91cf 100644
--- a/tests/Aggregation/ValueCountTest.php
+++ b/tests/Aggregation/ValueCountTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\ValueCount;
diff --git a/tests/Aggregation/WeightedAvgTest.php b/tests/Aggregation/WeightedAvgTest.php
index be344b4af7..090026486d 100644
--- a/tests/Aggregation/WeightedAvgTest.php
+++ b/tests/Aggregation/WeightedAvgTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Aggregation;
 
 use Elastica\Aggregation\WeightedAvg;
diff --git a/tests/Base.php b/tests/Base.php
index e77ab3dd5e..2fceea4fa8 100644
--- a/tests/Base.php
+++ b/tests/Base.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastic\Transport\NodePool\Resurrect\NoResurrect;
@@ -52,7 +54,7 @@ protected function _getClient(array $config = [], ?LoggerInterface $logger = nul
     {
         $config['hosts'] ??= [$this->_getHost().':'.$this->_getPort()];
 
-        $config['transport_config']['node_pool'] = $config['transport_config']['node_pool'] ?? new TraceableSimpleNodePool(
+        $config['transport_config']['node_pool'] ??= new TraceableSimpleNodePool(
             new RoundRobin(),
             new NoResurrect()
         );
diff --git a/tests/BasePipeline.php b/tests/BasePipeline.php
index 6d0b10c2dc..5737fd4e20 100644
--- a/tests/BasePipeline.php
+++ b/tests/BasePipeline.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Pipeline;
diff --git a/tests/Bulk/Action/AbstractDocumentTest.php b/tests/Bulk/Action/AbstractDocumentTest.php
index d468f8ff0e..2f68771cda 100644
--- a/tests/Bulk/Action/AbstractDocumentTest.php
+++ b/tests/Bulk/Action/AbstractDocumentTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Bulk\Action;
 
 use Elastica\Bulk\Action\AbstractDocument;
diff --git a/tests/Bulk/Action/UpdateDocumentTest.php b/tests/Bulk/Action/UpdateDocumentTest.php
index 93c619be99..7565d819e9 100644
--- a/tests/Bulk/Action/UpdateDocumentTest.php
+++ b/tests/Bulk/Action/UpdateDocumentTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Bulk\Action;
 
 use Elastica\Bulk\Action\UpdateDocument;
@@ -67,9 +69,9 @@ public function testUpdateDocumentAsUpsert(): void
         $this->assertTrue($action->hasSource());
 
         $expected = <<<'JSON'
-{"update":{"_id":"1","_index":"index"}}
-{"doc":{"foo":"bar"},"doc_as_upsert":true}
-JSON;
+            {"update":{"_id":"1","_index":"index"}}
+            {"doc":{"foo":"bar"},"doc_as_upsert":true}
+            JSON;
 
         $this->assertSame($expected, \trim((string) $action));
 
@@ -81,9 +83,9 @@ public function testUpdateDocumentAsUpsert(): void
         $action->setDocument($document);
 
         $expected = <<<'JSON'
-{"update":{"_id":"1","_index":"index"}}
-{"doc":{"foo":"bar"}}
-JSON;
+            {"update":{"_id":"1","_index":"index"}}
+            {"doc":{"foo":"bar"}}
+            JSON;
 
         $this->assertSame($expected, \trim((string) $action));
 
diff --git a/tests/Bulk/ActionTest.php b/tests/Bulk/ActionTest.php
index 644bf6440e..c4200f856a 100644
--- a/tests/Bulk/ActionTest.php
+++ b/tests/Bulk/ActionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Bulk;
 
 use Elastica\Bulk\Action;
diff --git a/tests/Bulk/ResponseSetTest.php b/tests/Bulk/ResponseSetTest.php
index 56fba86240..ebf7ba8a22 100644
--- a/tests/Bulk/ResponseSetTest.php
+++ b/tests/Bulk/ResponseSetTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Bulk;
 
 use Elastica\Bulk;
diff --git a/tests/BulkTest.php b/tests/BulkTest.php
index c8fd59c333..982a1e0644 100644
--- a/tests/BulkTest.php
+++ b/tests/BulkTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Bulk;
@@ -385,13 +387,13 @@ public function testRawDocumentDataRequest(): void
         ;
 
         $expectedJson = <<<'JSON'
-{"index":{}}
-{"name":"Mister Fantastic"}
-{"index":{}}
-{"name":"Invisible Woman"}
-{"index":{}}
-{"name":"The Human Torch"}
-JSON;
+            {"index":{}}
+            {"name":"Mister Fantastic"}
+            {"index":{}}
+            {"name":"Invisible Woman"}
+            {"index":{}}
+            {"name":"The Human Torch"}
+            JSON;
 
         $expectedJson = \str_replace(\PHP_EOL, "\n", $expectedJson);
         $this->assertSame($expectedJson, \trim((string) $bulk));
diff --git a/tests/ClientConfigurationTest.php b/tests/ClientConfigurationTest.php
index 5566843811..0e32eb5224 100644
--- a/tests/ClientConfigurationTest.php
+++ b/tests/ClientConfigurationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\ClientConfiguration;
diff --git a/tests/ClientFunctionalTest.php b/tests/ClientFunctionalTest.php
index 78bf18b752..e6815777ad 100644
--- a/tests/ClientFunctionalTest.php
+++ b/tests/ClientFunctionalTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastic\Elasticsearch\Response\Elasticsearch;
@@ -926,7 +928,7 @@ protected function setHttpClientOptions(HttpClientInterface $client, array $conf
         if (empty($config) && empty($clientOptions)) {
             return $client;
         }
-        $class = \get_class($client);
+        $class = $client::class;
         $adapterClass = AdapterOptions::HTTP_ADAPTERS[$class];
 
         $adapter = new $adapterClass();
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
index f7ac859294..83e832cc49 100644
--- a/tests/ClientTest.php
+++ b/tests/ClientTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Client;
diff --git a/tests/Cluster/Health/IndexTest.php b/tests/Cluster/Health/IndexTest.php
index be86e5363e..fc8fa42ad6 100644
--- a/tests/Cluster/Health/IndexTest.php
+++ b/tests/Cluster/Health/IndexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Cluster\Health;
 
 use Elastica\Cluster\Health\Index;
diff --git a/tests/Cluster/Health/ShardTest.php b/tests/Cluster/Health/ShardTest.php
index 26fc5ac400..56fb04e925 100644
--- a/tests/Cluster/Health/ShardTest.php
+++ b/tests/Cluster/Health/ShardTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Cluster\Health;
 
 use Elastica\Cluster\Health\Shard;
diff --git a/tests/Cluster/HealthTest.php b/tests/Cluster/HealthTest.php
index bb74b0e9e1..2dc050afab 100644
--- a/tests/Cluster/HealthTest.php
+++ b/tests/Cluster/HealthTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Cluster;
 
 use Elastica\Cluster\Health;
diff --git a/tests/Cluster/SettingsTest.php b/tests/Cluster/SettingsTest.php
index a9c00f4b0b..f0ffb4ab9c 100644
--- a/tests/Cluster/SettingsTest.php
+++ b/tests/Cluster/SettingsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Cluster;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/tests/ClusterTest.php b/tests/ClusterTest.php
index 88d6beabed..feaba72eea 100644
--- a/tests/ClusterTest.php
+++ b/tests/ClusterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Cluster;
diff --git a/tests/Collapse/CollapseTest.php b/tests/Collapse/CollapseTest.php
index 084d3696f8..9213b967f9 100644
--- a/tests/Collapse/CollapseTest.php
+++ b/tests/Collapse/CollapseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Collapse;
 
 use Elastica\Collapse;
diff --git a/tests/DeprecatedClassBase.php b/tests/DeprecatedClassBase.php
index 483d13a88d..042fda3a72 100644
--- a/tests/DeprecatedClassBase.php
+++ b/tests/DeprecatedClassBase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 /**
diff --git a/tests/DocumentTest.php b/tests/DocumentTest.php
index 324105f4da..cefc2a5c67 100644
--- a/tests/DocumentTest.php
+++ b/tests/DocumentTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Document;
diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php
index bc9cd473e1..303dcfa550 100644
--- a/tests/ExampleTest.php
+++ b/tests/ExampleTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Document;
diff --git a/tests/Exception/AbstractExceptionTest.php b/tests/Exception/AbstractExceptionTest.php
index bba69c8782..361f3ab64a 100644
--- a/tests/Exception/AbstractExceptionTest.php
+++ b/tests/Exception/AbstractExceptionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Exception;
 
 use Elastica\Exception\ExceptionInterface;
diff --git a/tests/Exception/Bulk/Response/ActionExceptionTest.php b/tests/Exception/Bulk/Response/ActionExceptionTest.php
index 4d3a45aa56..97059814b8 100644
--- a/tests/Exception/Bulk/Response/ActionExceptionTest.php
+++ b/tests/Exception/Bulk/Response/ActionExceptionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Exception\Bulk\Response;
 
 use Elastica\Test\Exception\AbstractExceptionTest;
diff --git a/tests/Exception/Bulk/ResponseExceptionTest.php b/tests/Exception/Bulk/ResponseExceptionTest.php
index 3b5d6b3ecc..4e4df8b91e 100644
--- a/tests/Exception/Bulk/ResponseExceptionTest.php
+++ b/tests/Exception/Bulk/ResponseExceptionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Exception\Bulk;
 
 use Elastica\Test\Exception\AbstractExceptionTest;
diff --git a/tests/Exception/BulkExceptionTest.php b/tests/Exception/BulkExceptionTest.php
index 703e2d87f6..38f8c23bf4 100644
--- a/tests/Exception/BulkExceptionTest.php
+++ b/tests/Exception/BulkExceptionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Exception;
 
 /**
diff --git a/tests/Exception/ClientExceptionTest.php b/tests/Exception/ClientExceptionTest.php
index 95fe0c644d..8410ba83a2 100644
--- a/tests/Exception/ClientExceptionTest.php
+++ b/tests/Exception/ClientExceptionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Exception;
 
 /**
diff --git a/tests/Exception/InvalidExceptionTest.php b/tests/Exception/InvalidExceptionTest.php
index b29732ef38..c7752116da 100644
--- a/tests/Exception/InvalidExceptionTest.php
+++ b/tests/Exception/InvalidExceptionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Exception;
 
 /**
diff --git a/tests/Exception/NotFoundExceptionTest.php b/tests/Exception/NotFoundExceptionTest.php
index 4461729d5d..2fead75bbf 100644
--- a/tests/Exception/NotFoundExceptionTest.php
+++ b/tests/Exception/NotFoundExceptionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Exception;
 
 /**
diff --git a/tests/Exception/NotImplementedExceptionTest.php b/tests/Exception/NotImplementedExceptionTest.php
index a8db701b64..890f3f2334 100644
--- a/tests/Exception/NotImplementedExceptionTest.php
+++ b/tests/Exception/NotImplementedExceptionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Exception;
 
 use Elastica\Exception\NotImplementedException;
diff --git a/tests/Exception/QueryBuilderExceptionTest.php b/tests/Exception/QueryBuilderExceptionTest.php
index 168e766d89..91670f9c78 100644
--- a/tests/Exception/QueryBuilderExceptionTest.php
+++ b/tests/Exception/QueryBuilderExceptionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Exception;
 
 /**
diff --git a/tests/Exception/RuntimeExceptionTest.php b/tests/Exception/RuntimeExceptionTest.php
index fd5c3cd5f7..b1980196e3 100644
--- a/tests/Exception/RuntimeExceptionTest.php
+++ b/tests/Exception/RuntimeExceptionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Exception;
 
 /**
diff --git a/tests/Index/RecoveryTest.php b/tests/Index/RecoveryTest.php
index acc2e20358..a646fe10c3 100644
--- a/tests/Index/RecoveryTest.php
+++ b/tests/Index/RecoveryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Index;
 
 use Elastica\Index\Recovery;
diff --git a/tests/Index/SettingsTest.php b/tests/Index/SettingsTest.php
index ce25e806ee..e3475d4a36 100644
--- a/tests/Index/SettingsTest.php
+++ b/tests/Index/SettingsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Index;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/tests/Index/StatsTest.php b/tests/Index/StatsTest.php
index 85dce732a9..2e2874e9f0 100644
--- a/tests/Index/StatsTest.php
+++ b/tests/Index/StatsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Index;
 
 use Elastica\Index\Stats;
diff --git a/tests/IndexTemplateTest.php b/tests/IndexTemplateTest.php
index 6ccad10961..bd66de7878 100644
--- a/tests/IndexTemplateTest.php
+++ b/tests/IndexTemplateTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/tests/IndexTest.php b/tests/IndexTest.php
index 74effafbfd..11c0f8bf55 100644
--- a/tests/IndexTest.php
+++ b/tests/IndexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/tests/JSONTest.php b/tests/JSONTest.php
index 4ba139d210..02d2668916 100644
--- a/tests/JSONTest.php
+++ b/tests/JSONTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\JSON;
diff --git a/tests/MappingTest.php b/tests/MappingTest.php
index 79babfcf62..1f70565a34 100644
--- a/tests/MappingTest.php
+++ b/tests/MappingTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Document;
diff --git a/tests/Multi/MultiBuilderTest.php b/tests/Multi/MultiBuilderTest.php
index a3a77b30b3..5f64193096 100644
--- a/tests/Multi/MultiBuilderTest.php
+++ b/tests/Multi/MultiBuilderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Multi;
 
 use Elastica\Multi\MultiBuilder;
diff --git a/tests/Multi/SearchTest.php b/tests/Multi/SearchTest.php
index edc51400fc..d59570a693 100644
--- a/tests/Multi/SearchTest.php
+++ b/tests/Multi/SearchTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Multi;
 
 use Elastica\Document;
diff --git a/tests/Node/InfoTest.php b/tests/Node/InfoTest.php
index 792fa23bcd..0ce429abb6 100644
--- a/tests/Node/InfoTest.php
+++ b/tests/Node/InfoTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Node;
 
 use Elastica\Node;
diff --git a/tests/NodeTest.php b/tests/NodeTest.php
index e039bb455e..1d1be7ab13 100644
--- a/tests/NodeTest.php
+++ b/tests/NodeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Node;
diff --git a/tests/ParamTest.php b/tests/ParamTest.php
index 2cf04059cf..bd1668d453 100644
--- a/tests/ParamTest.php
+++ b/tests/ParamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Exception\InvalidException;
diff --git a/tests/PipelineTest.php b/tests/PipelineTest.php
index b7b17e850b..c9ec96a9fd 100644
--- a/tests/PipelineTest.php
+++ b/tests/PipelineTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/tests/PointInTimeTest.php b/tests/PointInTimeTest.php
index 3320ea3035..822465e903 100644
--- a/tests/PointInTimeTest.php
+++ b/tests/PointInTimeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Test\Base as BaseTest;
diff --git a/tests/Processor/AppendProcessorTest.php b/tests/Processor/AppendProcessorTest.php
index 5cb18761f3..e15cb87bea 100644
--- a/tests/Processor/AppendProcessorTest.php
+++ b/tests/Processor/AppendProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/AttachmentProcessorTest.php b/tests/Processor/AttachmentProcessorTest.php
index d2851c6259..f76b48b7bf 100644
--- a/tests/Processor/AttachmentProcessorTest.php
+++ b/tests/Processor/AttachmentProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/BytesProcessorTest.php b/tests/Processor/BytesProcessorTest.php
index 2e958427f3..0a36184c91 100644
--- a/tests/Processor/BytesProcessorTest.php
+++ b/tests/Processor/BytesProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Processor\BytesProcessor;
diff --git a/tests/Processor/ConvertProcessorTest.php b/tests/Processor/ConvertProcessorTest.php
index 020e5dd74d..460a53856d 100644
--- a/tests/Processor/ConvertProcessorTest.php
+++ b/tests/Processor/ConvertProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/DateIndexNameProcessorTest.php b/tests/Processor/DateIndexNameProcessorTest.php
index b626c382ec..5fbaff8308 100644
--- a/tests/Processor/DateIndexNameProcessorTest.php
+++ b/tests/Processor/DateIndexNameProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Processor\DateIndexNameProcessor;
diff --git a/tests/Processor/DateProcessorTest.php b/tests/Processor/DateProcessorTest.php
index b55e366bf8..998d964612 100644
--- a/tests/Processor/DateProcessorTest.php
+++ b/tests/Processor/DateProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/DotExpanderProcessorTest.php b/tests/Processor/DotExpanderProcessorTest.php
index 34827b2c12..33039b8ba6 100644
--- a/tests/Processor/DotExpanderProcessorTest.php
+++ b/tests/Processor/DotExpanderProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/FailProcessorTest.php b/tests/Processor/FailProcessorTest.php
index 0e0190915b..bffd2cae5f 100644
--- a/tests/Processor/FailProcessorTest.php
+++ b/tests/Processor/FailProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/ForeachProcessorTest.php b/tests/Processor/ForeachProcessorTest.php
index fff6a88680..95a0bc2510 100644
--- a/tests/Processor/ForeachProcessorTest.php
+++ b/tests/Processor/ForeachProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/JoinProcessorTest.php b/tests/Processor/JoinProcessorTest.php
index 91c9b09429..5f7e50d06a 100644
--- a/tests/Processor/JoinProcessorTest.php
+++ b/tests/Processor/JoinProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/JsonProcessorTest.php b/tests/Processor/JsonProcessorTest.php
index ea4acf1291..36555e600d 100644
--- a/tests/Processor/JsonProcessorTest.php
+++ b/tests/Processor/JsonProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/KvProcessorTest.php b/tests/Processor/KvProcessorTest.php
index efbf176ceb..6a393fa572 100644
--- a/tests/Processor/KvProcessorTest.php
+++ b/tests/Processor/KvProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Processor\KvProcessor;
diff --git a/tests/Processor/LowercaseProcessorTest.php b/tests/Processor/LowercaseProcessorTest.php
index 663db45e0f..158d268270 100644
--- a/tests/Processor/LowercaseProcessorTest.php
+++ b/tests/Processor/LowercaseProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/RemoveProcessorTest.php b/tests/Processor/RemoveProcessorTest.php
index 0b7e4fda21..4c8fd05b3d 100644
--- a/tests/Processor/RemoveProcessorTest.php
+++ b/tests/Processor/RemoveProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/RenameProcessorTest.php b/tests/Processor/RenameProcessorTest.php
index ad8846d998..6f7e26430e 100644
--- a/tests/Processor/RenameProcessorTest.php
+++ b/tests/Processor/RenameProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/SetProcessorTest.php b/tests/Processor/SetProcessorTest.php
index 1585a28d52..bcddb236a8 100644
--- a/tests/Processor/SetProcessorTest.php
+++ b/tests/Processor/SetProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/SortProcessorTest.php b/tests/Processor/SortProcessorTest.php
index 3f0bc02f40..1850158c45 100644
--- a/tests/Processor/SortProcessorTest.php
+++ b/tests/Processor/SortProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/SplitProcessorTest.php b/tests/Processor/SplitProcessorTest.php
index b31bdc02c3..5a030d7ac6 100644
--- a/tests/Processor/SplitProcessorTest.php
+++ b/tests/Processor/SplitProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/TrimProcessorTest.php b/tests/Processor/TrimProcessorTest.php
index b419ba59e0..3a4e9cb65d 100644
--- a/tests/Processor/TrimProcessorTest.php
+++ b/tests/Processor/TrimProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Processor/UppercaseProcessorTest.php b/tests/Processor/UppercaseProcessorTest.php
index 52792f5e47..ee6208b522 100644
--- a/tests/Processor/UppercaseProcessorTest.php
+++ b/tests/Processor/UppercaseProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Processor;
 
 use Elastica\Bulk;
diff --git a/tests/Query/BoolQueryTest.php b/tests/Query/BoolQueryTest.php
index 5ae4603cc9..4bc04cc813 100644
--- a/tests/Query/BoolQueryTest.php
+++ b/tests/Query/BoolQueryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/BoostingTest.php b/tests/Query/BoostingTest.php
index b0c8b7d7fd..d0a846f089 100644
--- a/tests/Query/BoostingTest.php
+++ b/tests/Query/BoostingTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Query\Boosting;
diff --git a/tests/Query/CombinedFieldsQueryTest.php b/tests/Query/CombinedFieldsQueryTest.php
index 31567029d1..de775dac9b 100644
--- a/tests/Query/CombinedFieldsQueryTest.php
+++ b/tests/Query/CombinedFieldsQueryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/ConstantScoreTest.php b/tests/Query/ConstantScoreTest.php
index bad3883434..87a1986aab 100644
--- a/tests/Query/ConstantScoreTest.php
+++ b/tests/Query/ConstantScoreTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Query\ConstantScore;
diff --git a/tests/Query/DisMaxTest.php b/tests/Query/DisMaxTest.php
index 7c8d6c6df9..f84d27123d 100644
--- a/tests/Query/DisMaxTest.php
+++ b/tests/Query/DisMaxTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/DistanceFeatureTest.php b/tests/Query/DistanceFeatureTest.php
index a22e6736bb..88b3ff8122 100644
--- a/tests/Query/DistanceFeatureTest.php
+++ b/tests/Query/DistanceFeatureTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Query\DistanceFeature;
diff --git a/tests/Query/EscapeStringTest.php b/tests/Query/EscapeStringTest.php
index 8a594345ca..2db43b5bc9 100644
--- a/tests/Query/EscapeStringTest.php
+++ b/tests/Query/EscapeStringTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/ExistsTest.php b/tests/Query/ExistsTest.php
index 0e19ae86cc..842e265221 100644
--- a/tests/Query/ExistsTest.php
+++ b/tests/Query/ExistsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Query\Exists;
diff --git a/tests/Query/FunctionScoreTest.php b/tests/Query/FunctionScoreTest.php
index 0ac934cd04..daf25b9dc4 100644
--- a/tests/Query/FunctionScoreTest.php
+++ b/tests/Query/FunctionScoreTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/FuzzyTest.php b/tests/Query/FuzzyTest.php
index 20138dc33f..9c19eafa44 100644
--- a/tests/Query/FuzzyTest.php
+++ b/tests/Query/FuzzyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/GeoBoundingBoxTest.php b/tests/Query/GeoBoundingBoxTest.php
index 9373e784c6..3f13b54478 100644
--- a/tests/Query/GeoBoundingBoxTest.php
+++ b/tests/Query/GeoBoundingBoxTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Exception\InvalidException;
diff --git a/tests/Query/GeoDistanceTest.php b/tests/Query/GeoDistanceTest.php
index 543a7471cd..2d699b24e9 100644
--- a/tests/Query/GeoDistanceTest.php
+++ b/tests/Query/GeoDistanceTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/GeoPolygonTest.php b/tests/Query/GeoPolygonTest.php
index 30b6ad9190..513c678d8e 100644
--- a/tests/Query/GeoPolygonTest.php
+++ b/tests/Query/GeoPolygonTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/GeoShapePreIndexedTest.php b/tests/Query/GeoShapePreIndexedTest.php
index 5363c3f4bc..df6fbc9619 100644
--- a/tests/Query/GeoShapePreIndexedTest.php
+++ b/tests/Query/GeoShapePreIndexedTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/GeoShapeProvidedTest.php b/tests/Query/GeoShapeProvidedTest.php
index fd40ba0714..19c08cc4cf 100644
--- a/tests/Query/GeoShapeProvidedTest.php
+++ b/tests/Query/GeoShapeProvidedTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/HasChildTest.php b/tests/Query/HasChildTest.php
index 66e1b4a721..63032a5208 100644
--- a/tests/Query/HasChildTest.php
+++ b/tests/Query/HasChildTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Mapping;
diff --git a/tests/Query/HasParentTest.php b/tests/Query/HasParentTest.php
index 4a25ae3161..72509e49c9 100644
--- a/tests/Query/HasParentTest.php
+++ b/tests/Query/HasParentTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Mapping;
diff --git a/tests/Query/HighlightTest.php b/tests/Query/HighlightTest.php
index 4118e954d7..d64ebb51b7 100644
--- a/tests/Query/HighlightTest.php
+++ b/tests/Query/HighlightTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/IdsTest.php b/tests/Query/IdsTest.php
index 80a5338052..15c5d14804 100644
--- a/tests/Query/IdsTest.php
+++ b/tests/Query/IdsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/InnerHitsTest.php b/tests/Query/InnerHitsTest.php
index 80fc24432e..d1efc52e8c 100644
--- a/tests/Query/InnerHitsTest.php
+++ b/tests/Query/InnerHitsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Index;
diff --git a/tests/Query/LimitTest.php b/tests/Query/LimitTest.php
index b9b729e9fa..4bf6c76d22 100644
--- a/tests/Query/LimitTest.php
+++ b/tests/Query/LimitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Query\Limit;
diff --git a/tests/Query/MatchAllTest.php b/tests/Query/MatchAllTest.php
index 3a8f93c9c9..e2dc07fe88 100644
--- a/tests/Query/MatchAllTest.php
+++ b/tests/Query/MatchAllTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/MatchNoneTest.php b/tests/Query/MatchNoneTest.php
index a1f893ec65..16b423b1c8 100644
--- a/tests/Query/MatchNoneTest.php
+++ b/tests/Query/MatchNoneTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/MatchPhrasePrefixTest.php b/tests/Query/MatchPhrasePrefixTest.php
index 915ae3ae7d..d5b4299164 100644
--- a/tests/Query/MatchPhrasePrefixTest.php
+++ b/tests/Query/MatchPhrasePrefixTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/MatchPhraseTest.php b/tests/Query/MatchPhraseTest.php
index 993024a710..d3934fc57e 100644
--- a/tests/Query/MatchPhraseTest.php
+++ b/tests/Query/MatchPhraseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/MatchQueryTest.php b/tests/Query/MatchQueryTest.php
index 736dca002f..a4e895f69a 100644
--- a/tests/Query/MatchQueryTest.php
+++ b/tests/Query/MatchQueryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/MoreLikeThisTest.php b/tests/Query/MoreLikeThisTest.php
index e7636ae3ad..a9cd4e7546 100644
--- a/tests/Query/MoreLikeThisTest.php
+++ b/tests/Query/MoreLikeThisTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/MultiMatchTest.php b/tests/Query/MultiMatchTest.php
index 190cb456ea..a4b392e9da 100644
--- a/tests/Query/MultiMatchTest.php
+++ b/tests/Query/MultiMatchTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/NestedTest.php b/tests/Query/NestedTest.php
index 58e399c3c3..a8be50babd 100644
--- a/tests/Query/NestedTest.php
+++ b/tests/Query/NestedTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Query\Nested;
diff --git a/tests/Query/ParentIdTest.php b/tests/Query/ParentIdTest.php
index bb8ab58958..18804d9a45 100644
--- a/tests/Query/ParentIdTest.php
+++ b/tests/Query/ParentIdTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Mapping;
diff --git a/tests/Query/PercolateTest.php b/tests/Query/PercolateTest.php
index c8ba2d8292..0600cb4c58 100644
--- a/tests/Query/PercolateTest.php
+++ b/tests/Query/PercolateTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Client;
diff --git a/tests/Query/PostFilterTest.php b/tests/Query/PostFilterTest.php
index 2fdbb6d5f9..d8349226b0 100644
--- a/tests/Query/PostFilterTest.php
+++ b/tests/Query/PostFilterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/PrefixTest.php b/tests/Query/PrefixTest.php
index 4e538d7f5e..3efe28e8da 100644
--- a/tests/Query/PrefixTest.php
+++ b/tests/Query/PrefixTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Query\Prefix;
diff --git a/tests/Query/QueryStringTest.php b/tests/Query/QueryStringTest.php
index afdce8dc64..9324f0a3fd 100644
--- a/tests/Query/QueryStringTest.php
+++ b/tests/Query/QueryStringTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
@@ -28,7 +30,7 @@ public function testSearchMultipleFields(): void
         $this->assertEquals(['query_string' => $expected], $query->toArray());
 
         $fields = [];
-        $max = \mt_rand(1, 10);
+        $max = \random_int(1, 10);
         for ($i = 0; $i < $max; ++$i) {
             $fields[] = \uniqid();
         }
diff --git a/tests/Query/RangeTest.php b/tests/Query/RangeTest.php
index 71320a7efa..f687b4cf19 100644
--- a/tests/Query/RangeTest.php
+++ b/tests/Query/RangeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/RegexpTest.php b/tests/Query/RegexpTest.php
index 11e8e2fe7c..1689a4dd70 100644
--- a/tests/Query/RegexpTest.php
+++ b/tests/Query/RegexpTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Query\Regexp;
diff --git a/tests/Query/RescoreTest.php b/tests/Query/RescoreTest.php
index e85f1e1631..2e435f03b1 100644
--- a/tests/Query/RescoreTest.php
+++ b/tests/Query/RescoreTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Query;
diff --git a/tests/Query/ScriptTest.php b/tests/Query/ScriptTest.php
index 27d03b93ee..64c31f7e00 100644
--- a/tests/Query/ScriptTest.php
+++ b/tests/Query/ScriptTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Query\Script as ScriptQuery;
diff --git a/tests/Query/SimpleQueryStringTest.php b/tests/Query/SimpleQueryStringTest.php
index 08cb117cd3..b6b37dd34e 100644
--- a/tests/Query/SimpleQueryStringTest.php
+++ b/tests/Query/SimpleQueryStringTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/SimpleTest.php b/tests/Query/SimpleTest.php
index a48a65453a..d6b80be844 100644
--- a/tests/Query/SimpleTest.php
+++ b/tests/Query/SimpleTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Query\Simple;
diff --git a/tests/Query/SpanContainingTest.php b/tests/Query/SpanContainingTest.php
index bca03a2258..91fc816b54 100644
--- a/tests/Query/SpanContainingTest.php
+++ b/tests/Query/SpanContainingTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/SpanFirstTest.php b/tests/Query/SpanFirstTest.php
index de6a011083..b280919e90 100644
--- a/tests/Query/SpanFirstTest.php
+++ b/tests/Query/SpanFirstTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/SpanMultiTest.php b/tests/Query/SpanMultiTest.php
index 439b1c9f17..0b2c2bdfad 100644
--- a/tests/Query/SpanMultiTest.php
+++ b/tests/Query/SpanMultiTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/SpanNearTest.php b/tests/Query/SpanNearTest.php
index 20fe390191..c522c0870f 100644
--- a/tests/Query/SpanNearTest.php
+++ b/tests/Query/SpanNearTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/SpanNotTest.php b/tests/Query/SpanNotTest.php
index 7dca223595..73f0a434b0 100644
--- a/tests/Query/SpanNotTest.php
+++ b/tests/Query/SpanNotTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/SpanOrTest.php b/tests/Query/SpanOrTest.php
index 74564009d3..7a32b635e8 100644
--- a/tests/Query/SpanOrTest.php
+++ b/tests/Query/SpanOrTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/SpanTermTest.php b/tests/Query/SpanTermTest.php
index 1a48ae9eb4..faddc13fa1 100644
--- a/tests/Query/SpanTermTest.php
+++ b/tests/Query/SpanTermTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/SpanWithinTest.php b/tests/Query/SpanWithinTest.php
index 8c10532ac4..05afae7251 100644
--- a/tests/Query/SpanWithinTest.php
+++ b/tests/Query/SpanWithinTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/TermTest.php b/tests/Query/TermTest.php
index 1b8db6b8fa..3655c42017 100644
--- a/tests/Query/TermTest.php
+++ b/tests/Query/TermTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Query\Term;
diff --git a/tests/Query/TermsSetTest.php b/tests/Query/TermsSetTest.php
index 97d538dfef..7b377427c2 100644
--- a/tests/Query/TermsSetTest.php
+++ b/tests/Query/TermsSetTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/TermsTest.php b/tests/Query/TermsTest.php
index aa0b58a63f..6c6bc0a113 100644
--- a/tests/Query/TermsTest.php
+++ b/tests/Query/TermsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/Query/WildcardTest.php b/tests/Query/WildcardTest.php
index 0d789b7046..a4d1558cef 100644
--- a/tests/Query/WildcardTest.php
+++ b/tests/Query/WildcardTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
diff --git a/tests/QueryBuilder/DSL/AbstractDSLTest.php b/tests/QueryBuilder/DSL/AbstractDSLTest.php
index 6cc8afcc29..179fd515b5 100644
--- a/tests/QueryBuilder/DSL/AbstractDSLTest.php
+++ b/tests/QueryBuilder/DSL/AbstractDSLTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\QueryBuilder\DSL;
 
 use Elastica\Exception\NotImplementedException;
@@ -20,7 +22,7 @@ protected function _assertImplemented(DSL $dsl, string $methodName, string $clas
 
         // Check method signature
         $class = new \ReflectionClass($className);
-        $method = new \ReflectionMethod(\get_class($dsl), $methodName);
+        $method = new \ReflectionMethod($dsl::class, $methodName);
         if (!$class->hasMethod('__construct')) {
             $this->assertEmpty($method->getParameters(), 'Constructor is not defined, but method has some parameters');
         } else {
diff --git a/tests/QueryBuilder/DSL/AggregationTest.php b/tests/QueryBuilder/DSL/AggregationTest.php
index a00b792852..5dd9fa4c63 100644
--- a/tests/QueryBuilder/DSL/AggregationTest.php
+++ b/tests/QueryBuilder/DSL/AggregationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\QueryBuilder\DSL;
 
 use Elastica\Aggregation;
diff --git a/tests/QueryBuilder/DSL/CollapseTest.php b/tests/QueryBuilder/DSL/CollapseTest.php
index 0d4fb64107..d627162054 100644
--- a/tests/QueryBuilder/DSL/CollapseTest.php
+++ b/tests/QueryBuilder/DSL/CollapseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\QueryBuilder\DSL;
 
 use Elastica\Collapse;
diff --git a/tests/QueryBuilder/DSL/QueryTest.php b/tests/QueryBuilder/DSL/QueryTest.php
index cbe713ecfb..6ad7795b19 100644
--- a/tests/QueryBuilder/DSL/QueryTest.php
+++ b/tests/QueryBuilder/DSL/QueryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\QueryBuilder\DSL;
 
 use Elastica\Query;
diff --git a/tests/QueryBuilder/DSL/SuggestTest.php b/tests/QueryBuilder/DSL/SuggestTest.php
index cc323d4772..d208aed4e9 100644
--- a/tests/QueryBuilder/DSL/SuggestTest.php
+++ b/tests/QueryBuilder/DSL/SuggestTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\QueryBuilder\DSL;
 
 use Elastica\QueryBuilder\DSL;
diff --git a/tests/QueryBuilder/VersionTest.php b/tests/QueryBuilder/VersionTest.php
index 7cd8272624..6384a53434 100644
--- a/tests/QueryBuilder/VersionTest.php
+++ b/tests/QueryBuilder/VersionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\QueryBuilder;
 
 use Elastica\QueryBuilder\DSL;
@@ -37,28 +39,28 @@ private function assertVersions(Version $version, array $dsl): void
         foreach ($version->getQueries() as $query) {
             $this->assertTrue(
                 \method_exists($dsl[0], $query),
-                'query "'.$query.'" in '.\get_class($version).' must be defined in '.\get_class($dsl[0])
+                'query "'.$query.'" in '.$version::class.' must be defined in '.\get_class($dsl[0])
             );
         }
 
         foreach ($version->getAggregations() as $aggregation) {
             $this->assertTrue(
                 \method_exists($dsl[1], $aggregation),
-                'aggregation "'.$aggregation.'" in '.\get_class($version).' must be defined in '.\get_class($dsl[2])
+                'aggregation "'.$aggregation.'" in '.$version::class.' must be defined in '.\get_class($dsl[2])
             );
         }
 
         foreach ($version->getSuggesters() as $suggester) {
             $this->assertTrue(
                 \method_exists($dsl[2], $suggester),
-                'suggester "'.$suggester.'" in '.\get_class($version).' must be defined in '.\get_class($dsl[2])
+                'suggester "'.$suggester.'" in '.$version::class.' must be defined in '.\get_class($dsl[2])
             );
         }
 
         foreach ($version->getCollapsers() as $collapser) {
             $this->assertTrue(
                 \method_exists($dsl[3], $collapser),
-                'suggester "'.$collapser.'" in '.\get_class($version).' must be defined in '.\get_class($dsl[3])
+                'suggester "'.$collapser.'" in '.$version::class.' must be defined in '.\get_class($dsl[3])
             );
         }
     }
diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php
index ba0660e078..f7d0d28a79 100644
--- a/tests/QueryBuilderTest.php
+++ b/tests/QueryBuilderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Aggregation\AbstractAggregation;
diff --git a/tests/QueryTest.php b/tests/QueryTest.php
index 6f8c0db0b6..6818e7c876 100644
--- a/tests/QueryTest.php
+++ b/tests/QueryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Aggregation\Terms as TermsAggregation;
diff --git a/tests/ReindexTest.php b/tests/ReindexTest.php
index 2e933df0b3..0d8f843168 100644
--- a/tests/ReindexTest.php
+++ b/tests/ReindexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/tests/ResponseFunctionalTest.php b/tests/ResponseFunctionalTest.php
index 1d8ec28ef2..934f7dbce3 100644
--- a/tests/ResponseFunctionalTest.php
+++ b/tests/ResponseFunctionalTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Document;
diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
index 04422f8241..8888c0a190 100644
--- a/tests/ResponseTest.php
+++ b/tests/ResponseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Response;
diff --git a/tests/ResultSet/BuilderTest.php b/tests/ResultSet/BuilderTest.php
index d696b031dc..6c4307dd6c 100644
--- a/tests/ResultSet/BuilderTest.php
+++ b/tests/ResultSet/BuilderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\ResultSet;
 
 use Elastica\Query;
diff --git a/tests/ResultSet/ChainProcessorTest.php b/tests/ResultSet/ChainProcessorTest.php
index 474a524edc..f89dddf09f 100644
--- a/tests/ResultSet/ChainProcessorTest.php
+++ b/tests/ResultSet/ChainProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\ResultSet;
 
 use Elastica\Query;
diff --git a/tests/ResultSet/ProcessingBuilderTest.php b/tests/ResultSet/ProcessingBuilderTest.php
index 2cb2e6e1d2..fc44b16511 100644
--- a/tests/ResultSet/ProcessingBuilderTest.php
+++ b/tests/ResultSet/ProcessingBuilderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\ResultSet;
 
 use Elastica\Query;
diff --git a/tests/ResultSetTest.php b/tests/ResultSetTest.php
index a2f724ad83..c733e0a2a5 100644
--- a/tests/ResultSetTest.php
+++ b/tests/ResultSetTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Document;
diff --git a/tests/ResultTest.php b/tests/ResultTest.php
index 81a0588f36..b35e85996c 100644
--- a/tests/ResultTest.php
+++ b/tests/ResultTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Document;
diff --git a/tests/Script/ScriptFieldsTest.php b/tests/Script/ScriptFieldsTest.php
index afd7f2ea6f..3e195f94c3 100644
--- a/tests/Script/ScriptFieldsTest.php
+++ b/tests/Script/ScriptFieldsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Script;
 
 use Elastica\Mapping;
diff --git a/tests/Script/ScriptIdTest.php b/tests/Script/ScriptIdTest.php
index 118f8730cd..1f12ad011f 100644
--- a/tests/Script/ScriptIdTest.php
+++ b/tests/Script/ScriptIdTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Script;
 
 use Elastica\Exception\InvalidException;
diff --git a/tests/Script/ScriptTest.php b/tests/Script/ScriptTest.php
index d20950c618..b94efbe79d 100644
--- a/tests/Script/ScriptTest.php
+++ b/tests/Script/ScriptTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Script;
 
 use Elastica\Exception\InvalidException;
diff --git a/tests/ScrollTest.php b/tests/ScrollTest.php
index 3123f3880b..f7a678cdc6 100644
--- a/tests/ScrollTest.php
+++ b/tests/ScrollTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Client;
diff --git a/tests/SearchTest.php b/tests/SearchTest.php
index dcaa143662..e21147ff0e 100644
--- a/tests/SearchTest.php
+++ b/tests/SearchTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
diff --git a/tests/SnapshotTest.php b/tests/SnapshotTest.php
index 6a6169da7f..2082e102f2 100644
--- a/tests/SnapshotTest.php
+++ b/tests/SnapshotTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Document;
diff --git a/tests/StatusTest.php b/tests/StatusTest.php
index dced6609e9..dc7cab0206 100644
--- a/tests/StatusTest.php
+++ b/tests/StatusTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
@@ -96,9 +98,7 @@ public function testAliasExists(): void
 
         $indicesWithAlias = $status->getIndicesWithAlias($aliasName);
         $this->assertEquals([$indexName], \array_map(
-            static function ($index) {
-                return $index->getName();
-            },
+            static fn ($index) => $index->getName(),
             $indicesWithAlias
         ));
     }
diff --git a/tests/Suggest/CompletionTest.php b/tests/Suggest/CompletionTest.php
index 58df78ee97..7833319fdb 100644
--- a/tests/Suggest/CompletionTest.php
+++ b/tests/Suggest/CompletionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Suggest;
 
 use Elastica\Document;
diff --git a/tests/Suggest/PhraseTest.php b/tests/Suggest/PhraseTest.php
index 65b621ae1a..af091f1a24 100644
--- a/tests/Suggest/PhraseTest.php
+++ b/tests/Suggest/PhraseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Suggest;
 
 use Elastica\Document;
diff --git a/tests/Suggest/TermTest.php b/tests/Suggest/TermTest.php
index 57a7fdadf3..c573a5bfee 100644
--- a/tests/Suggest/TermTest.php
+++ b/tests/Suggest/TermTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test\Suggest;
 
 use Elastica\Document;
diff --git a/tests/SuggestTest.php b/tests/SuggestTest.php
index 5e50bebe06..f6648128a3 100644
--- a/tests/SuggestTest.php
+++ b/tests/SuggestTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Exception\NotImplementedException;
diff --git a/tests/TaskTest.php b/tests/TaskTest.php
index ab4117c56d..fc26a9d8e3 100644
--- a/tests/TaskTest.php
+++ b/tests/TaskTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Document;
diff --git a/tests/UtilTest.php b/tests/UtilTest.php
index 27106a72d7..a2e5c4f7a8 100644
--- a/tests/UtilTest.php
+++ b/tests/UtilTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica\Test;
 
 use Elastica\Test\Base as BaseTest;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index dcdcefbf97..7b64d8ac10 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 // normalize ES_VERSION for version_compare
 if (isset($_SERVER['ES_VERSION']) && \str_contains($_SERVER['ES_VERSION'], 'SNAPSHOT')) {
     $_SERVER['ES_VERSION'] = \str_replace('-SNAPSHOT', '', $_SERVER['ES_VERSION']);

From a09bd5a2e84a0af3c7d06c0bca5a524607315d75 Mon Sep 17 00:00:00 2001
From: Oleg Zhulnev <plbsid@gmail.com>
Date: Sun, 24 Mar 2024 18:58:18 +0300
Subject: [PATCH 7/8] Fix tests

---
 tests/Aggregation/DateRangeTest.php     |  2 +-
 tests/Cluster/SettingsTest.php          |  2 +-
 tests/Index/SettingsTest.php            | 10 +++-------
 tests/IndexTemplateTest.php             |  7 +++----
 tests/PipelineTest.php                  |  7 +++----
 tests/Query/CombinedFieldsQueryTest.php | 10 +++++-----
 tests/Query/MultiMatchTest.php          | 10 +++++-----
 tests/Query/QueryStringTest.php         |  5 ++---
 tests/SearchTest.php                    |  7 +++----
 9 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/tests/Aggregation/DateRangeTest.php b/tests/Aggregation/DateRangeTest.php
index 9e0dea6616..6078f0639d 100644
--- a/tests/Aggregation/DateRangeTest.php
+++ b/tests/Aggregation/DateRangeTest.php
@@ -136,7 +136,7 @@ public function testDateRangeSetFormatAccordingToFormatTargetField(): void
             $this->_getIndexForTest()->search($query)->getAggregation('date');
             $this->fail('Should throw exception to and from parameters in date_range aggregation are interpreted according of the target field');
         } catch (ClientResponseException $e) {
-            $error = \json_decode($e->getResponse()->getBody(), true)['error'] ?? null;
+            $error = json_decode((string) $e->getResponse()->getBody(), true)['error'] ?? null;
 
             $this->assertSame('search_phase_execution_exception', $error['type']);
             $this->assertStringStartsWith('failed to parse date field', $error['root_cause'][0]['reason']);
diff --git a/tests/Cluster/SettingsTest.php b/tests/Cluster/SettingsTest.php
index f0ffb4ab9c..c61e6d7cfd 100644
--- a/tests/Cluster/SettingsTest.php
+++ b/tests/Cluster/SettingsTest.php
@@ -40,7 +40,7 @@ public function testSetReadOnly(): void
             $index->addDocument($doc2);
             $this->fail('should throw read only exception');
         } catch (ClientResponseException $e) {
-            $error = \json_decode($e->getResponse()->getBody(), true)['error'] ?? null;
+            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertSame('cluster_block_exception', $error['type']);
             $this->assertStringContainsString('cluster read-only', $error['reason']);
diff --git a/tests/Index/SettingsTest.php b/tests/Index/SettingsTest.php
index e3475d4a36..820d9ebe21 100644
--- a/tests/Index/SettingsTest.php
+++ b/tests/Index/SettingsTest.php
@@ -7,7 +7,6 @@
 use Elastic\Elasticsearch\Exception\ClientResponseException;
 use Elastica\Document;
 use Elastica\Index\Settings as IndexSettings;
-use Elastica\ResponseConverter;
 use Elastica\Test\Base as BaseTest;
 
 /**
@@ -138,8 +137,7 @@ public function testDeleteAliasWithException(): void
             $indexAlias->delete();
             $this->fail('Should throw exception because you should delete the concrete index and not the alias');
         } catch (ClientResponseException $e) {
-            $response = ResponseConverter::toElastica($e->getResponse());
-            $error = $response->getFullError();
+            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertSame('illegal_argument_exception', $error['type']);
             $this->assertStringContainsString('specify the corresponding concrete indices instead.', $error['reason']);
@@ -351,8 +349,7 @@ public function testSetReadOnly(): void
             $index->addDocument($doc2);
             $this->fail('Should throw exception because of read only');
         } catch (ClientResponseException $e) {
-            $response = ResponseConverter::toElastica($e->getResponse());
-            $error = $response->getFullError();
+            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertSame('cluster_block_exception', $error['type']);
             $this->assertStringContainsString('read-only', $error['reason']);
@@ -453,8 +450,7 @@ public function testNotFoundIndex(): void
             $index->getSettings()->get();
             $this->fail('Should throw exception because of index not found');
         } catch (ClientResponseException $e) {
-            $response = ResponseConverter::toElastica($e->getResponse());
-            $error = $response->getFullError();
+            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertSame('index_not_found_exception', $error['type']);
         }
diff --git a/tests/IndexTemplateTest.php b/tests/IndexTemplateTest.php
index bd66de7878..bf51488122 100644
--- a/tests/IndexTemplateTest.php
+++ b/tests/IndexTemplateTest.php
@@ -78,13 +78,12 @@ public function testCreateAlreadyExistsTemplateException(): void
         $indexTemplate->create($template);
         try {
             $indexTemplate->create($template);
-        } catch (ClientResponseException $ex) {
-            $response = ResponseConverter::toElastica($ex->getResponse());
-            $error = $response->getFullError();
+        } catch (ClientResponseException $e) {
+            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertNotEquals('index_template_already_exists_exception', $error['type']);
             $this->assertEquals('resource_already_exists_exception', $error['type']);
-            $this->assertEquals(400, $ex->getResponse()->getStatusCode());
+            $this->assertEquals(400, $e->getResponse()->getStatusCode());
         }
     }
 }
diff --git a/tests/PipelineTest.php b/tests/PipelineTest.php
index c9ec96a9fd..bdde1cabba 100644
--- a/tests/PipelineTest.php
+++ b/tests/PipelineTest.php
@@ -135,11 +135,10 @@ public function testDeletePipeline(): void
             $pipeline->deletePipeline('non_existent_pipeline');
             $this->fail('an exception should be raised!');
         } catch (ClientResponseException $e) {
-            $response = ResponseConverter::toElastica($e->getResponse());
-            $result = $response->getFullError();
+            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
-            $this->assertEquals('resource_not_found_exception', $result['type']);
-            $this->assertEquals('pipeline [non_existent_pipeline] is missing', $result['reason']);
+            $this->assertEquals('resource_not_found_exception', $error['type']);
+            $this->assertEquals('pipeline [non_existent_pipeline] is missing', $error['reason']);
         }
     }
 }
diff --git a/tests/Query/CombinedFieldsQueryTest.php b/tests/Query/CombinedFieldsQueryTest.php
index de775dac9b..f10d96340b 100644
--- a/tests/Query/CombinedFieldsQueryTest.php
+++ b/tests/Query/CombinedFieldsQueryTest.php
@@ -18,10 +18,10 @@
 class CombinedFieldsQueryTest extends BaseTest
 {
     private static $data = [
-        ['id' => 1, 'title' => 'Rodolfo', 'body' => 'Moraes',   'abstract' => 'Lorem'],
-        ['id' => 2, 'title' => 'Tristan', 'body' => 'Maindron', 'abstract' => 'Dolor'],
-        ['id' => 3, 'title' => 'Monique', 'body' => 'Maindron', 'abstract' => 'Ipsum'],
-        ['id' => 4, 'title' => 'John',    'body' => 'not Doe',  'abstract' => 'Consectetur'],
+        ['id' => '1', 'title' => 'Rodolfo', 'body' => 'Moraes',   'abstract' => 'Lorem'],
+        ['id' => '2', 'title' => 'Tristan', 'body' => 'Maindron', 'abstract' => 'Dolor'],
+        ['id' => '3', 'title' => 'Monique', 'body' => 'Maindron', 'abstract' => 'Ipsum'],
+        ['id' => '4', 'title' => 'John',    'body' => 'not Doe',  'abstract' => 'Consectetur'],
     ];
 
     /**
@@ -145,7 +145,7 @@ private function _generateIndex(): Index
         );
 
         foreach (self::$data as $key => $docData) {
-            $index->addDocument(new Document($key, $docData));
+            $index->addDocument(new Document((string) $key, $docData));
         }
 
         // Refresh index
diff --git a/tests/Query/MultiMatchTest.php b/tests/Query/MultiMatchTest.php
index a4b392e9da..17fd671b56 100644
--- a/tests/Query/MultiMatchTest.php
+++ b/tests/Query/MultiMatchTest.php
@@ -18,10 +18,10 @@
 class MultiMatchTest extends BaseTest
 {
     private static $data = [
-        ['id' => 1, 'name' => 'Rodolfo', 'last_name' => 'Moraes',   'full_name' => 'Rodolfo Moraes'],
-        ['id' => 2, 'name' => 'Tristan', 'last_name' => 'Maindron', 'full_name' => 'Tristan Maindron'],
-        ['id' => 3, 'name' => 'Monique', 'last_name' => 'Maindron', 'full_name' => 'Monique Maindron'],
-        ['id' => 4, 'name' => 'John',    'last_name' => 'not Doe',  'full_name' => 'John not Doe'],
+        ['id' => '1', 'name' => 'Rodolfo', 'last_name' => 'Moraes',   'full_name' => 'Rodolfo Moraes'],
+        ['id' => '2', 'name' => 'Tristan', 'last_name' => 'Maindron', 'full_name' => 'Tristan Maindron'],
+        ['id' => '3', 'name' => 'Monique', 'last_name' => 'Maindron', 'full_name' => 'Monique Maindron'],
+        ['id' => '4', 'name' => 'John',    'last_name' => 'not Doe',  'full_name' => 'John not Doe'],
     ];
 
     /**
@@ -218,7 +218,7 @@ private function _generateIndex(): Index
         );
 
         foreach (self::$data as $key => $docData) {
-            $index->addDocument(new Document($key, $docData));
+            $index->addDocument(new Document((string) $key, $docData));
         }
 
         // Refresh index
diff --git a/tests/Query/QueryStringTest.php b/tests/Query/QueryStringTest.php
index 9324f0a3fd..3774f38de2 100644
--- a/tests/Query/QueryStringTest.php
+++ b/tests/Query/QueryStringTest.php
@@ -107,14 +107,13 @@ public function testSearchFieldsValidationException(): void
         try {
             $index->search($query);
         } catch (ClientResponseException $e) {
-            $response = ResponseConverter::toElastica($e->getResponse());
-            $error = $response->getFullError();
+            $error = json_decode((string) $e->getResponse()->getBody(), true)['error'] ?? null;
 
             $this->assertSame('query_shard_exception', $error['root_cause'][0]['type']);
             $this->assertStringContainsString('failed to create query', $error['root_cause'][0]['reason']);
             $this->assertStringContainsString('[fields] parameter in conjunction with [default_field]', $error['failed_shards'][0]['reason']['caused_by']['reason']);
 
-            $this->assertEquals(400, $response->getStatus());
+            $this->assertEquals(400, $e->getResponse()->getStatusCode());
         }
     }
 
diff --git a/tests/SearchTest.php b/tests/SearchTest.php
index e21147ff0e..d7ef80fc20 100644
--- a/tests/SearchTest.php
+++ b/tests/SearchTest.php
@@ -258,7 +258,7 @@ public function testSearchScrollRequest(): void
         ]);
 
         \parse_str($search->getClient()->getLastRequest()->getUri()->getQuery(), $lastRequestQuery);
-        $lastRequestData = \json_decode($search->getClient()->getLastRequest()->getBody(), true);
+        $lastRequestData = \json_decode((string) $search->getClient()->getLastRequest()->getBody(), true);
 
         $this->assertFalse($result->getResponse()->hasError());
         $this->assertCount(5, $result->getResults());
@@ -271,7 +271,7 @@ public function testSearchScrollRequest(): void
         ]);
 
         \parse_str($search->getClient()->getLastRequest()->getUri()->getQuery(), $lastRequestQuery);
-        $lastRequestData = \json_decode($search->getClient()->getLastRequest()->getBody(), true);
+        $lastRequestData = \json_decode((string) $search->getClient()->getLastRequest()->getBody(), true);
 
         $this->assertFalse($result->getResponse()->hasError());
         $this->assertCount(0, $result->getResults());
@@ -688,8 +688,7 @@ public function testIgnoreUnavailableOption(): void
             $search->search($query);
             $this->fail('Should raise an Index not found exception');
         } catch (ClientResponseException $e) {
-            $response = ResponseConverter::toElastica($e->getResponse());
-            $error = $response->getFullError();
+            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertEquals('index_not_found_exception', $error['type']);
             $this->assertEquals('no such index [elastica_7086b4c2ee585bbb6740ece5ed7ece01]', $error['reason']);

From 78072602c05c98da5fdd8aed5e14f6218d4f4f0b Mon Sep 17 00:00:00 2001
From: Oleg Zhulnev <plbsid@gmail.com>
Date: Sun, 24 Mar 2024 19:45:50 +0300
Subject: [PATCH 8/8] apply rules to all files

---
 .php-cs-fixer.dist.php              | 5 ++++-
 src/JSON.php                        | 2 ++
 src/Response.php                    | 2 ++
 src/ResponseConverter.php           | 4 +++-
 tests/Aggregation/DateRangeTest.php | 2 +-
 tests/Cluster/SettingsTest.php      | 2 +-
 tests/Index/SettingsTest.php        | 6 +++---
 tests/IndexTemplateTest.php         | 3 +--
 tests/PipelineTest.php              | 3 +--
 tests/Query/QueryStringTest.php     | 3 +--
 tests/SearchTest.php                | 3 +--
 11 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index c612e7edd8..6c604d3a32 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 $finder = (new PhpCsFixer\Finder())
     ->in(__DIR__.'/src')
     ->in(__DIR__.'/tests')
@@ -8,7 +10,8 @@
 return (new PhpCsFixer\Config())
     ->setFinder($finder)
     ->setRules([
-        '@PHP71Migration' => true,
+        '@PHP80Migration' => true,
+        '@PHP80Migration:risky' => true,
         '@PhpCsFixer' => true,
         '@PHPUnit75Migration:risky' => true,
         '@PSR2' => true,
diff --git a/src/JSON.php b/src/JSON.php
index e901dca453..c92de56c6e 100644
--- a/src/JSON.php
+++ b/src/JSON.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 /**
diff --git a/src/Response.php b/src/Response.php
index d0b188b9b9..3a734b930a 100644
--- a/src/Response.php
+++ b/src/Response.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastica\Exception\NotFoundException;
diff --git a/src/ResponseConverter.php b/src/ResponseConverter.php
index f360bca582..62b75224cf 100644
--- a/src/ResponseConverter.php
+++ b/src/ResponseConverter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elastica;
 
 use Elastic\Elasticsearch\Response\Elasticsearch;
@@ -16,6 +18,6 @@ public static function toElastica(Elasticsearch|ResponseInterface $response): Re
             return new Response($response->asString(), $response->getStatusCode());
         }
 
-        return new Response($response->getBody(), $response->getStatusCode());
+        return new Response((string) $response->getBody(), $response->getStatusCode());
     }
 }
diff --git a/tests/Aggregation/DateRangeTest.php b/tests/Aggregation/DateRangeTest.php
index 6078f0639d..c81c16ba29 100644
--- a/tests/Aggregation/DateRangeTest.php
+++ b/tests/Aggregation/DateRangeTest.php
@@ -136,7 +136,7 @@ public function testDateRangeSetFormatAccordingToFormatTargetField(): void
             $this->_getIndexForTest()->search($query)->getAggregation('date');
             $this->fail('Should throw exception to and from parameters in date_range aggregation are interpreted according of the target field');
         } catch (ClientResponseException $e) {
-            $error = json_decode((string) $e->getResponse()->getBody(), true)['error'] ?? null;
+            $error = \json_decode((string) $e->getResponse()->getBody(), true)['error'] ?? null;
 
             $this->assertSame('search_phase_execution_exception', $error['type']);
             $this->assertStringStartsWith('failed to parse date field', $error['root_cause'][0]['reason']);
diff --git a/tests/Cluster/SettingsTest.php b/tests/Cluster/SettingsTest.php
index c61e6d7cfd..657f0a4c2e 100644
--- a/tests/Cluster/SettingsTest.php
+++ b/tests/Cluster/SettingsTest.php
@@ -40,7 +40,7 @@ public function testSetReadOnly(): void
             $index->addDocument($doc2);
             $this->fail('should throw read only exception');
         } catch (ClientResponseException $e) {
-            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
+            $error = \json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertSame('cluster_block_exception', $error['type']);
             $this->assertStringContainsString('cluster read-only', $error['reason']);
diff --git a/tests/Index/SettingsTest.php b/tests/Index/SettingsTest.php
index 820d9ebe21..192555d564 100644
--- a/tests/Index/SettingsTest.php
+++ b/tests/Index/SettingsTest.php
@@ -137,7 +137,7 @@ public function testDeleteAliasWithException(): void
             $indexAlias->delete();
             $this->fail('Should throw exception because you should delete the concrete index and not the alias');
         } catch (ClientResponseException $e) {
-            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
+            $error = \json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertSame('illegal_argument_exception', $error['type']);
             $this->assertStringContainsString('specify the corresponding concrete indices instead.', $error['reason']);
@@ -349,7 +349,7 @@ public function testSetReadOnly(): void
             $index->addDocument($doc2);
             $this->fail('Should throw exception because of read only');
         } catch (ClientResponseException $e) {
-            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
+            $error = \json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertSame('cluster_block_exception', $error['type']);
             $this->assertStringContainsString('read-only', $error['reason']);
@@ -450,7 +450,7 @@ public function testNotFoundIndex(): void
             $index->getSettings()->get();
             $this->fail('Should throw exception because of index not found');
         } catch (ClientResponseException $e) {
-            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
+            $error = \json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertSame('index_not_found_exception', $error['type']);
         }
diff --git a/tests/IndexTemplateTest.php b/tests/IndexTemplateTest.php
index bf51488122..c0f05516fe 100644
--- a/tests/IndexTemplateTest.php
+++ b/tests/IndexTemplateTest.php
@@ -7,7 +7,6 @@
 use Elastic\Elasticsearch\Exception\ClientResponseException;
 use Elastica\Exception\InvalidException;
 use Elastica\IndexTemplate;
-use Elastica\ResponseConverter;
 use Elastica\Test\Base as BaseTest;
 
 /**
@@ -79,7 +78,7 @@ public function testCreateAlreadyExistsTemplateException(): void
         try {
             $indexTemplate->create($template);
         } catch (ClientResponseException $e) {
-            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
+            $error = \json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertNotEquals('index_template_already_exists_exception', $error['type']);
             $this->assertEquals('resource_already_exists_exception', $error['type']);
diff --git a/tests/PipelineTest.php b/tests/PipelineTest.php
index bdde1cabba..3df74fa7bf 100644
--- a/tests/PipelineTest.php
+++ b/tests/PipelineTest.php
@@ -12,7 +12,6 @@
 use Elastica\Processor\RenameProcessor;
 use Elastica\Processor\SetProcessor;
 use Elastica\Processor\TrimProcessor;
-use Elastica\ResponseConverter;
 
 /**
  * @internal
@@ -135,7 +134,7 @@ public function testDeletePipeline(): void
             $pipeline->deletePipeline('non_existent_pipeline');
             $this->fail('an exception should be raised!');
         } catch (ClientResponseException $e) {
-            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
+            $error = \json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertEquals('resource_not_found_exception', $error['type']);
             $this->assertEquals('pipeline [non_existent_pipeline] is missing', $error['reason']);
diff --git a/tests/Query/QueryStringTest.php b/tests/Query/QueryStringTest.php
index 3774f38de2..e426b22ff3 100644
--- a/tests/Query/QueryStringTest.php
+++ b/tests/Query/QueryStringTest.php
@@ -7,7 +7,6 @@
 use Elastic\Elasticsearch\Exception\ClientResponseException;
 use Elastica\Document;
 use Elastica\Query\QueryString;
-use Elastica\ResponseConverter;
 use Elastica\Test\Base as BaseTest;
 
 /**
@@ -107,7 +106,7 @@ public function testSearchFieldsValidationException(): void
         try {
             $index->search($query);
         } catch (ClientResponseException $e) {
-            $error = json_decode((string) $e->getResponse()->getBody(), true)['error'] ?? null;
+            $error = \json_decode((string) $e->getResponse()->getBody(), true)['error'] ?? null;
 
             $this->assertSame('query_shard_exception', $error['root_cause'][0]['type']);
             $this->assertStringContainsString('failed to create query', $error['root_cause'][0]['reason']);
diff --git a/tests/SearchTest.php b/tests/SearchTest.php
index d7ef80fc20..84252bf63d 100644
--- a/tests/SearchTest.php
+++ b/tests/SearchTest.php
@@ -15,7 +15,6 @@
 use Elastica\Query\MatchAll;
 use Elastica\Query\QueryString;
 use Elastica\Request;
-use Elastica\ResponseConverter;
 use Elastica\ResultSet;
 use Elastica\Script\Script;
 use Elastica\Search;
@@ -688,7 +687,7 @@ public function testIgnoreUnavailableOption(): void
             $search->search($query);
             $this->fail('Should raise an Index not found exception');
         } catch (ClientResponseException $e) {
-            $error = json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
+            $error = \json_decode((string) $e->getResponse()->getBody(), true)['error']['root_cause'][0] ?? null;
 
             $this->assertEquals('index_not_found_exception', $error['type']);
             $this->assertEquals('no such index [elastica_7086b4c2ee585bbb6740ece5ed7ece01]', $error['reason']);