Selaa lähdekoodia

simplified exceptions as Twig is now smart enough to automatically add line information

Fabien Potencier 14 vuotta sitten
vanhempi
commit
cad6643e77

+ 1 - 1
src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php

@@ -64,7 +64,7 @@ class TransChoiceTokenParser extends TransTokenParser
         }
 
         if (!$body instanceof \Twig_Node_Text && !$body instanceof \Twig_Node_Expression) {
-            throw new \Twig_Error_Syntax(sprintf('A message must be a simple text (line %s)', $lineno), -1);
+            throw new \Twig_Error_Syntax('A message must be a simple text.');
         }
 
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);

+ 2 - 2
src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php

@@ -53,7 +53,7 @@ class TransTokenParser extends \Twig_TokenParser
                 $stream->next();
                 $domain = $this->parser->getExpressionParser()->parseExpression();
             } elseif (!$stream->test(\Twig_Token::BLOCK_END_TYPE)) {
-                throw new \Twig_Error_Syntax(sprintf('Unexpected token. Twig was looking for the "from" keyword line %s)', $lineno), -1);
+                throw new \Twig_Error_Syntax('Unexpected token. Twig was looking for the "with" or "from" keyword.');
             }
         }
 
@@ -64,7 +64,7 @@ class TransTokenParser extends \Twig_TokenParser
         }
 
         if (!$body instanceof \Twig_Node_Text && !$body instanceof \Twig_Node_Expression) {
-            throw new \Twig_Error_Syntax('A message must be a simple text', -1);
+            throw new \Twig_Error_Syntax('A message must be a simple text');
         }
 
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);