Merge branch 'hotfix/612-config-injection-array-cast'

Close #612
Fixes #611

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.1.0 - TBD
+## 3.0.2 - 2018-04-10
 
 ### Added
 
@@ -22,29 +22,12 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
-
-## 3.0.2 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
+- [#612](https://github.com/zendframework/zend-expressive/pull/612) updates the
+  `ApplicationConfigInjectionDelegator` delegator factory logic to cast the
+  `$config` value to an array before passing it to its
+  `injectPipelineFromConfig()` and `injectRoutesFromConfig()` methods, ensuring
+  it will work correctly with containers that store the `config` service as an
+  `ArrayObject` instead of an `array`.
 
 ## 3.0.1 - 2018-03-19
 

src/Container/ApplicationConfigInjectionDelegator.php

@@ -58,8 +58,8 @@ public function __invoke(ContainerInterface $container, string $serviceName, cal
             return $application;
         }
 
-        self::injectPipelineFromConfig($application, $config);
-        self::injectRoutesFromConfig($application, $config);
+        self::injectPipelineFromConfig($application, (array) $config);
+        self::injectRoutesFromConfig($application, (array) $config);
 
         return $application;
     }

test/Container/ApplicationConfigInjectionDelegatorTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\Expressive\Container;
 
+use ArrayObject;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -449,4 +450,27 @@ public function testInjectPipelineFromConfigRaisesExceptionForSpecsOmittingMiddl
         $this->expectExceptionMessage('Invalid pipeline specification received');
         ApplicationConfigInjectionDelegator::injectPipelineFromConfig($app, $config);
     }
+
+    public function testConfigCanBeArrayObject()
+    {
+        $config = new ArrayObject([
+            'routes' => [
+                'home' => [
+                    'name' => 'homepage',
+                    'path' => '/',
+                    'middleware' => new TestAsset\InteropMiddleware(),
+                ],
+            ],
+        ]);
+
+        $this->container->has('config')->willReturn(true);
+        $this->container->get('config')->willReturn($config);
+
+        $delegator = new ApplicationConfigInjectionDelegator();
+        $application = $delegator($this->container->reveal(), '', function () {
+            return $this->createApplication();
+        });
+
+        $this->assertCount(1, $application->getRoutes());
+    }
 }