Inject a new router instance into the Laravel adapter.

Instead of using the existing Laravel router we will use a new instance. This
should prevent the APIs internal dispatcher from overriding the current route
on the actual Laravel router instance.

There does not seem to be any need for the router instance that is injected
into the adapter to be the actual Laravel router, as the adapter just needs
an instance to dispatch the API-only routes.

Author: jasonlewis

src/Provider/LaravelServiceProvider.php

@@ -3,6 +3,7 @@
 namespace Dingo\Api\Provider;
 
 use ReflectionClass;
+use Illuminate\Routing\Router;
 use Illuminate\Contracts\Http\Kernel;
 use Dingo\Api\Routing\Adapter\Laravel as LaravelAdapter;
 
@@ -41,7 +42,7 @@ public function register()
         $this->addRequestMiddlewareToBeginning($kernel);
 
         $this->app->singleton('api.router.adapter', function ($app) {
-            return new LaravelAdapter($app['router']);
+            return new LaravelAdapter(new Router($app['events'], $app));
         });
     }
 

src/Routing/Adapter/Laravel.php

@@ -25,13 +25,6 @@ class Laravel implements Adapter
      */
     protected $routes = [];
 
-    /**
-     * Old routes already defined on the router.
-     *
-     * @var \Illuminate\Routing\RouteCollection
-     */
-    protected $oldRoutes;
-
     /**
      * Create a new laravel routing adapter instance.
      *
@@ -58,33 +51,11 @@ public function dispatch(Request $request, $version)
             throw new UnknownVersionException;
         }
 
-        $routes = $this->mergeExistingRoutes($this->routes[$version]);
-
-        $this->router->setRoutes($routes);
+        $this->router->setRoutes($this->routes[$version]);
 
         return $this->router->dispatch($request);
     }
 
-    /**
-     * Merge the existing routes with the new routes.
-     *
-     * @param \Illuminate\Routing\RouteCollection $routes
-     *
-     * @return \Illuminate\Routing\RouteCollection
-     */
-    protected function mergeExistingRoutes(RouteCollection $routes)
-    {
-        if (! isset($this->oldRoutes)) {
-            $this->oldRoutes = $this->router->getRoutes();
-        }
-
-        foreach ($this->oldRoutes as $route) {
-            $routes->add($route);
-        }
-
-        return $routes;
-    }
-
     /**
      * Get the URI, methods, and action from the route.
      *