Merge branch 'hotfix/response-factory'

Close #32

Author: weierophinney

CHANGELOG.md

@@ -4,6 +4,31 @@ All notable changes to this project will be documented in this file, in reverse
 
 Versions 0.3.0 and prior were released as "weierophinney/problem-details".
 
+## 0.5.3 - 2018-03-12
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#32](https://github.com/zendframework/zend-problem-details/pull/32) updates
+  the `ProblemDetailsResponseFactoryFactory` to allow the `ResponseInterface`
+  service to either return an instance, or a factory capable of generating an
+  instance.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 0.5.2 - 2018-01-10
 
 ### Added

src/ProblemDetailsResponseFactoryFactory.php

@@ -20,9 +20,7 @@ public function __invoke(ContainerInterface $container) : ProblemDetailsResponse
         $problemDetailsConfig = $config['problem-details'] ?? [];
         $jsonFlags = $problemDetailsConfig['json_flags'] ?? null;
 
-        $responsePrototype = $container->has(ResponseInterface::class)
-            ? $container->get(ResponseInterface::class)
-            : null;
+        $responsePrototype = $this->getResponsePrototype($container);
 
         $streamFactory = $container->has('Zend\ProblemDetails\StreamFactory')
             ? $container->get('Zend\ProblemDetails\StreamFactory')
@@ -36,4 +34,17 @@ public function __invoke(ContainerInterface $container) : ProblemDetailsResponse
             $includeThrowableDetail
         );
     }
+
+    /**
+     * @return null|ResponseInterface
+     */
+    private function getResponsePrototype(ContainerInterface $container)
+    {
+        if (! $container->has(ResponseInterface::class)) {
+            return null;
+        }
+
+        $response = $container->get(ResponseInterface::class);
+        return is_callable($response) ? $response() : $response;
+    }
 }

test/ProblemDetailsResponseFactoryFactoryTest.php

@@ -90,6 +90,25 @@ public function testUsesResponseServiceFromContainerWhenPresent() : void
         $this->assertAttributeSame($response, 'response', $factory);
     }
 
+    public function testUsesResponseServiceAsFactoryFromContainerWhenPresent() : void
+    {
+        $response = $this->prophesize(ResponseInterface::class)->reveal();
+        $responseFactory = function () use ($response) {
+            return $response;
+        };
+
+        $this->container->has('config')->willReturn(false);
+        $this->container->has(ResponseInterface::class)->willReturn(true);
+        $this->container->get(ResponseInterface::class)->willReturn($responseFactory);
+        $this->container->has('Zend\ProblemDetails\StreamFactory')->willReturn(false);
+
+        $factoryFactory = new ProblemDetailsResponseFactoryFactory();
+        $factory = $factoryFactory($this->container->reveal());
+
+        $this->assertInstanceOf(ProblemDetailsResponseFactory::class, $factory);
+        $this->assertAttributeSame($response, 'response', $factory);
+    }
+
     public function testUsesStreamFactoryServiceFromContainerWhenPresent() : void
     {
         // @codingStandardsIgnoreStart