Merge branch 'hotfix/send-response-factory'

Close #198
Fixes zendframework/zend-mvc-console#10
Fixes zendframework/zend-mvc-console#11
Fixes zendframework/zend-mvc-console#12

CHANGELOG.md

@@ -2,11 +2,14 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.0.3 - TBD
+## 3.0.3 - 2016-08-29
 
 ### Added
 
-- Nothing.
+- [#198](https://github.com/zendframework/zend-mvc/pull/198) adds a factory for
+  the `SendResponseListener`, to ensure that it is injected with an event
+  manager instance from the outset; this fixes issues with delegator factories
+  that registered listeners with it in previous versions.
 
 ### Deprecated
 

src/Service/SendResponseListenerFactory.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-mvc for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Service;
+
+use Interop\Container\ContainerInterface;
+use Zend\Mvc\SendResponseListener;
+
+class SendResponseListenerFactory
+{
+    /**
+     * @param ContainerInterface $container
+     * @return SendResponseListener
+     */
+    public function __invoke(ContainerInterface $container)
+    {
+        $listener = new SendResponseListener();
+        $listener->setEventManager($container->get('EventManager'));
+        return $listener;
+    }
+}

src/Service/ServiceListenerFactory.php

@@ -86,7 +86,7 @@ class ServiceListenerFactory implements FactoryInterface
             'ViewPrefixPathStackResolver'    => 'Zend\Mvc\Service\ViewPrefixPathStackResolverFactory',
             'Zend\Mvc\MiddlewareListener'    => InvokableFactory::class,
             'Zend\Mvc\RouteListener'         => InvokableFactory::class,
-            'Zend\Mvc\SendResponseListener'  => InvokableFactory::class,
+            'Zend\Mvc\SendResponseListener'  => SendResponseListenerFactory::class,
             'Zend\View\Renderer\FeedRenderer' => InvokableFactory::class,
             'Zend\View\Renderer\JsonRenderer' => InvokableFactory::class,
             'Zend\View\Renderer\PhpRenderer' => ViewPhpRendererFactory::class,

test/Service/SendResponseListenerFactoryTest.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-mvc for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Mvc\Service;
+
+use Interop\Container\ContainerInterface;
+use PHPUnit_Framework_TestCase as TestCase;
+use Prophecy\Argument;
+use Zend\EventManager\EventManagerInterface;
+use Zend\EventManager\SharedEventManagerInterface;
+use Zend\Mvc\ResponseSender\HttpResponseSender;
+use Zend\Mvc\ResponseSender\PhpEnvironmentResponseSender;
+use Zend\Mvc\ResponseSender\SendResponseEvent;
+use Zend\Mvc\ResponseSender\SimpleStreamResponseSender;
+use Zend\Mvc\SendResponseListener;
+use Zend\Mvc\Service\SendResponseListenerFactory;
+
+class SendResponseListenerFactoryTest extends TestCase
+{
+    public function testFactoryReturnsListenerWithEventManagerFromContainer()
+    {
+        $sharedEvents = $this->prophesize(SharedEventManagerInterface::class);
+        $events = $this->prophesize(EventManagerInterface::class);
+        $events->getSharedManager()->will([$sharedEvents, 'reveal']);
+
+        $events->setIdentifiers([SendResponseListener::class, SendResponseListener::class])->shouldBeCalled();
+        $events->attach(
+            SendResponseEvent::EVENT_SEND_RESPONSE,
+            Argument::type(PhpEnvironmentResponseSender::class),
+            -1000
+        )->shouldBeCalled();
+        $events->attach(
+            SendResponseEvent::EVENT_SEND_RESPONSE,
+            Argument::type(SimpleStreamResponseSender::class),
+            -3000
+        )->shouldBeCalled();
+        $events->attach(
+            SendResponseEvent::EVENT_SEND_RESPONSE,
+            Argument::type(HttpResponseSender::class),
+            -4000
+        )->shouldBeCalled();
+
+        $container = $this->prophesize(ContainerInterface::class);
+        $container->get('EventManager')->will([$events, 'reveal']);
+
+        $factory = new SendResponseListenerFactory();
+        $listener = $factory($container->reveal());
+        $this->assertInstanceOf(SendResponseListener::class, $listener);
+        $this->assertSame($events->reveal(), $listener->getEventManager());
+    }
+}