Changes requested in code review

Add NamedScalarExpression to dql reference definition Revert breaking change in parser
doctrine · Dec 13, 2023 · 8d64606 · 8d64606
1 parent 60035a0
commit 8d64606
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/docs/en/reference/dql-doctrine-query-language.rst b/docs/en/reference/dql-doctrine-query-language.rst
@@ -1693,7 +1693,7 @@ Select Expressions
     PartialObjectExpression ::= "PARTIAL" IdentificationVariable "." PartialFieldSet
     PartialFieldSet         ::= "{" SimpleStateField {"," SimpleStateField}* "}"
     NewObjectExpression     ::= "NEW" AbstractSchemaName "(" NewObjectArg {"," NewObjectArg}* ")"
-    NewObjectArg            ::= ScalarExpression | "(" Subselect ")"
+    NewObjectArg            ::= ScalarExpression | NamedScalarExpression | "(" Subselect ")"
 
 Conditional Expressions
 ~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
@@ -1948,10 +1948,14 @@ public function NewObjectExpression()
     /**
      * NewObjectArg ::= ScalarExpression | NamedScalarExpression | "(" Subselect ")"
      *
+     * @param bool $namedArgAlreadyParsed
+     *
      * @return mixed
      */
-    public function NewObjectArg(bool $namedArgAlreadyParsed = false)
+    public function NewObjectArg(/* bool $namedArgAlreadyParsed = false */)
     {
+        $namedArgAlreadyParsed = func_get_args()[0] ?? false;
+
         assert($this->lexer->lookahead !== null);
         $token = $this->lexer->lookahead;
         $peek  = $this->lexer->glimpse();