Merge branch '3.4' into 4.2

* 3.4:
  fix tests by adapting Twig namespace changes

Author: xabbuh

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);