Merge branch '2.8' into 3.3

* 2.8:
  [HttpFoundation] Fix FileBag issue with associative arrays
  fix the phpdoc that is not really inherited from response
  Minor docblock cleanup
  Remove redundant sprintf arguments.

Author: nicolas-grekas

Extension/CodeExtension.php

@@ -70,9 +70,9 @@ public function abbrMethod($method)
             list($class, $method) = explode('::', $method, 2);
             $result = sprintf('%s::%s()', $this->abbrClass($class), $method);
         } elseif ('Closure' === $method) {
-            $result = sprintf('<abbr title="%s">%s</abbr>', $method, $method);
+            $result = sprintf('<abbr title="%s">%1$s</abbr>', $method);
         } else {
-            $result = sprintf('<abbr title="%s">%s</abbr>()', $method, $method);
+            $result = sprintf('<abbr title="%s">%1$s</abbr>()', $method);
         }
 
         return $result;

Tests/Node/FormThemeTest.php

@@ -74,9 +74,9 @@ public function testCompile()
     protected function getVariableGetter($name)
     {
         if (\PHP_VERSION_ID >= 70000) {
-            return sprintf('($context["%s"] ?? null)', $name, $name);
+            return sprintf('($context["%s"] ?? null)', $name);
         }
 
-        return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
+        return sprintf('(isset($context["%s"]) ? $context["%1$s"] : null)', $name);
     }
 }

Tests/Node/SearchAndRenderBlockNodeTest.php

@@ -272,9 +272,9 @@ public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()
     protected function getVariableGetter($name)
     {
         if (\PHP_VERSION_ID >= 70000) {
-            return sprintf('($context["%s"] ?? null)', $name, $name);
+            return sprintf('($context["%s"] ?? null)', $name);
         }
 
-        return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
+        return sprintf('(isset($context["%s"]) ? $context["%1$s"] : null)', $name);
     }
 }

Tests/Node/TransNodeTest.php

@@ -45,22 +45,22 @@ public function testCompileStrict()
     protected function getVariableGetterWithoutStrictCheck($name)
     {
         if (\PHP_VERSION_ID >= 70000) {
-            return sprintf('($context["%s"] ?? null)', $name, $name);
+            return sprintf('($context["%s"] ?? null)', $name);
         }
 
-        return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
+        return sprintf('(isset($context["%s"]) ? $context["%1$s"] : null)', $name);
     }
 
     protected function getVariableGetterWithStrictCheck($name)
     {
         if (Environment::MAJOR_VERSION >= 2) {
-            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);
+            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->getSourceContext()); })())', $name);
         }
 
         if (\PHP_VERSION_ID >= 70000) {
-            return sprintf('($context["%s"] ?? $this->getContext($context, "%s"))', $name, $name, $name);
+            return sprintf('($context["%s"] ?? $this->getContext($context, "%1$s"))', $name);
         }
 
-        return sprintf('(isset($context["%s"]) ? $context["%s"] : $this->getContext($context, "%s"))', $name, $name, $name);
+        return sprintf('(isset($context["%s"]) ? $context["%1$s"] : $this->getContext($context, "%1$s"))', $name);
     }
 }