minor #21030 [TwigBridge] fix Twig 2.x compatibility (xabbuh)

fabpot · fabpot · commit 7fa18ba1b917 · 2016-12-23T13:31:39.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [TwigBridge] fix Twig 2.x compatibility | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | twigphp/Twig#2302 | License | MIT | Doc PR | Commits ------- 08e5747 [TwigBridge] fix Twig 2.x compatibility
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php
@@ -53,7 +53,7 @@ protected function getVariableGetterWithoutStrictCheck($name)
     protected function getVariableGetterWithStrictCheck($name)
     {
         if (\Twig_Environment::MAJOR_VERSION >= 2) {
-            return sprintf('(isset($context["%s"]) || array_key_exists("%s", $context) ? $context["%s"] : $this->notFound("%s", 0))', $name, $name, $name, $name);
+            return sprintf('(isset($context["%s"]) || array_key_exists("%s", $context) ? $context["%s"] : (function () { throw new Twig_Error_Runtime(\'Variable "%s" does not exist.\', 0, $this->getSourceContext()); })())', $name, $name, $name, $name);
         }
 
         if (PHP_VERSION_ID >= 70000) {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected function getVariableGetterWithoutStrictCheck($name)`
`53`	`53`	`protected function getVariableGetterWithStrictCheck($name)`
`54`	`54`	`{`
`55`	`55`	`if (\Twig_Environment::MAJOR_VERSION >= 2) {`
`56`		`- return sprintf('(isset($context["%s"]) \|\| array_key_exists("%s", $context) ? $context["%s"] : $this->notFound("%s", 0))', $name, $name, $name, $name);`
	`56`	`+ return sprintf('(isset($context["%s"]) \|\| array_key_exists("%s", $context) ? $context["%s"] : (function () { throw new Twig_Error_Runtime(\'Variable "%s" does not exist.\', 0, $this->getSourceContext()); })())', $name, $name, $name, $name);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if (PHP_VERSION_ID >= 70000) {`