Fix criteria mapping type (#2610)

* Fix criteria mapping type * Ignore psalm issues These new issues have been reported in vimeo/psalm#10578
doctrine · Feb 28, 2024 · 58c2b1f · 58c2b1f
1 parent a51bfc0
commit 58c2b1f
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 99 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/ReferenceMany.php b/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/ReferenceMany.php
@@ -51,7 +51,7 @@ final class ReferenceMany extends AbstractField
     /** @var array<string, string|int> */
     public $sort;
 
-    /** @var array<string, string> */
+    /** @var array<string, mixed> */
     public $criteria;
 
     /** @var int|null */
@@ -73,7 +73,7 @@ final class ReferenceMany extends AbstractField
      * @param array<string, class-string>|null $discriminatorMap
      * @param string[]|string|null             $cascade
      * @param array<string, string|int>        $sort
-     * @param array<string, string>            $criteria
+     * @param array<string, mixed>             $criteria
      * @param string[]                         $prime
      */
     public function __construct(

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/ReferenceOne.php b/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/ReferenceOne.php
@@ -50,7 +50,7 @@ final class ReferenceOne extends AbstractField
     /** @var array<string, string|int> */
     public $sort;
 
-    /** @var array<string, string> */
+    /** @var array<string, mixed> */
     public $criteria;
 
     /** @var int|null */
@@ -64,7 +64,7 @@ final class ReferenceOne extends AbstractField
      * @param array<string, class-string>|null $discriminatorMap
      * @param string[]|string|null             $cascade
      * @param array<string, string|int>        $sort
-     * @param array<string, string>            $criteria
+     * @param array<string, mixed>             $criteria
      */
     public function __construct(
         ?string $name = null,

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
@@ -100,7 +100,7 @@
  *      unique?: bool,
  *      index?: bool,
  *      index-name?: string,
- *      criteria?: array<string, string>,
+ *      criteria?: array<string, mixed>,
  *      alsoLoadFields?: list<string>,
  *      order?: int|string,
  *      background?: bool,
@@ -147,7 +147,7 @@
  *      sparse?: bool,
  *      unique?: bool,
  *      index?: bool,
- *      criteria?: array<string, string>,
+ *      criteria?: array<string, mixed>,
  *      alsoLoadFields?: list<string>,
  *      enumType?: class-string<BackedEnum>,
  *      storeEmptyArray?: bool,
@@ -193,7 +193,7 @@
  *      sparse?: bool,
  *      unique?: bool,
  *      index?: bool,
- *      criteria?: array<string, string>,
+ *      criteria?: array<string, mixed>,
  *      alsoLoadFields?: list<string>,
  *      storeEmptyArray?: bool,
  * }