Skip to content

Commit 58c2b1f

Browse files
authored
Fix criteria mapping type (#2610)
* Fix criteria mapping type * Ignore psalm issues These new issues have been reported in vimeo/psalm#10578
1 parent a51bfc0 commit 58c2b1f

File tree

4 files changed

+105
-99
lines changed

4 files changed

+105
-99
lines changed

lib/Doctrine/ODM/MongoDB/Mapping/Annotations/ReferenceMany.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ final class ReferenceMany extends AbstractField
5151
/** @var array<string, string|int> */
5252
public $sort;
5353

54-
/** @var array<string, string> */
54+
/** @var array<string, mixed> */
5555
public $criteria;
5656

5757
/** @var int|null */
@@ -73,7 +73,7 @@ final class ReferenceMany extends AbstractField
7373
* @param array<string, class-string>|null $discriminatorMap
7474
* @param string[]|string|null $cascade
7575
* @param array<string, string|int> $sort
76-
* @param array<string, string> $criteria
76+
* @param array<string, mixed> $criteria
7777
* @param string[] $prime
7878
*/
7979
public function __construct(

lib/Doctrine/ODM/MongoDB/Mapping/Annotations/ReferenceOne.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ final class ReferenceOne extends AbstractField
5050
/** @var array<string, string|int> */
5151
public $sort;
5252

53-
/** @var array<string, string> */
53+
/** @var array<string, mixed> */
5454
public $criteria;
5555

5656
/** @var int|null */
@@ -64,7 +64,7 @@ final class ReferenceOne extends AbstractField
6464
* @param array<string, class-string>|null $discriminatorMap
6565
* @param string[]|string|null $cascade
6666
* @param array<string, string|int> $sort
67-
* @param array<string, string> $criteria
67+
* @param array<string, mixed> $criteria
6868
*/
6969
public function __construct(
7070
?string $name = null,

lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
* unique?: bool,
101101
* index?: bool,
102102
* index-name?: string,
103-
* criteria?: array<string, string>,
103+
* criteria?: array<string, mixed>,
104104
* alsoLoadFields?: list<string>,
105105
* order?: int|string,
106106
* background?: bool,
@@ -147,7 +147,7 @@
147147
* sparse?: bool,
148148
* unique?: bool,
149149
* index?: bool,
150-
* criteria?: array<string, string>,
150+
* criteria?: array<string, mixed>,
151151
* alsoLoadFields?: list<string>,
152152
* enumType?: class-string<BackedEnum>,
153153
* storeEmptyArray?: bool,
@@ -193,7 +193,7 @@
193193
* sparse?: bool,
194194
* unique?: bool,
195195
* index?: bool,
196-
* criteria?: array<string, string>,
196+
* criteria?: array<string, mixed>,
197197
* alsoLoadFields?: list<string>,
198198
* storeEmptyArray?: bool,
199199
* }

0 commit comments

Comments
 (0)