Merge branch 'hotfix/118' into develop

Forward port #118

Author: weierophinney

src/Container/ApplicationFactory.php

@@ -14,6 +14,7 @@
 use Zend\Expressive\Application;
 use Zend\Expressive\Exception;
 use Zend\Expressive\Router\AuraRouter;
+use Zend\Expressive\Router\Route;
 use Zend\Expressive\Router\RouterInterface;
 
 /**
@@ -165,11 +166,14 @@ private function injectRoutes(Application $app, ContainerInterface $container)
                 ? $spec['allowed_methods']
                 : null;
             $name    = isset($spec['name']) ? $spec['name'] : null;
-            $route   = $app->route($spec['path'], $spec['middleware'], $methods, $name);
+            $methods = (null === $methods) ? Route::HTTP_METHOD_ANY : $methods;
+            $route   = new Route($spec['path'], $spec['middleware'], $methods, $name);
 
             if (isset($spec['options']) && is_array($spec['options'])) {
                 $route->setOptions($spec['options']);
             }
+
+            $app->route($route);
         }
     }
 

test/Container/ApplicationFactoryTest.php

@@ -997,4 +997,75 @@ public function testCanSpecifyRouteNamesViaConfiguration()
         $this->assertInstanceOf(Route::class, $route);
         $this->assertEquals('home', $route->getName());
     }
+
+    public function testCanSpecifyRouteOptionsViaConfiguration()
+    {
+        $router = $this->prophesize('Zend\Expressive\Router\RouterInterface');
+        $emitter = $this->prophesize('Zend\Diactoros\Response\EmitterInterface');
+        $finalHandler = function ($req, $res, $err = null) {
+        };
+
+        $expected = [
+            'values' => [
+                'foo' => 'bar'
+            ],
+            'tokens' => [
+                'bar' => 'foo'
+            ]
+        ];
+        $config = [
+            'routes' => [
+                [
+                    'path' => '/',
+                    'middleware' => 'HelloWorld',
+                    'name' => 'home',
+                    'allowed_methods' => ['GET'],
+                    'options' => $expected
+                ],
+            ],
+        ];
+
+        $this->container
+            ->has('Zend\Expressive\Router\RouterInterface')
+            ->willReturn(true);
+        $this->container
+            ->get('Zend\Expressive\Router\RouterInterface')
+            ->will(function () use ($router) {
+                return $router->reveal();
+            });
+
+        $this->container
+            ->has('Zend\Diactoros\Response\EmitterInterface')
+            ->willReturn(true);
+        $this->container
+            ->get('Zend\Diactoros\Response\EmitterInterface')
+            ->will(function () use ($emitter) {
+                return $emitter->reveal();
+            });
+
+        $this->container
+            ->has('Zend\Expressive\FinalHandler')
+            ->willReturn(true);
+        $this->container
+            ->get('Zend\Expressive\FinalHandler')
+            ->willReturn($finalHandler);
+
+        $this->container
+            ->has('config')
+            ->willReturn(true);
+
+        $this->container
+            ->get('config')
+            ->willReturn($config);
+
+        $app = $this->factory->__invoke($this->container->reveal());
+
+        $r = new ReflectionProperty($app, 'routes');
+        $r->setAccessible(true);
+        $routes = $r->getValue($app);
+        $route  = array_shift($routes);
+
+        $this->assertInstanceOf(Route::class, $route);
+        $this->assertEquals($expected, $route->getOptions());
+    }
 }