Skip to content

Commit 8d64606

Browse files
committed
Changes requested in code review
Add NamedScalarExpression to dql reference definition Revert breaking change in parser
1 parent 60035a0 commit 8d64606

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

docs/en/reference/dql-doctrine-query-language.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1693,7 +1693,7 @@ Select Expressions
16931693
PartialObjectExpression ::= "PARTIAL" IdentificationVariable "." PartialFieldSet
16941694
PartialFieldSet ::= "{" SimpleStateField {"," SimpleStateField}* "}"
16951695
NewObjectExpression ::= "NEW" AbstractSchemaName "(" NewObjectArg {"," NewObjectArg}* ")"
1696-
NewObjectArg ::= ScalarExpression | "(" Subselect ")"
1696+
NewObjectArg ::= ScalarExpression | NamedScalarExpression | "(" Subselect ")"
16971697
16981698
Conditional Expressions
16991699
~~~~~~~~~~~~~~~~~~~~~~~

lib/Doctrine/ORM/Query/Parser.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1948,10 +1948,14 @@ public function NewObjectExpression()
19481948
/**
19491949
* NewObjectArg ::= ScalarExpression | NamedScalarExpression | "(" Subselect ")"
19501950
*
1951+
* @param bool $namedArgAlreadyParsed
1952+
*
19511953
* @return mixed
19521954
*/
1953-
public function NewObjectArg(bool $namedArgAlreadyParsed = false)
1955+
public function NewObjectArg(/* bool $namedArgAlreadyParsed = false */)
19541956
{
1957+
$namedArgAlreadyParsed = func_get_args()[0] ?? false;
1958+
19551959
assert($this->lexer->lookahead !== null);
19561960
$token = $this->lexer->lookahead;
19571961
$peek = $this->lexer->glimpse();

0 commit comments

Comments
 (0)