Fix review

Author: vincentchalamon

src/Swagger/Serializer/ApiGatewayNormalizer.php

@@ -14,7 +14,6 @@
 namespace ApiPlatform\Core\Swagger\Serializer;
 
 use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
-use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
@@ -26,7 +25,7 @@
  *
  * @author Vincent Chalamon <[email protected]>
  */
-final class ApiGatewayNormalizer implements ContextAwareNormalizerInterface, CacheableSupportsMethodInterface
+final class ApiGatewayNormalizer implements NormalizerInterface, CacheableSupportsMethodInterface
 {
     const API_GATEWAY = 'api_gateway';
 
@@ -44,8 +43,10 @@ public function __construct(NormalizerInterface $documentationNormalizer, $defau
      */
     public function normalize($object, $format = null, array $context = [])
     {
-        unset($context[self::API_GATEWAY]);
         $data = $this->documentationNormalizer->normalize($object, $format, $context);
+        if (!($context[self::API_GATEWAY] ?? $this->defaultContext[self::API_GATEWAY])) {
+            return $data;
+        }
 
         if (empty($data['basePath'])) {
             $data['basePath'] = '/';
@@ -108,9 +109,9 @@ public function normalize($object, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null, array $context = [])
+    public function supportsNormalization($data, $format = null)
     {
-        return $this->documentationNormalizer->supportsNormalization($data, $format) && ($context[self::API_GATEWAY] ?? ($this->defaultContext[self::API_GATEWAY] ?? false));
+        return $this->documentationNormalizer->supportsNormalization($data, $format);
     }
 
     /**

tests/Swagger/Serializer/ApiGatewayNormalizerTest.php

@@ -51,20 +51,21 @@ protected function setUp()
     public function testSupportsNormalization()
     {
         $this->documentationNormalizerMock->supportsNormalization('foo', 'bar')->willReturn(true)->shouldBeCalledTimes(1);
-        $this->assertTrue($this->normalizer->supportsNormalization('foo', 'bar', ['api_gateway' => true]));
+        $this->assertTrue($this->normalizer->supportsNormalization('foo', 'bar'));
         $this->assertTrue($this->normalizer->hasCacheableSupportsMethod());
     }
 
-    public function testItDoesNotSupportNormalizationWithoutApiGatewayContext()
+    public function testNormalizeWithoutApiGateway()
     {
-        $this->documentationNormalizerMock->supportsNormalization('foo', 'bar')->willReturn(true)->shouldBeCalledTimes(2);
-        $this->assertFalse($this->normalizer->supportsNormalization('foo', 'bar', ['api_gateway' => false]));
-        $this->assertFalse($this->normalizer->supportsNormalization('foo', 'bar'));
+        $this->documentationNormalizerMock->normalize($this->objectMock, 'jsonld', [])
+            ->willReturn(['basePath' => '/api'])
+            ->shouldBeCalledTimes(1);
+        $this->assertEquals(['basePath' => '/api'], $this->normalizer->normalize($this->objectMock->reveal(), 'jsonld'));
     }
 
     public function testNormalizeWithApiGateway()
     {
-        $this->documentationNormalizerMock->normalize($this->objectMock, 'jsonld', [])
+        $this->documentationNormalizerMock->normalize($this->objectMock, 'jsonld', ['api_gateway' => true])
             ->willReturn([
                 'basePath' => '',
                 'paths' => [