Merge branch 'feature/stratigility-alpha4' into release-3.0.0

Close #568

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,36 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 3.0.0alpha9 - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#568](https://github.com/zendframework/zend-expressive/pull/568) updates the
+  zendframework/zend-stratigility dependency to require at least 3.0.0alpha4.
+
+- [#568](https://github.com/zendframework/zend-expressive/pull/568) updates the
+  `ErrorHandlerFactory` to pull the `Psr\Http\Message\ResponseInterface`
+  service, which returns a factory capable of returning a response instance,
+  and passes it to the `Zend\Stratigility\Middleware\ErrorHandler` instance it
+  creates, as that class changes in 3.0.0alpha4 such that it now expects a
+  factory instead of an instance.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 3.0.0alpha8 - 2018-02-21
 
 ### Added

composer.json

@@ -31,7 +31,7 @@
         "zendframework/zend-expressive-router": "^3.0.0alpha3",
         "zendframework/zend-expressive-template": "^2.0.0alpha1",
         "zendframework/zend-httphandlerrunner": "^1.0.1",
-        "zendframework/zend-stratigility": "3.0.0alpha3"
+        "zendframework/zend-stratigility": "3.0.0alpha4"
     },
     "require-dev": {
         "filp/whoops": "^1.1.10 || ^2.1.13",

composer.lock

@@ -10,7 +10,7 @@
 namespace Zend\Expressive\Container;
 
 use Psr\Container\ContainerInterface;
-use Zend\Diactoros\Response;
+use Psr\Http\Message\ResponseInterface;
 use Zend\Expressive\Middleware\ErrorResponseGenerator;
 use Zend\Stratigility\Middleware\ErrorHandler;
 
@@ -22,6 +22,6 @@ public function __invoke(ContainerInterface $container) : ErrorHandler
             ? $container->get(ErrorResponseGenerator::class)
             : null;
 
-        return new ErrorHandler(new Response(), $generator);
+        return new ErrorHandler($container->get(ResponseInterface::class), $generator);
     }
 }

src/Container/ErrorHandlerFactory.php

@@ -9,10 +9,13 @@
 
 namespace ZendTest\Expressive\Container;
 
+use Closure;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
+use RuntimeException;
+use TypeError;
 use Zend\Expressive\Container\ErrorHandlerFactory;
 use Zend\Expressive\Middleware\ErrorResponseGenerator;
 use Zend\Stratigility\Middleware\ErrorHandler;
@@ -28,15 +31,45 @@ public function setUp()
         $this->container = $this->prophesize(ContainerInterface::class);
     }
 
+    public function testFactoryFailsIfResponseServiceIsMissing()
+    {
+        $exception = new RuntimeException();
+        $this->container->has(ErrorResponseGenerator::class)->willReturn(false);
+        $this->container->get(ErrorResponseGenerator::class)->shouldNotBeCalled();
+        $this->container->get(ResponseInterface::class)->willThrow($exception);
+
+        $factory = new ErrorHandlerFactory();
+
+        $this->expectException(RuntimeException::class);
+        $factory($this->container->reveal());
+    }
+
+    public function testFactoryFailsIfResponseServiceReturnsResponse()
+    {
+        $response = $this->prophesize(ResponseInterface::class)->reveal();
+        $this->container->has(ErrorResponseGenerator::class)->willReturn(false);
+        $this->container->get(ErrorResponseGenerator::class)->shouldNotBeCalled();
+        $this->container->get(ResponseInterface::class)->willReturn($response);
+
+        $factory = new ErrorHandlerFactory();
+
+        $this->expectException(TypeError::class);
+        $factory($this->container->reveal());
+    }
+
     public function testFactoryCreatesHandlerWithStratigilityGeneratorIfNoGeneratorServiceAvailable()
     {
         $this->container->has(ErrorResponseGenerator::class)->willReturn(false);
+        $this->container->get(ErrorResponseGenerator::class)->shouldNotBeCalled();
+
+        $this->container->get(ResponseInterface::class)->willReturn(function () {
+        });
 
         $factory = new ErrorHandlerFactory();
         $handler = $factory($this->container->reveal());
 
         $this->assertInstanceOf(ErrorHandler::class, $handler);
-        $this->assertAttributeInstanceOf(ResponseInterface::class, 'responsePrototype', $handler);
+        $this->assertAttributeInstanceOf(Closure::class, 'responseFactory', $handler);
         $this->assertAttributeInstanceOf(StratigilityGenerator::class, 'responseGenerator', $handler);
     }
 
@@ -46,11 +79,14 @@ public function testFactoryCreatesHandlerWithGeneratorIfGeneratorServiceAvailabl
         $this->container->has(ErrorResponseGenerator::class)->willReturn(true);
         $this->container->get(ErrorResponseGenerator::class)->willReturn($generator);
 
+        $this->container->get(ResponseInterface::class)->willReturn(function () {
+        });
+
         $factory = new ErrorHandlerFactory();
         $handler = $factory($this->container->reveal());
 
         $this->assertInstanceOf(ErrorHandler::class, $handler);
-        $this->assertAttributeInstanceOf(ResponseInterface::class, 'responsePrototype', $handler);
+        $this->assertAttributeInstanceOf(Closure::class, 'responseFactory', $handler);
         $this->assertAttributeSame($generator, 'responseGenerator', $handler);
     }
 }