Fix duplicate warnings for same URIs on different versions with Lumen as well as implement tests for the Lumen adapter.

Signed-off-by: Jason Lewis <[email protected]>

Author: jasonlewis

composer.json

@@ -21,6 +21,7 @@
     "require-dev": {
         "lucadegasperi/oauth2-server-laravel": "4.1.*",
         "tymon/jwt-auth": "0.5.*",
+        "laravel/lumen-framework": "5.1.*",
         "illuminate/auth": "5.1.*",
         "illuminate/cache": "5.1.*",
         "illuminate/events": "5.1.*",

src/Routing/Adapter/Lumen.php

@@ -177,7 +177,7 @@ protected function createRouteCollections(array $versions)
     {
         foreach ($versions as $version) {
             if (! isset($this->routes[$version])) {
-                $this->routes[$version] = new RouteCollector($this->parser, $this->generator);
+                $this->routes[$version] = new RouteCollector($this->parser, clone $this->generator);
             }
         }
     }

src/Routing/Router.php

@@ -389,10 +389,10 @@ public function addRoute($methods, $uri, $action)
 
         $action = $this->mergeLastGroupAttributes($action);
 
-        $uri = $uri === '/' ? $uri : '/'.trim($uri, '/');
+        $uri = $uri === '/' ? $uri : trim($uri, '/');
 
         if (! empty($action['prefix'])) {
-            $uri = rtrim('/'.trim($action['prefix'], '/').'/'.trim($uri, '/'), '/');
+            $uri = rtrim(trim($action['prefix'], '/').'/'.trim($uri, '/'), '/');
 
             unset($action['prefix']);
         }

tests/Routing/Adapter/BaseAdapterTest.php

@@ -6,23 +6,19 @@
 use Dingo\Api\Http;
 use Dingo\Api\Routing\Router;
 use PHPUnit_Framework_TestCase;
-use Illuminate\Events\Dispatcher;
 use Illuminate\Container\Container;
-use Dingo\Api\Routing\Adapter\Laravel;
 use Dingo\Api\Tests\Stubs\MiddlewareStub;
-use Illuminate\Routing\Router as IlluminateRouter;
 
 abstract class BaseAdapterTest extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
         $this->container = new Container;
+        $this->container['Illuminate\Container\Container'] = $this->container;
         $this->container['api.auth'] = new MiddlewareStub;
         $this->container['api.limiting'] = new MiddlewareStub;
 
-        $class = $this->getAdapterClassName();
-
-        $this->adapter = new $class(new IlluminateRouter(new Dispatcher($this->container), $this->container));
+        $this->adapter = $this->getAdapterInstance();
         $this->exception = m::mock('Dingo\Api\Exception\Handler');
         $this->router = new Router($this->adapter, new Http\Parser\Accept('api', 'v1', 'json'), $this->exception, $this->container, null, null);
 
@@ -34,7 +30,7 @@ public function tearDown()
         m::close();
     }
 
-    abstract public function getAdapterClassName();
+    abstract public function getAdapterInstance();
 
     protected function createRequest($uri, $method, array $headers = [])
     {

tests/Routing/Adapter/LaravelTest.php

@@ -2,10 +2,14 @@
 
 namespace Dingo\Api\Tests\Routing\Adapter;
 
+use Illuminate\Routing\Router;
+use Illuminate\Events\Dispatcher;
+use Dingo\Api\Routing\Adapter\Laravel;
+
 class LaravelTest extends BaseAdapterTest
 {
-    public function getAdapterClassName()
+    public function getAdapterInstance()
     {
-        return 'Dingo\Api\Routing\Adapter\Laravel';
+        return new Laravel(new Router(new Dispatcher, $this->container));
     }
 }

tests/Routing/Adapter/LumenTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Dingo\Api\Tests\Routing\Adapter;
+
+use Laravel\Lumen\Application;
+use Dingo\Api\Routing\Adapter\Lumen;
+use FastRoute\RouteParser\Std as StdRouteParser;
+use FastRoute\Dispatcher\GroupCountBased as GcbDispatcher;
+use FastRoute\DataGenerator\GroupCountBased as GcbDataGenerator;
+
+class LumenTest extends BaseAdapterTest
+{
+    public function getAdapterInstance()
+    {
+        $app = new Application;
+
+        $app->routeMiddleware([
+            'api.auth' => get_class($this->container['api.auth']),
+            'api.limiting' => get_class($this->container['api.limiting'])
+        ]);
+
+        return new Lumen($app, new StdRouteParser, new GcbDataGenerator, GcbDispatcher::class);
+    }
+
+    public function testRoutesWithDomains()
+    {
+        $this->markTestSkipped('Lumen does not support sub-domain routing.');
+    }
+}

tests/Routing/RouterTest.php

@@ -13,9 +13,9 @@
 
 class RouterTest extends Adapter\BaseAdapterTest
 {
-    public function getAdapterClassName()
+    public function getAdapterInstance()
     {
-        return 'Dingo\Api\Tests\Stubs\RoutingAdapterStub';
+        return $this->container->make('Dingo\Api\Tests\Stubs\RoutingAdapterStub');
     }
 
     public function testRouteOptionsMergeCorrectly()