ApplicationConfigInjectionDelegator works also with ArrayObject config

Fixes #611
zendframework · Apr 10, 2018 · 09d8b31 · 09d8b31
1 parent 99feabe
commit 09d8b31
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/Container/ApplicationConfigInjectionDelegator.php b/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;
     }

diff --git a/test/Container/ApplicationConfigInjectionDelegatorTest.php b/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());
+    }
 }