Merge pull request #339 from dunglas/fix_333

Fix some router bugs. Close #333.

Author: dunglas

Routing/Router.php

@@ -45,15 +45,15 @@ public function setContext(RequestContext $context)
      */
     public function getContext()
     {
-        $this->router->getContext();
+        return $this->router->getContext();
     }
 
     /**
      * {@inheritdoc}
      */
     public function getRouteCollection()
     {
-        $this->router->getRouteCollection();
+        return $this->router->getRouteCollection();
     }
 
     /*
@@ -67,6 +67,7 @@ public function match($pathInfo)
         $request = Request::create($pathInfo);
         $context = (new RequestContext())->fromRequest($request);
         $context->setPathInfo($pathInfo);
+        $context->setScheme($baseContext->getScheme());
 
         try {
             $this->router->setContext($context);

Tests/Routing/RouterTest.php

@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the DunglasApiBundle package.
+ *
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Dunglas\ApiBundle\Tests\Routing;
+
+use Dunglas\ApiBundle\Routing\Router;
+use Prophecy\Argument;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\Router as SymfonyRouter;
+
+/**
+ * @author Kévin Dunglas <[email protected]>
+ */
+class RouterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testContextAccessor()
+    {
+        $context = new RequestContext();
+
+        $mockedRouter = $this->prophesize('Symfony\Component\Routing\RouterInterface');
+        $mockedRouter->setContext($context)->shouldBeCalled();
+        $mockedRouter->getContext()->willReturn($context)->shouldBeCalled();
+
+        $router = new Router($mockedRouter->reveal());
+        $router->setContext($context);
+        $this->assertSame($context, $router->getContext());
+    }
+
+    public function testGetRouteCollection()
+    {
+        $routeCollection = new RouteCollection();
+
+        $mockedRouter = $this->prophesize('Symfony\Component\Routing\RouterInterface');
+        $mockedRouter->getRouteCollection()->willReturn($routeCollection)->shouldBeCalled();
+
+        $router = new Router($mockedRouter->reveal());
+        $this->assertSame($routeCollection, $router->getRouteCollection());
+    }
+
+    public function testGenerate()
+    {
+        $mockedRouter = $this->prophesize('Symfony\Component\Routing\RouterInterface');
+        $mockedRouter->generate('foo', [], false)->willReturn('/bar')->shouldBeCalled();
+
+        $router = new Router($mockedRouter->reveal());
+        $this->assertSame('/bar', $router->generate('foo'));
+    }
+
+    public function testMatch()
+    {
+        $context = new RequestContext('/app_dev.php', 'GET', 'localhost', 'https');
+
+        $mockedRouter = $this->prophesize('Symfony\Component\Routing\RouterInterface');
+        $mockedRouter->getContext()->willReturn($context)->shouldBeCalled();
+        $mockedRouter->setContext(Argument::type('Symfony\Component\Routing\RequestContext'))->shouldBeCalled();
+        $mockedRouter->setContext($context)->shouldBeCalled();
+        $mockedRouter->match('/foo')->willReturn(['bar'])->shouldBeCalled();
+
+        $router = new Router($mockedRouter->reveal());
+
+        $this->assertEquals(['bar'], $router->match('/app_dev.php/foo'));
+    }
+}