Merge pull request #116 from GeeH/hotfix/implement-container

Changed the way ContainerInterface is implemented
zendframework · Apr 27, 2016 · 6c6b737 · 6c6b737
2 parents 8e435c2 + 7017b1d
commit 6c6b737
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
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