Merge pull request #9603 from greg0ire/int-mask-of

doctrine · Mar 22, 2022 · 0f1c9ec · 0f1c9ec
2 parents 0f04a82 + 80f65d6
commit 0f1c9ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/Doctrine/ORM/Query/AST/PathExpression.php b/lib/Doctrine/ORM/Query/AST/PathExpression.php
@@ -25,7 +25,10 @@ class PathExpression extends Node
      */
     public $type;
 
-    /** @var int */
+    /**
+     * @var int
+     * @psalm-var int-mask-of<self::TYPE_*>
+     */
     public $expectedType;
 
     /** @var string */
@@ -38,6 +41,7 @@ class PathExpression extends Node
      * @param int         $expectedType
      * @param string      $identificationVariable
      * @param string|null $field
+     * @psalm-param int-mask-of<self::TYPE_*> $expectedType
      */
     public function __construct($expectedType, $identificationVariable, $field = null)
     {

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
@@ -1137,6 +1137,7 @@ public function JoinAssociationPathExpression()
      * PathExpression ::= IdentificationVariable {"." identifier}*
      *
      * @param int $expectedTypes
+     * @psalm-param int-mask-of<PathExpression::TYPE_*> $expectedTypes
      *
      * @return PathExpression
      */