Decrease ApiGatewayNormalizer priority

Author: vincentchalamon

src/Bridge/Symfony/Bundle/Resources/config/swagger.xml

@@ -36,7 +36,7 @@
 
         <service id="api_platform.swagger.normalizer.api_gateway" class="ApiPlatform\Core\Swagger\Serializer\ApiGatewayNormalizer" public="false" decorates="api_platform.swagger.normalizer.documentation">
             <argument type="service" id="api_platform.swagger.normalizer.api_gateway.inner" />
-            <tag name="serializer.normalizer" priority="17" />
+            <tag name="serializer.normalizer" priority="-1" />
         </service>
 
         <service id="api_platform.swagger.command.swagger_command" class="ApiPlatform\Core\Bridge\Symfony\Bundle\Command\SwaggerCommand">

src/Swagger/Serializer/ApiGatewayNormalizer.php

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

tests/Swagger/Serializer/ApiGatewayNormalizerTest.php

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