Merge branch 'hotfix/2648' into develop

Close #2648
zendframework · Oct 2, 2012 · 2c95fa6 · 2c95fa6
2 parents e422bad + c3a4d8a
commit 2c95fa6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 2.1.0:
+
+- The initializer for ServiceManagerAwareInterface was removed to prevent
+  confusion between ServiceManagerAwareInterface and
+  ServiceLocatorAwareInterface, and to promote using the latter interface.
+
 ## 2.0.2:
 
 - 2383: Changed unreserved char definition in Zend\Uri (ZF2-533) and added shell

diff --git a/library/Zend/ServiceManager/AbstractPluginManager.php b/library/Zend/ServiceManager/AbstractPluginManager.php
@@ -69,9 +69,6 @@ public function __construct(ConfigInterface $configuration = null)
             if ($instance instanceof ServiceLocatorAwareInterface) {
                 $instance->setServiceLocator($self);
             }
-            if ($instance instanceof ServiceManagerAwareInterface) {
-                $instance->setServiceManager($self);
-            }
         });
     }