Merge branch 'hotfix/174' into develop

Forward port #174

Author: weierophinney

CHANGELOG.md

@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#174](https://github.com/zendframework/zend-servicemanager/pull/174) updates
+  the `ConfigAbstractFactory` to allow the `config` service to be either an
+  `array` or an `ArrayObject`; previously, only `array` was supported.
 
 ## 3.2.0 - 2016-12-19
 

src/AbstractFactory/ConfigAbstractFactory.php

@@ -7,6 +7,7 @@
 
 namespace Zend\ServiceManager\AbstractFactory;
 
+use ArrayObject;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Factory\AbstractFactoryInterface;
 
@@ -40,8 +41,8 @@ public function __invoke(\Interop\Container\ContainerInterface $container, $requ
 
         $config = $container->get('config');
 
-        if (! is_array($config)) {
-            throw new ServiceNotCreatedException('Config must be an array');
+        if (! (is_array($config) || $config instanceof ArrayObject)) {
+            throw new ServiceNotCreatedException('Config must be an array or an instance of ArrayObject');
         }
 
         if (! array_key_exists(self::class, $config)) {

test/AbstractFactory/ConfigAbstractFactoryTest.php

@@ -7,6 +7,7 @@
 
 namespace ZendTest\ServiceManager\AbstractFactory;
 
+use ArrayObject;
 use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\ServiceManager;
@@ -76,6 +77,39 @@ public function testCanCreate()
         self::assertFalse($abstractFactory->canCreate($serviceManager, ServiceManager::class));
     }
 
+    public function testCanCreateReturnsTrueWhenConfigIsAnArrayObject()
+    {
+        $abstractFactory = new ConfigAbstractFactory();
+        $serviceManager = new ServiceManager();
+        $serviceManager->setService(
+            'config',
+            new ArrayObject([
+                ConfigAbstractFactory::class => [
+                    InvokableObject::class => [],
+                ]
+            ])
+        );
+
+        self::assertTrue($abstractFactory->canCreate($serviceManager, InvokableObject::class));
+        self::assertFalse($abstractFactory->canCreate($serviceManager, ServiceManager::class));
+    }
+
+    public function testFactoryCanCreateInstancesWhenConfigIsAnArrayObject()
+    {
+        $abstractFactory = new ConfigAbstractFactory();
+        $serviceManager = new ServiceManager();
+        $serviceManager->setService(
+            'config',
+            new ArrayObject([
+                ConfigAbstractFactory::class => [
+                    InvokableObject::class => [],
+                ]
+            ])
+        );
+
+        self::assertInstanceOf(InvokableObject::class, $abstractFactory($serviceManager, InvokableObject::class));
+    }
+
     public function testInvokeWithInvokableClass()
     {
         $abstractFactory = new ConfigAbstractFactory();