Merge branch '3.4' into 4.2

xabbuh · xabbuh · commit 348193609fa3 · 2019-02-15T19:54:27.000+01:00
* 3.4:
  fix tests by adapting Twig namespace changes
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php
@@ -50,7 +50,7 @@ protected function getVariableGetterWithoutStrictCheck($name)
     protected function getVariableGetterWithStrictCheck($name)
     {
         if (Environment::MAJOR_VERSION >= 2) {
-            return sprintf('(isset($context["%s"]) || array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new Twig_Error_Runtime(\'Variable "%1$s" does not exist.\', 0, $this->source); })())', $name);
+            return sprintf('(isset($context["%1$s"]) || array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new %2$s(\'Variable "%1$s" does not exist.\', 0, $this->source); })())', $name, Environment::VERSION_ID >= 20700 ? '\Twig\Error\RuntimeError' : 'Twig_Error_Runtime');
         }
 
         return sprintf('($context["%s"] ?? $this->getContext($context, "%1$s"))', $name);

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ protected function getVariableGetterWithoutStrictCheck($name)`
`50`	`50`	`protected function getVariableGetterWithStrictCheck($name)`
`51`	`51`	`{`
`52`	`52`	`if (Environment::MAJOR_VERSION >= 2) {`
`53`		`- return sprintf('(isset($context["%s"]) \|\| array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new Twig_Error_Runtime(\'Variable "%1$s" does not exist.\', 0, $this->source); })())', $name);`
	`53`	`+ return sprintf('(isset($context["%1$s"]) \|\| array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new %2$s(\'Variable "%1$s" does not exist.\', 0, $this->source); })())', $name, Environment::VERSION_ID >= 20700 ? '\Twig\Error\RuntimeError' : 'Twig_Error_Runtime');`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`return sprintf('($context["%s"] ?? $this->getContext($context, "%1$s"))', $name);`