From 1189abad90fa8081e6e77ced87ced900a90a4afb Mon Sep 17 00:00:00 2001
From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:21:35 +0100
Subject: [PATCH 1/4] Update AbstractCriterionQuery.php

---
 .../Values/Query/AbstractCriterionQuery.php     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/contracts/Values/Query/AbstractCriterionQuery.php b/src/contracts/Values/Query/AbstractCriterionQuery.php
index 34c24dc..fef3de2 100644
--- a/src/contracts/Values/Query/AbstractCriterionQuery.php
+++ b/src/contracts/Values/Query/AbstractCriterionQuery.php
@@ -18,10 +18,10 @@ abstract class AbstractCriterionQuery
 {
     public const DEFAULT_LIMIT = 25;
 
-    /** @var TCriterion|null */
+    /** @phpstan-var TCriterion|null */
     private ?CriterionInterface $query;
 
-    /** @var TSortClause[] */
+    /** @phpstan-var TSortClause[] */
     private array $sortClauses;
 
     private ?int $limit;
@@ -29,8 +29,9 @@ abstract class AbstractCriterionQuery
     private int $offset;
 
     /**
-     * @param TSortClause[]|null $sortClauses
-     * @param TCriterion|null $query
+     * @param array<int, AbstractSortClause>|null $sortClauses
+     * @phpstan-param TSortClause[]|null $sortClauses
+     * @phpstan-param TCriterion|null $query
      */
     public function __construct(
         ?CriterionInterface $query = null,
@@ -45,7 +46,7 @@ public function __construct(
     }
 
     /**
-     * @param TCriterion|null $criterion
+     * @phpstan-param TCriterion|null $criterion
      */
     final public function setQuery(?CriterionInterface $criterion): void
     {
@@ -53,7 +54,7 @@ final public function setQuery(?CriterionInterface $criterion): void
     }
 
     /**
-     * @return TCriterion|null
+     * @phpstan-return TCriterion|null
      */
     final public function getQuery(): ?CriterionInterface
     {
@@ -86,7 +87,8 @@ final public function setLimit(?int $limit): void
     }
 
     /**
-     * @return TSortClause[]
+     * @return array<int, AbstractSortClause>
+     * @phpstan-return TSortClause[]
      */
     final public function getSortClauses(): array
     {
@@ -102,6 +104,7 @@ final public function addSortClause(AbstractSortClause $sortClause): void
     }
 
     /**
+     * @param array<int, AbstractSortClause>
      * @phpstan-param TSortClause[] $sortClauses
      */
     final public function setSortClauses(array $sortClauses): void

From 0bb6631eb2d84ff2530301d881feadb1435b1a2d Mon Sep 17 00:00:00 2001
From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:30:19 +0100
Subject: [PATCH 2/4] Update AbstractCriterionQuery.php

---
 src/contracts/Values/Query/AbstractCriterionQuery.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/contracts/Values/Query/AbstractCriterionQuery.php b/src/contracts/Values/Query/AbstractCriterionQuery.php
index fef3de2..2bb196d 100644
--- a/src/contracts/Values/Query/AbstractCriterionQuery.php
+++ b/src/contracts/Values/Query/AbstractCriterionQuery.php
@@ -21,7 +21,10 @@ abstract class AbstractCriterionQuery
     /** @phpstan-var TCriterion|null */
     private ?CriterionInterface $query;
 
-    /** @phpstan-var TSortClause[] */
+    /**
+     * @var array<int, AbstractSortClause>
+     * @phpstan-var TSortClause[]
+     */
     private array $sortClauses;
 
     private ?int $limit;

From 9fabd0206a3b0b3344dc0c3285602f5ce60a4006 Mon Sep 17 00:00:00 2001
From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:31:57 +0100
Subject: [PATCH 3/4] Update AbstractCriterionQuery.php

---
 src/contracts/Values/Query/AbstractCriterionQuery.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/contracts/Values/Query/AbstractCriterionQuery.php b/src/contracts/Values/Query/AbstractCriterionQuery.php
index 2bb196d..2949355 100644
--- a/src/contracts/Values/Query/AbstractCriterionQuery.php
+++ b/src/contracts/Values/Query/AbstractCriterionQuery.php
@@ -107,7 +107,7 @@ final public function addSortClause(AbstractSortClause $sortClause): void
     }
 
     /**
-     * @param array<int, AbstractSortClause>
+     * @param array<int, AbstractSortClause> $sortClauses
      * @phpstan-param TSortClause[] $sortClauses
      */
     final public function setSortClauses(array $sortClauses): void

From ebce3971d62aac1de903a874a6ad58a5c826a04d Mon Sep 17 00:00:00 2001
From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:59:20 +0100
Subject: [PATCH 4/4] AbstractCriterionQuery.php: Fix code style

---
 src/contracts/Values/Query/AbstractCriterionQuery.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/contracts/Values/Query/AbstractCriterionQuery.php b/src/contracts/Values/Query/AbstractCriterionQuery.php
index 2949355..7e338a7 100644
--- a/src/contracts/Values/Query/AbstractCriterionQuery.php
+++ b/src/contracts/Values/Query/AbstractCriterionQuery.php
@@ -23,6 +23,7 @@ abstract class AbstractCriterionQuery
 
     /**
      * @var array<int, AbstractSortClause>
+     *
      * @phpstan-var TSortClause[]
      */
     private array $sortClauses;
@@ -33,6 +34,7 @@ abstract class AbstractCriterionQuery
 
     /**
      * @param array<int, AbstractSortClause>|null $sortClauses
+     *
      * @phpstan-param TSortClause[]|null $sortClauses
      * @phpstan-param TCriterion|null $query
      */
@@ -91,6 +93,7 @@ final public function setLimit(?int $limit): void
 
     /**
      * @return array<int, AbstractSortClause>
+     *
      * @phpstan-return TSortClause[]
      */
     final public function getSortClauses(): array
@@ -108,6 +111,7 @@ final public function addSortClause(AbstractSortClause $sortClause): void
 
     /**
      * @param array<int, AbstractSortClause> $sortClauses
+     *
      * @phpstan-param TSortClause[] $sortClauses
      */
     final public function setSortClauses(array $sortClauses): void