Merge branch '2.4'

Author: dunglas

src/GraphQl/Serializer/ItemNormalizer.php

@@ -67,7 +67,7 @@ public function supportsNormalization($data, $format = null): bool
      */
     public function normalize($object, $format = null, array $context = [])
     {
-        if (null !== $outputClass = $this->getOutputClass($this->getObjectClass($object), $context)) {
+        if (null !== $this->getOutputClass($this->getObjectClass($object), $context)) {
             return parent::normalize($object, $format, $context);
         }
 

src/Hal/Serializer/ItemNormalizer.php

@@ -48,7 +48,7 @@ public function supportsNormalization($data, $format = null): bool
      */
     public function normalize($object, $format = null, array $context = [])
     {
-        if (null !== $outputClass = $this->getOutputClass($this->getObjectClass($object), $context)) {
+        if (null !== $this->getOutputClass($this->getObjectClass($object), $context)) {
             return parent::normalize($object, $format, $context);
         }
 

src/JsonApi/Serializer/ItemNormalizer.php

@@ -66,7 +66,7 @@ public function supportsNormalization($data, $format = null): bool
      */
     public function normalize($object, $format = null, array $context = [])
     {
-        if (null !== $outputClass = $this->getOutputClass($this->getObjectClass($object), $context)) {
+        if (null !== $this->getOutputClass($this->getObjectClass($object), $context)) {
             return parent::normalize($object, $format, $context);
         }
 

src/JsonLd/Serializer/ItemNormalizer.php

@@ -65,7 +65,7 @@ public function supportsNormalization($data, $format = null): bool
      */
     public function normalize($object, $format = null, array $context = [])
     {
-        if (null !== $outputClass = $this->getOutputClass($this->getObjectClass($object), $context)) {
+        if (null !== $this->getOutputClass($this->getObjectClass($object), $context)) {
             return parent::normalize($object, $format, $context);
         }
 

src/Security/ResourceAccessChecker.php

@@ -13,7 +13,6 @@
 
 namespace ApiPlatform\Core\Security;
 
-use ApiPlatform\Core\Util\ClassInfoTrait;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -29,8 +28,6 @@
  */
 final class ResourceAccessChecker implements ResourceAccessCheckerInterface
 {
-    use ClassInfoTrait;
-
     private $expressionLanguage;
     private $authenticationTrustResolver;
     private $roleHierarchy;

tests/Action/ExceptionActionTest.php

@@ -46,13 +46,12 @@ public function testActionWithCatchableException()
         $request = new Request();
         $request->setFormat('jsonproblem', 'application/problem+json');
 
-        $expected = new Response('', Response::HTTP_BAD_REQUEST, [
-            'Content-Type' => 'application/problem+json; charset=utf-8',
-            'X-Content-Type-Options' => 'nosniff',
-            'X-Frame-Options' => 'deny',
-        ]);
-
-        $this->assertEquals($expected, $exceptionAction($flattenException, $request));
+        $response = $exceptionAction($flattenException, $request);
+        $this->assertSame('', $response->getContent());
+        $this->assertSame(Response::HTTP_BAD_REQUEST, $response->getStatusCode());
+        $this->assertTrue($response->headers->contains('Content-Type', 'application/problem+json; charset=utf-8'));
+        $this->assertTrue($response->headers->contains('X-Content-Type-Options', 'nosniff'));
+        $this->assertTrue($response->headers->contains('X-Frame-Options', 'deny'));
     }
 
     public function testActionWithUncatchableException()