Merge branch '2.3'

* 2.3:
  [Form] fixes empty file-inputs get treated as extra field
  return 0 if there is no valid data
  [DependencyInjection] fixed regression where setting a service to null did not trigger a re-creation of the service when getting it
  [DependencyInjection] fixed #8570
  fixed file permission
  The ignoreAttributes itself should be ignored, too.
  [Tests] Tests on php 5.5 should pass
  [Twig] fixed TwigEngine::exists() method when a template contains a syntax error (closes #88546)

Author: fabpot

Controller/RedirectController.php

@@ -49,7 +49,7 @@ public function redirectAction(Request $request, $route, $permanent = false, $ig
         $attributes = array();
         if (false === $ignoreAttributes || is_array($ignoreAttributes)) {
             $attributes = $request->attributes->get('_route_params');
-            unset($attributes['route'], $attributes['permanent']);
+            unset($attributes['route'], $attributes['permanent'], $attributes['ignoreAttributes']);
             if ($ignoreAttributes) {
                 $attributes = array_diff_key($attributes, array_flip($ignoreAttributes));
             }

Tests/Controller/RedirectControllerTest.php

@@ -53,6 +53,7 @@ public function testRoute($permanent, $ignoreAttributes, $expectedCode, $expecte
                 'route' => $route,
                 'permanent' => $permanent,
                 'additional-parameter' => 'value',
+                'ignoreAttributes' => $ignoreAttributes
             ),
         );