Skip to content

Commit

Permalink
Merge pull request #2613 from doctrine/2.6.x-merge-up-into-2.7.x_sHVn…
Browse files Browse the repository at this point in the history
…zF8x

Merge release 2.6.3 into 2.7.x
  • Loading branch information
alcaeus authored Mar 6, 2024
2 parents db27168 + 4679642 commit ac2f60b
Show file tree
Hide file tree
Showing 4 changed files with 100 additions and 100 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/ODM/MongoDB/Mapping/Annotations/ReferenceOne.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -193,7 +193,7 @@
* sparse?: bool,
* unique?: bool,
* index?: bool,
* criteria?: array<string, string>,
* criteria?: array<string, mixed>,
* alsoLoadFields?: list<string>,
* storeEmptyArray?: bool,
* }
Expand Down
Loading

0 comments on commit ac2f60b

Please sign in to comment.