Merge branch 'develop'

Merging develop to master in prep for 2.6.0

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.6.0 - TBD
+
+### Added
+
+- [#4](https://github.com/zendframework/zend-servicemanager/pull/4) updates the
+    `ServiceManager` to [implement the container-interop interface](https://github.com/container-interop/container-interop),
+    allowing interoperability with applications that consume that interface.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 2.5.2 - TBD
 
 ### Added

composer.json

@@ -13,7 +13,8 @@
         }
     },
     "require": {
-        "php": ">=5.5"
+        "php": ">=5.5",
+        "container-interop/container-interop": "~1.0"
     },
     "require-dev": {
         "zendframework/zend-di": "~2.5",

src/ServiceManager.php

@@ -9,7 +9,9 @@
 
 namespace Zend\ServiceManager;
 
-class ServiceManager implements ServiceLocatorInterface
+use Interop\Container\ContainerInterface;
+
+class ServiceManager implements ServiceLocatorInterface, ContainerInterface
 {
     /**@#+
      * Constants

test/ServiceManagerTest.php

@@ -34,6 +34,12 @@ public function setup()
         $this->serviceManager = new ServiceManager;
     }
 
+    public function testInteroperabilityInterface()
+    {
+        $serviceManager = new ServiceManager();
+        $this->assertInstanceOf("Interop\Container\ContainerInterface", $serviceManager);
+    }
+
     /**
      * @covers Zend\ServiceManager\ServiceManager::__construct
      */