Merge branch 'hotfix/447'

Close #447
Fixes #446

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.1.1 - 2017-02-14
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#447](https://github.com/zendframework/zend-expressive/pull/447) fixes an
+  error in the `ApplicationFactory` that occurs when the `config` service is an
+  `ArrayObject`. Prior to the fix, `ArrayObject` configurations would cause a
+  fatal error when injecting the pipeline and/or routes.
+
 ## 1.1.0 - 2017-02-13
 
 ### Added

src/Container/ApplicationFactory.php

@@ -7,6 +7,7 @@
 
 namespace Zend\Expressive\Container;
 
+use ArrayObject;
 use Interop\Container\ContainerInterface;
 use SplPriorityQueue;
 use Zend\Diactoros\Response\EmitterInterface;
@@ -156,6 +157,7 @@ class ApplicationFactory
     public function __invoke(ContainerInterface $container)
     {
         $config = $container->has('config') ? $container->get('config') : [];
+        $config = $config instanceof ArrayObject ? $config->getArrayCopy() : $config;
 
         $router = $container->has(RouterInterface::class)
             ? $container->get(RouterInterface::class)
@@ -513,10 +515,10 @@ private function marshalNoopFinalHandler(ContainerInterface $container)
      * Create default FinalHandler with options configured under the key final_handler.options.
      *
      * @param ContainerInterface $container
-     * @param array|\ArrayObject $config
+     * @param array $config
      * @return callable|FinalHandler
      */
-    private function marshalLegacyFinalHandler(ContainerInterface $container, $config)
+    private function marshalLegacyFinalHandler(ContainerInterface $container, array $config)
     {
         if ($container->has('Zend\Expressive\FinalHandler')) {
             return $container->get('Zend\Expressive\FinalHandler');

test/Container/ApplicationFactoryIntegrationTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\Expressive\Container;
 
+use ArrayObject;
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
 use Psr\Http\Message\ServerRequestInterface;
@@ -50,7 +51,12 @@ public function setUp()
         $this->injectServiceInContainer($this->container, EmitterInterface::class, $this->emitter->reveal());
     }
 
-    public function testConfiguredErrorMiddlewarePipeIsExecutedWhenMiddlewareCallsNextWithError()
+    /**
+     * @dataProvider configType
+     *
+     * @param string $type
+     */
+    public function testConfiguredErrorMiddlewarePipeIsExecutedWhenMiddlewareCallsNextWithError($type)
     {
         $always = function ($request, $response, $next) {
             $response = $next($request, $response);
@@ -121,6 +127,11 @@ public function testConfiguredErrorMiddlewarePipeIsExecutedWhenMiddlewareCallsNe
                 ],
             ],
         ];
+
+        if ($type !== 'array') {
+            $config = new $type($config);
+        }
+
         $this->injectServiceInContainer($this->container, 'config', $config);
 
         $app = $this->factory->__invoke($this->container->reveal());
@@ -139,7 +150,12 @@ public function testConfiguredErrorMiddlewarePipeIsExecutedWhenMiddlewareCallsNe
         $this->assertEquals('Error middleware called', (string) $response->getBody());
     }
 
-    public function testConfiguredErrorMiddlewareIsExecutedWhenMiddlewareCallsNextWithError()
+    /**
+     * @dataProvider configType
+     *
+     * @param string $type
+     */
+    public function testConfiguredErrorMiddlewareIsExecutedWhenMiddlewareCallsNextWithError($type)
     {
         $always = function ($request, $response, $next) {
             $response = $next($request, $response);
@@ -209,6 +225,11 @@ public function testConfiguredErrorMiddlewareIsExecutedWhenMiddlewareCallsNextWi
                 ],
             ],
         ];
+
+        if ($type !== 'array') {
+            $config = new $type($config);
+        }
+
         $this->injectServiceInContainer($this->container, 'config', $config);
 
         $app = $this->factory->__invoke($this->container->reveal());
@@ -226,4 +247,12 @@ public function testConfiguredErrorMiddlewareIsExecutedWhenMiddlewareCallsNextWi
         $this->assertEquals('needs-auth', $response->getHeaderLine('X-Route-Result'));
         $this->assertEquals('Error middleware called', (string) $response->getBody());
     }
+
+    public function configType()
+    {
+        return [
+            [ArrayObject::class],
+            ['array'],
+        ];
+    }
 }