Merge branch '2.0'

fabpot · fabpot · commit f8f31a2d59e6 · 2011-12-25T22:40:56.000+01:00
* 2.0:
  [Twig] made code compatible with Twig 1.5
diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php
@@ -89,15 +89,24 @@ protected function compileString(\Twig_NodeInterface $body, \Twig_Node_Expressio
             return array($body, $vars);
         }
 
-        $current = array();
-        foreach ($vars as $name => $var) {
-            $current[$name] = true;
-        }
-
         preg_match_all('/(?<!%)%([^%]+)%/', $msg, $matches);
-        foreach ($matches[1] as $var) {
-            if (!isset($current['%'.$var.'%'])) {
-                $vars->setNode('%'.$var.'%', new \Twig_Node_Expression_Name($var, $body->getLine()));
+
+        if (version_compare(\Twig_Environment::VERSION, '1.5', '>=')) {
+            foreach ($matches[1] as $var) {
+                $key = new \Twig_Node_Expression_Constant('%'.$var.'%', $body->getLine());
+                if (!$vars->hasElement($key)) {
+                    $vars->addElement(new \Twig_Node_Expression_Name($var, $body->getLine()), $key);
+                }
+            }
+        } else {
+            $current = array();
+            foreach ($vars as $name => $var) {
+                $current[$name] = true;
+            }
+            foreach ($matches[1] as $var) {
+                if (!isset($current['%'.$var.'%'])) {
+                    $vars->setNode('%'.$var.'%', new \Twig_Node_Expression_Name($var, $body->getLine()));
+                }
             }
         }
 
