Merge branch 'hotfix/11' into develop

weierophinney · weierophinney · commit 93d0fe96ef30 · 2016-08-29T14:05:44.000-05:00
Forward port #11
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "zendframework/zend-console": "^2.6",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
         "zendframework/zend-modulemanager": "^2.7.1",
-        "zendframework/zend-mvc": "^3.0.0-dev || ^3.0",
+        "zendframework/zend-mvc": "^3.0.3",
         "zendframework/zend-router": "^3.0",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
         "zendframework/zend-stdlib": "^2.7.5 || ^3.0",
diff --git a/composer.lock b/composer.lock
diff --git a/test/ServiceManagerTest.php b/test/ServiceManagerTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-mvc-console 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\Console;
+
+use Interop\Container\ContainerInterface;
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\EventManager\Test\EventListenerIntrospectionTrait;
+use Zend\Mvc\Console\ResponseSender\ConsoleResponseSender;
+use Zend\Mvc\Console\Service\ConsoleResponseSenderDelegatorFactory;
+use Zend\Mvc\ResponseSender\SendResponseEvent;
+use Zend\Mvc\SendResponseListener;
+use Zend\Mvc\Service\SendResponseListenerFactory;
+use Zend\Mvc\Service\ServiceManagerConfig;
+use Zend\ServiceManager\ServiceManager;
+use Zend\ServiceManager\Factory\InvokableFactory;
+
+use ReflectionProperty;
+
+class ServiceManagerTest extends TestCase
+{
+    use EventListenerIntrospectionTrait;
+
+    /**
+     * @group 10
+     * @group 11
+     * @group 12
+     */
+    public function testEventManagerOverridden()
+    {
+        $minimalConfig = [
+            'aliases' => [
+                'SendResponseListener' => SendResponseListener::class,
+            ],
+            'factories' => [
+                SendResponseListener::class => SendResponseListenerFactory::class,
+            ],
+            'delegators' => [
+                SendResponseListener::class => [
+                    ConsoleResponseSenderDelegatorFactory::class,
+                ],
+            ]
+        ];
+
+        $smConfig = new ServiceManagerConfig($minimalConfig);
+
+        $serviceManager = new ServiceManager();
+        $smConfig->configureServiceManager($serviceManager);
+
+        $sendResponseListener = $serviceManager->get('SendResponseListener');
+        $eventManager = $sendResponseListener->getEventManager();
+        $this->assertEvents($eventManager);
+    }
+
+    protected function assertEvents($eventManager)
+    {
+        $count = 0;
+        $found = false;
+
+        foreach ($this->getListenersForEvent(SendResponseEvent::EVENT_SEND_RESPONSE, $eventManager, true) as $priority => $listener) {
+            $count++;
+            if ($priority === -2000
+                && $listener instanceof ConsoleResponseSender
+            ) {
+                $found = true;
+            }
+        }
+
+        $this->assertEquals(4, $count);
+        $this->assertTrue($found, 'ConsoleResponseSender was not found in listeners');
+    }
+}
