diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php index a68c101ab0..924f2b9298 100644 --- a/src/Symfony/Bridge/Twig/Node/TransNode.php +++ b/src/Symfony/Bridge/Twig/Node/TransNode.php @@ -95,22 +95,10 @@ class TransNode extends \Twig_Node preg_match_all('/(?=')) { - 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())); - } + 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); } } diff --git a/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php index 90afef1299..ffbec162d6 100644 --- a/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php @@ -16,15 +16,6 @@ use Symfony\Bridge\Twig\Node\FormThemeNode; class FormThemeTest extends TestCase { - protected function setUp() - { - parent::setUp(); - - if (version_compare(\Twig_Environment::VERSION, '1.5.0', '<')) { - $this->markTestSkipped('Requires Twig version to be at least 1.5.0.'); - } - } - public function testConstructor() { $form = new \Twig_Node_Expression_Name('form', 0); diff --git a/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php index c1f247caab..91c2f66b73 100644 --- a/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php @@ -16,15 +16,6 @@ use Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode; class SearchAndRenderBlockNodeTest extends TestCase { - protected function setUp() - { - parent::setUp(); - - if (version_compare(\Twig_Environment::VERSION, '1.5.0', '<')) { - $this->markTestSkipped('Requires Twig version to be at least 1.5.0.'); - } - } - public function testCompileWidget() { $arguments = new \Twig_Node(array( diff --git a/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php b/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php index 7f5065fdfa..1559df1cc3 100644 --- a/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php +++ b/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php @@ -17,15 +17,6 @@ use Symfony\Bridge\Twig\Node\FormThemeNode; class FormThemeTokenParserTest extends TestCase { - protected function setUp() - { - parent::setUp(); - - if (version_compare(\Twig_Environment::VERSION, '1.5.0', '<')) { - $this->markTestSkipped('Requires Twig version to be at least 1.5.0.'); - } - } - /** * @dataProvider getTestsForFormTheme */