symfony · fabpot · Dec 7, 2017 · Dec 5, 2017
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -84,6 +84,15 @@ public function testShortCircuitOperatorsCompile($expression, array $names, $exp
        $this->assertSame($expected, $result);
    }

+    /**
+     * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
+     * @expectedExceptionMessage Unexpected end of expression around position 6 for expression `node.`.
+     */
+    public function testParseThrowsInsteadOfNotice()
+    {
+        (new ExpressionLanguage())->parse('node.', array('node'));
+    }
+
    public function shortCircuitProviderEvaluate()
    {
        $object = $this->getMockBuilder('stdClass')->setMethods(array('foo'))->getMock();

diff --git a/src/Symfony/Component/ExpressionLanguage/TokenStream.php b/src/Symfony/Component/ExpressionLanguage/TokenStream.php
@@ -50,12 +50,12 @@ public function __toString()
     */
    public function next()
    {
+        ++$this->position;
+
        if (!isset($this->tokens[$this->position])) {
            throw new SyntaxError('Unexpected end of expression', $this->current->cursor, $this->expression);
        }

-        ++$this->position;
-
        $this->current = $this->tokens[$this->position];
    }