Made necessary adjustments to make codebase compatible with PHP 8.2. This involved switching to covariant templates for Models on Collection.php, ExecutesQueries.php and Query.php. Removed unnecessary lines in Query.php to improve readability. Also fixed some minor alignment issues in Query.php to maintain consistency. Changes will enhance static type handling and readability.

Author: Radiergummi

src/Collection.php

@@ -16,10 +16,10 @@
 /**
  * Collection
  *
- * @template       T of Model
+ * @template-covariant T of Model
  * @extends BaseCollection<array-key, T>
  * @psalm-suppress TooManyTemplateParams
- * @package        Matchory\Elasticsearch
+ * @package Matchory\Elasticsearch
  */
 class Collection extends BaseCollection
 {

src/Concerns/ExecutesQueries.php

@@ -29,7 +29,7 @@
 use const PHP_SAPI;
 
 /**
- * @template T of Model
+ * @template-covariant T of Model
  */
 trait ExecutesQueries
 {

src/Query.php

@@ -20,21 +20,19 @@
 use Matchory\Elasticsearch\Concerns\ExplainsQueries;
 use Matchory\Elasticsearch\Concerns\ManagesIndices;
 use Matchory\Elasticsearch\Interfaces\ConnectionInterface;
-
 use function count;
 use function json_encode;
-
 use const JSON_THROW_ON_ERROR;
 
 /**
  * Query
  * =====
  * Query builder instance for Elasticsearch queries
  *
- * @package  Matchory\Elasticsearch\Query
- * @template T of Model
- * @todo     Rename to "Builder" for coherency with Eloquent. To avoid breaking
- *          changes, an alias should be registered for Query
+ * @package Matchory\Elasticsearch\Query
+ * @template-covariant T of Model
+ * @todo Rename to "Builder" for coherency with Eloquent. To avoid breaking
+ *       changes, an alias should be registered for Query
  */
 class Query implements Arrayable, JsonSerializable, Jsonable, IteratorAggregate
 {
@@ -185,12 +183,13 @@ class Query implements Arrayable, JsonSerializable, Jsonable, IteratorAggregate
      *
      * @param ConnectionInterface $connection Elasticsearch Connection the query
      *                                        builder uses.
-     * @param T|null              $model      Model instance the query builder
+     * @param T|null $model Model instance the query builder
      */
     public function __construct(
         ConnectionInterface $connection,
-        Model|null $model = null
-    ) {
+        Model|null          $model = null
+    )
+    {
         $this->connection = $connection;
 
         /**
@@ -249,7 +248,7 @@ public function getModel(): Model
      *
      * @template TModel of Model
      *
-     * @param Model        $model Model to use for the current query.
+     * @param Model $model Model to use for the current query.
      *
      * @psalm-param TModel $model
      *
@@ -264,8 +263,8 @@ public function setModel(Model $model): self
      * Forwards calls to the model instance. If the called method is a scope,
      * it will be applied to the query.
      *
-     * @param string $method     Name of the called method.
-     * @param array  $parameters Parameters passed to the method.
+     * @param string $method Name of the called method.
+     * @param array $parameters Parameters passed to the method.
      *
      * @return $this Query builder instance.
      * @throws BadMethodCallException