Merge branch 'hotfix/116' into release-2.7

Close #116
zendframework · Apr 27, 2016 · a6db4d1 · a6db4d1
2 parents 8e435c2 + 99431b6
commit a6db4d1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.7.6 - TBD
+## 2.7.6 - 2016-04-27
 
 ### Added
 
@@ -18,7 +18,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#116](https://github.com/zendframework/zend-servicemanager/pull/116) updates
+  `ServiceLocatorInterface` to extend container-interop's `ContainerInterface`,
+  as the definitions are compatible. This change will mean that implementing
+  `ServiceLocatorInterface` will provide a `ContainerInterface` implementation.
 
 ## 2.7.5 - 2016-02-02
 

diff --git a/src/ServiceLocatorInterface.php b/src/ServiceLocatorInterface.php
@@ -9,10 +9,12 @@
 
 namespace Zend\ServiceManager;
 
+use Interop\Container\ContainerInterface;
+
 /**
  * Service locator interface
  */
-interface ServiceLocatorInterface
+interface ServiceLocatorInterface extends ContainerInterface
 {
     /**
      * Retrieve a registered instance

diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -9,9 +9,7 @@
 
 namespace Zend\ServiceManager;
 
-use Interop\Container\ContainerInterface;
-
-class ServiceManager implements ServiceLocatorInterface, ContainerInterface
+class ServiceManager implements ServiceLocatorInterface
 {
     /**@#+
      * Constants