Merge branch '6.4' into 7.0

* 6.4:
  [HttpKernel] Fix ArgumentResolverTest

Author: xabbuh

src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php

@@ -308,7 +308,7 @@ public function testTargetedResolverWithRequestAttributeValue()
 
         $request = Request::create('/');
         $request->attributes->set('foo', $object = new Post('Random '.time()));
-        $controller = $this->controllerTargetingResolverWithTestEntity(...);
+        $controller = (new ArgumentResolverTestController())->controllerTargetingResolverWithTestEntity(...);
 
         $this->assertSame([$object], $resolver->getArguments($request, $controller));
     }