Merge pull request #1684 from vincentchalamon/2.1

Fix Swagger.basePath

Author: dunglas

src/Documentation/Action/DocumentationAction.php

@@ -15,6 +15,7 @@
 
 use ApiPlatform\Core\Documentation\Documentation;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Generates the API documentation.
@@ -38,8 +39,10 @@ public function __construct(ResourceNameCollectionFactoryInterface $resourceName
         $this->formats = $formats;
     }
 
-    public function __invoke(): Documentation
+    public function __invoke(Request $request): Documentation
     {
+        $request->attributes->set('_api_normalization_context', $request->attributes->get('_api_normalization_context', []) + ['base_url' => $request->getBaseUrl()]);
+
         return new Documentation($this->resourceNameCollectionFactory->create(), $this->title, $this->description, $this->version, $this->formats);
     }
 }

src/EventListener/SerializeListener.php

@@ -88,7 +88,7 @@ private function serializeRawData(GetResponseForControllerResultEvent $event, Re
         }
 
         if (\is_object($controllerResult)) {
-            $event->setControllerResult($this->serializer->serialize($controllerResult, $request->getRequestFormat()));
+            $event->setControllerResult($this->serializer->serialize($controllerResult, $request->getRequestFormat(), $request->attributes->get('_api_normalization_context', [])));
 
             return;
         }

tests/Documentation/Action/DocumentationActionTest.php

@@ -18,6 +18,8 @@
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
 use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @author Amrouche Hamza <[email protected]>
@@ -26,9 +28,15 @@ class DocumentationActionTest extends TestCase
 {
     public function testDocumentationAction()
     {
+        $requestProphecy = $this->prophesize(Request::class);
+        $attributesProphecy = $this->prophesize(ParameterBagInterface::class);
         $resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class);
         $resourceNameCollectionFactoryProphecy->create()->willReturn(new ResourceNameCollection(['dummies']));
+        $requestProphecy->attributes = $attributesProphecy->reveal();
+        $requestProphecy->getBaseUrl()->willReturn('/api')->shouldBeCalledTimes(1);
+        $attributesProphecy->get('_api_normalization_context', [])->willReturn(['foo' => 'bar'])->shouldBeCalledTimes(1);
+        $attributesProphecy->set('_api_normalization_context', ['foo' => 'bar', 'base_url' => '/api'])->shouldBeCalledTimes(1);
         $documentation = new DocumentationAction($resourceNameCollectionFactoryProphecy->reveal(), 'My happy hippie api', 'lots of chocolate', '1.0.0', ['formats' => ['jsonld' => 'application/ld+json']]);
-        $this->assertEquals(new Documentation(new ResourceNameCollection(['dummies']), 'My happy hippie api', 'lots of chocolate', '1.0.0', ['formats' => ['jsonld' => 'application/ld+json']]), $documentation());
+        $this->assertEquals(new Documentation(new ResourceNameCollection(['dummies']), 'My happy hippie api', 'lots of chocolate', '1.0.0', ['formats' => ['jsonld' => 'application/ld+json']]), $documentation($requestProphecy->reveal()));
     }
 }