Merge branch 'hotfix/response-factory'

Close #32

CHANGELOG.md

@@ -4,6 +4,32 @@ All notable changes to this project will be documented in this file, in reverse
 
 Versions prior to 0.4.0 were released as the package "weierophinney/hal".
 
+## 0.6.3 - 2018-03-12
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#32](https://github.com/zendframework/zend-expressive-hal/pull/32) modifies
+  `HalResponseFactoryFactory` to test if a `ResponseInterface` service instance
+  is `callable` before returning it; if it is, it calls it first. This allows
+  the `ResponseInterface` service to return a response _factory_ instead of an
+  instance.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 0.6.2 - 2018-01-03
 
 ### Added

src/HalResponseFactoryFactory.php

@@ -62,7 +62,8 @@ public function __invoke(ContainerInterface $container) : HalResponseFactory
     private function getResponseInstance(ContainerInterface $container) : ResponseInterface
     {
         if ($container->has(ResponseInterface::class)) {
-            return $container->get(ResponseInterface::class);
+            $response = $container->get(ResponseInterface::class);
+            return is_callable($response) ? $response() : $response;
         }
 
         if (class_exists(Response::class)) {

test/HalResponseFactoryFactoryTest.php

@@ -66,4 +66,37 @@ public function testReturnsHalResponseFactoryInstanceWithoutConfiguredDependenci
         self::assertAttributeInstanceOf(ResponseInterface::class, 'responsePrototype', $instance);
         self::assertAttributeInstanceOf(Closure::class, 'streamFactory', $instance);
     }
+
+    public function testReturnsHalResponseFactoryInstanceWhenResponseInterfaceReturnsFactory()
+    {
+        $jsonRenderer = $this->prophesize(Renderer\JsonRenderer::class)->reveal();
+        $xmlRenderer = $this->prophesize(Renderer\XmlRenderer::class)->reveal();
+        $response = $this->prophesize(ResponseInterface::class)->reveal();
+        $responseFactory = function () use ($response) {
+            return $response;
+        };
+        $stream = new class()
+        {
+            public function __invoke()
+            {
+            }
+        };
+
+        $container = $this->prophesize(ContainerInterface::class);
+        $container->has(Renderer\JsonRenderer::class)->willReturn(true);
+        $container->get(Renderer\JsonRenderer::class)->willReturn($jsonRenderer);
+        $container->has(Renderer\XmlRenderer::class)->willReturn(true);
+        $container->get(Renderer\XmlRenderer::class)->willReturn($xmlRenderer);
+        $container->has(ResponseInterface::class)->willReturn(true);
+        $container->get(ResponseInterface::class)->willReturn($responseFactory);
+        $container->has(StreamInterface::class)->willReturn(true);
+        $container->get(StreamInterface::class)->willReturn($stream);
+
+        $instance = (new HalResponseFactoryFactory())($container->reveal());
+        self::assertInstanceOf(HalResponseFactory::class, $instance);
+        self::assertAttributeSame($jsonRenderer, 'jsonRenderer', $instance);
+        self::assertAttributeSame($xmlRenderer, 'xmlRenderer', $instance);
+        self::assertAttributeSame($response, 'responsePrototype', $instance);
+        self::assertAttributeSame($stream, 'streamFactory', $instance);
+    }
 }