Merge c448c28 into ebf5fb5

zendframework · Mar 12, 2018 · e2d4663 · e2d4663
2 parents ebf5fb5 + c448c28
commit e2d4663
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/src/ProblemDetailsResponseFactoryFactory.php b/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;
+    }
 }
diff --git a/test/ProblemDetailsResponseFactoryFactoryTest.php b/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