Merge branch 'hotfix/allow-override' into develop

Forward port #31

CHANGELOG.md

@@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.7.1 - TBD
+## 2.7.1 - 2016-02-27
 
 ### Added
 
@@ -36,7 +36,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#31](https://github.com/zendframework/zend-modulemanager/pull/31) updates the
+  `ServiceListener:onLoadModulesPost()` workflow to override existing services
+  on a given service/plugin manager instance when configuring it. Since the
+  listener operates as part of bootstrapping, this is a requirement.
 
 ## 2.7.0 - 2016-02-25
 

composer.json

@@ -22,7 +22,7 @@
         "zendframework/zend-console": "^2.6",
         "zendframework/zend-di": "^2.6",
         "zendframework/zend-loader": "^2.5",
-        "zendframework/zend-servicemanager": "^3.0.3",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     },

src/Listener/ServiceListener.php

@@ -217,7 +217,15 @@ public function onLoadModulesPost(ModuleEvent $e)
             }
 
             $serviceConfig = new ServiceConfig($smConfig);
+
+            // The service listener is meant to operate during bootstrap, and, as such,
+            // needs to be able to override existing configuration.
+            $allowOverride = $sm['service_manager']->getAllowOverride();
+            $sm['service_manager']->setAllowOverride(true);
+
             $serviceConfig->configureServiceManager($sm['service_manager']);
+
+            $sm['service_manager']->setAllowOverride($allowOverride);
         }
     }
 

test/Listener/ServiceListenerTest.php

@@ -358,4 +358,44 @@ public function testCanDetachListeners(array $dependencies)
         $listeners = $this->getArrayOfListenersForEvent(ModuleEvent::EVENT_LOAD_MODULES_POST, $events);
         $this->assertCount(0, $listeners);
     }
+
+    public function testListenerCanOverrideServicesInServiceManagers()
+    {
+        $services = new ServiceManager();
+        $services->setService('config', []);
+        $services->setFactory('foo', function ($services) {
+            return $services;
+        });
+        $listener = new ServiceListener($services);
+        $listener->addServiceManager(
+            $services,
+            'service_manager',
+            ServiceProviderInterface::class,
+            'getServiceConfig'
+        );
+
+        $module = new TestAsset\ServiceProviderModule([
+            'services' => [
+                'config' => [ 'foo' => 'bar'],
+            ],
+            'factories' => [
+                'foo' => function ($services) {
+                    return new stdClass();
+                },
+            ],
+        ]);
+
+        $event          = new ModuleEvent();
+        $configListener = new ConfigListener();
+        $event->setConfigListener($configListener);
+
+        $event->setModule($module);
+        $listener->onLoadModule($event);
+        $listener->onLoadModulesPost($event);
+
+        $this->assertTrue($services->has('config'));
+        $this->assertTrue($services->has('foo'));
+        $this->assertEquals(['foo' => 'bar'], $services->get('config'), 'Config service was not overridden');
+        $this->assertInstanceOf(stdClass::class, $services->get('foo'), 'Foo service was not overridden');
+    }
 }