add expression text to SyntaxError

k0pernikus · stof · commit dc55db2a9db5 · 2017-03-31T09:39:36.000+02:00
fixes #19445
diff --git a/src/Symfony/Component/ExpressionLanguage/Lexer.php b/src/Symfony/Component/ExpressionLanguage/Lexer.php
@@ -87,15 +87,16 @@ public function tokenize($expression)
                 $cursor += strlen($match[0]);
             } else {
                 // unlexable
-                throw new SyntaxError(sprintf('Unexpected character "%s"', $expression[$cursor]), $cursor);
+                $message = sprintf('Unexpected character "%s"', $expression[$cursor]);
+                throw new SyntaxError($message, $cursor, $expression);
             }
         }
 
         $tokens[] = new Token(Token::EOF_TYPE, null, $cursor + 1);
 
         if (!empty($brackets)) {
             list($expect, $cur) = array_pop($brackets);
-            throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur);
+            throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur, $expression);
         }
 
         return new TokenStream($tokens);
diff --git a/src/Symfony/Component/ExpressionLanguage/SyntaxError.php b/src/Symfony/Component/ExpressionLanguage/SyntaxError.php
@@ -13,8 +13,14 @@
 
 class SyntaxError extends \LogicException
 {
-    public function __construct($message, $cursor = 0)
+    public function __construct($message, $cursor = 0, $expression = '')
     {
-        parent::__construct(sprintf('%s around position %d.', $message, $cursor));
+        $message = sprintf('%s around position %d', $message, $cursor);
+        if ($expression) {
+            $message = sprintf('%s for expression "%s"', $message, $expression);
+        }
+        $message .= '.';
+
+        parent::__construct($message);
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
@@ -18,14 +18,43 @@
 
 class LexerTest extends TestCase
 {
+    /**
+     * @var Lexer
+     */
+    private $lexer;
+
+    protected function setUp()
+    {
+        $this->lexer = new Lexer();
+    }
+
     /**
      * @dataProvider getTokenizeData
      */
     public function testTokenize($tokens, $expression)
     {
         $tokens[] = new Token('end of expression', null, strlen($expression) + 1);
-        $lexer = new Lexer();
-        $this->assertEquals(new TokenStream($tokens), $lexer->tokenize($expression));
+        $this->assertEquals(new TokenStream($tokens), $this->lexer->tokenize($expression));
+    }
+
+    /**
+     * @expectedException Symfony\Component\ExpressionLanguage\SyntaxError
+     * @expectedExceptionMessage Unexpected character "'" around position 33 for expression "service(faulty.expression.example').dummyMethod()".
+     */
+    public function testTokenizeThrowsErrorWithMessage()
+    {
+        $expression = "service(faulty.expression.example').dummyMethod()";
+        $this->lexer->tokenize($expression);
+    }
+
+    /**
+     * @expectedException Symfony\Component\ExpressionLanguage\SyntaxError
+     * @expectedExceptionMessage Unclosed "(" around position 7 for expression "service(unclosed.expression.dummyMethod()".
+     */
+    public function testTokenizeThrowsErrorOnUnclosedBrace()
+    {
+        $expression = 'service(unclosed.expression.dummyMethod()';
+        $this->lexer->tokenize($expression);
     }
 
     public function getTokenizeData()

Original file line number	Diff line number	Diff line change
`@@ -87,15 +87,16 @@ public function tokenize($expression)`
`87`	`87`	`$cursor += strlen($match[0]);`
`88`	`88`	`} else {`
`89`	`89`	`// unlexable`
`90`		`- throw new SyntaxError(sprintf('Unexpected character "%s"', $expression[$cursor]), $cursor);`
	`90`	`+ $message = sprintf('Unexpected character "%s"', $expression[$cursor]);`
	`91`	`+ throw new SyntaxError($message, $cursor, $expression);`
`91`	`92`	`}`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`$tokens[] = new Token(Token::EOF_TYPE, null, $cursor + 1);`
`95`	`96`
`96`	`97`	`if (!empty($brackets)) {`
`97`	`98`	`list($expect, $cur) = array_pop($brackets);`
`98`		`- throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur);`
	`99`	`+ throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur, $expression);`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`return new TokenStream($tokens);`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,14 @@`
`13`	`13`
`14`	`14`	`class SyntaxError extends \LogicException`
`15`	`15`	`{`
`16`		`- public function __construct($message, $cursor = 0)`
	`16`	`+ public function __construct($message, $cursor = 0, $expression = '')`
`17`	`17`	`{`
`18`		`- parent::__construct(sprintf('%s around position %d.', $message, $cursor));`
	`18`	`+ $message = sprintf('%s around position %d', $message, $cursor);`
	`19`	`+ if ($expression) {`
	`20`	`+ $message = sprintf('%s for expression "%s"', $message, $expression);`
	`21`	`+ }`
	`22`	`+ $message .= '.';`
	`23`	`+`
	`24`	`+ parent::__construct($message);`
`19`	`25`	`}`
`20`	`26`	`}`