From f0f07eba3f2b1cfd2d06903261a79eaf9535f0a9 Mon Sep 17 00:00:00 2001
From: Philipp Kretzschmar <philipp.kretzschmar@dreamlines.de>
Date: Wed, 27 Jul 2016 18:41:51 +0200
Subject: [PATCH] add expression text to SyntaxError

fixes #19445
---
 .../Component/ExpressionLanguage/Lexer.php    |  5 +--
 .../ExpressionLanguage/SyntaxError.php        | 10 ++++--
 .../ExpressionLanguage/Tests/LexerTest.php    | 33 +++++++++++++++++--
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/ExpressionLanguage/Lexer.php b/src/Symfony/Component/ExpressionLanguage/Lexer.php
index 26bb51d42e35e..3d3aba25add1d 100644
--- a/src/Symfony/Component/ExpressionLanguage/Lexer.php
+++ b/src/Symfony/Component/ExpressionLanguage/Lexer.php
@@ -87,7 +87,8 @@ 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);
             }
         }
 
@@ -95,7 +96,7 @@ public function tokenize($expression)
 
         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
index d149c00768ad8..c30f6e62f778b 100644
--- 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
index 8af5c1c101757..07cd4a764c6a1 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
@@ -17,14 +17,43 @@
 
 class LexerTest extends \PHPUnit_Framework_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()