bug #37020 [ExpressionLanguage] reset the internal state when the parser is finished (xabbuh)

fabpot · fabpot · commit ab3772a94e7a · 2020-06-02T10:46:57.000+02:00
This PR was merged into the 5.1 branch. Discussion ---------- [ExpressionLanguage] reset the internal state when the parser is finished | Q | A | ------------- | --- | Branch? | 5.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- d58eb02 reset the internal state when the parser is finished
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -124,6 +124,9 @@ private function doParse(TokenStream $stream, ?array $names = []): Node\Node
             throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s".', $stream->current->type, $stream->current->value), $stream->current->cursor, $stream->getExpression());
         }
 
+        $this->stream = null;
+        $this->names = null;
+
         return $node;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,9 @@ private function doParse(TokenStream $stream, ?array $names = []): Node\Node`
`124`	`124`	`throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s".', $stream->current->type, $stream->current->value), $stream->current->cursor, $stream->getExpression());`
`125`	`125`	`}`
`126`	`126`
	`127`	`+ $this->stream = null;`
	`128`	`+ $this->names = null;`
	`129`	`+`
`127`	`130`	`return $node;`
`128`	`131`	`}`
`129`	`132`