Specify iterator types in Query namespace

lib/Doctrine/ODM/MongoDB/Aggregation/Expr.php

@@ -31,7 +31,7 @@ class Expr
     /** @var ClassMetadata */
     private $class;
 
-    /** @var array */
+    /** @var array<string, mixed> */
     private $expr = [];
 
     /**
@@ -537,6 +537,9 @@ public function floor($number): self
         return $this->operator('$floor', $number);
     }
 
+    /**
+     * @return array<string, mixed>
+     */
     public function getExpression(): array
     {
         return $this->expr;

lib/Doctrine/ODM/MongoDB/Aggregation/Stage.php

@@ -26,6 +26,8 @@ public function __construct(Builder $builder)
 
     /**
      * Assembles the aggregation stage
+     *
+     * @return array<string, mixed>
      */
     abstract public function getExpression(): array;
 

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/MatchStage.php

@@ -43,8 +43,8 @@ public function __clone()
      * @see Expr::addAnd()
      * @see https://docs.mongodb.com/manual/reference/operator/and/
      *
-     * @param array|Expr $expression
-     * @param array|Expr ...$expressions
+     * @param mixed[]|Expr $expression
+     * @param mixed[]|Expr ...$expressions
      *
      * @return static
      */
@@ -64,8 +64,8 @@ public function addAnd($expression, ...$expressions): self
      * @see Expr::addNor()
      * @see https://docs.mongodb.com/manual/reference/operator/nor/
      *
-     * @param array|Expr $expression
-     * @param array|Expr ...$expressions
+     * @param mixed[]|Expr $expression
+     * @param mixed[]|Expr ...$expressions
      *
      * @return static
      */
@@ -85,8 +85,8 @@ public function addNor($expression, ...$expressions): self
      * @see Expr::addOr()
      * @see https://docs.mongodb.com/manual/reference/operator/or/
      *
-     * @param array|Expr $expression
-     * @param array|Expr ...$expressions
+     * @param mixed[]|Expr $expression
+     * @param mixed[]|Expr ...$expressions
      *
      * @return static
      */
@@ -121,7 +121,7 @@ public function all(array $values): self
      * @see Expr::elemMatch()
      * @see https://docs.mongodb.com/manual/reference/operator/elemMatch/
      *
-     * @param array|Expr $expression
+     * @param mixed[]|Expr $expression
      *
      * @return static
      */
@@ -452,7 +452,7 @@ public function mod($divisor, $remainder = 0): self
      * @see Expr::not()
      * @see https://docs.mongodb.com/manual/reference/operator/not/
      *
-     * @param array|Expr $expression
+     * @param mixed[]|Expr $expression
      *
      * @return static
      */

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Operator.php

@@ -30,6 +30,9 @@ public function __construct(Builder $builder)
         $this->expr = $builder->expr();
     }
 
+    /**
+     * @param mixed[] $args
+     */
     public function __call(string $method, array $args): self
     {
         $this->expr->$method(...$args);
@@ -86,8 +89,8 @@ public function add($expression1, $expression2, ...$expressions): self
      * @see https://docs.mongodb.com/manual/reference/operator/aggregation/and/
      * @see Expr::addAnd
      *
-     * @param array|Expr $expression
-     * @param array|Expr ...$expressions
+     * @param mixed[]|Expr $expression
+     * @param mixed[]|Expr ...$expressions
      *
      * @return static
      */
@@ -104,8 +107,8 @@ public function addAnd($expression, ...$expressions): self
      * @see https://docs.mongodb.com/manual/reference/operator/aggregation/or/
      * @see Expr::addOr
      *
-     * @param array|Expr $expression
-     * @param array|Expr ...$expressions
+     * @param mixed[]|Expr $expression
+     * @param mixed[]|Expr ...$expressions
      *
      * @return static
      */
@@ -145,7 +148,7 @@ public function allElementsTrue($expression): self
      * @see https://docs.mongodb.com/manual/reference/operator/aggregation/anyElementTrue/
      * @see Expr::anyElementTrue
      *
-     * @param array|Expr $expression
+     * @param mixed[]|Expr $expression
      *
      * @return static
      */

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Project.php

@@ -40,6 +40,8 @@ public function avg($expression1, ...$expressions): self
 
     /**
      * Shorthand method to define which fields to be included.
+     *
+     * @param string[] $fields
      */
     public function includeFields(array $fields): self
     {
@@ -55,6 +57,8 @@ public function includeFields(array $fields): self
      *
      * If you specify the exclusion of a field other than _id, you cannot employ
      * any other $project specification forms.
+     *
+     * @param string[] $fields
      */
     public function excludeFields(array $fields): self
     {

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceRoot.php

@@ -24,11 +24,11 @@ class ReplaceRoot extends Operator
     /** @var ClassMetadata */
     private $class;
 
-    /** @var string|array|Expr|null */
+    /** @var string|mixed[]|Expr|null */
     private $expression;
 
     /**
-     * @param string|array|Expr|null $expression
+     * @param string|mixed[]|Expr|null $expression
      */
     public function __construct(Builder $builder, DocumentManager $documentManager, ClassMetadata $class, $expression = null)
     {
@@ -51,9 +51,9 @@ public function getExpression(): array
     }
 
     /**
-     * @param array|string|mixed $expression
+     * @param mixed[]|string|mixed $expression
      *
-     * @return array|string|mixed
+     * @return mixed[]|string|mixed
      */
     private function convertExpression($expression)
     {

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Sort.php

@@ -17,12 +17,12 @@
  */
 class Sort extends Stage
 {
-    /** @var array */
+    /** @var array<string, -1|1|array{"$meta": string}> */
     private $sort = [];
 
     /**
-     * @param array|string $fieldName Field name or array of field/order pairs
-     * @param int|string   $order     Field order (if one field is specified)
+     * @param array<string, int|string>|string $fieldName Field name or array of field/order pairs
+     * @param int|string                       $order     Field order (if one field is specified)
      */
     public function __construct(Builder $builder, $fieldName, $order = null)
     {