Merge branch 'hotfix/101' into develop

Forward port #97

Author: weierophinney

CHANGELOG.md

@@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.7.3 - TBD
+## 2.7.3 - 2016-03-08
 
 ### Added
 
@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#97](https://github.com/zendframework/zend-mvc/pull/97) re-introduces the
+  `ServiceManager` factory definition inside `ServiceManagerConfig`, to ensure
+  backwards compatibility.
 
 ## 2.7.2 - 2016-03-08
 

src/Service/ServiceManagerConfig.php

@@ -76,6 +76,10 @@ class ServiceManagerConfig extends Config
      */
     public function __construct(array $config = [])
     {
+        $this->config['factories']['ServiceManager'] = function ($container) {
+            return $container;
+        };
+
         $this->config['factories']['SharedEventManager'] = function () {
             return new SharedEventManager();
         };

test/Service/ServiceManagerConfigTest.php

@@ -212,4 +212,17 @@ public function testEventManagerInitializerCanBeReplaced()
 
         $serviceManager->get('EventManagerAware');
     }
+
+    /**
+     * @group 101
+     */
+    public function testCreatesAFactoryForTheServiceManagerThatReturnsIt()
+    {
+        $serviceManager = new ServiceManager();
+        $config         = new ServiceManagerConfig();
+        $config->configureServiceManager($serviceManager);
+
+        $this->assertTrue($serviceManager->has('ServiceManager'), 'Missing ServiceManager service!');
+        $this->assertSame($serviceManager, $serviceManager->get('ServiceManager'));
+    }
 }