Revert de7bbb4.

Going to approach this from a different angle as it caused more
problems than it solved.

Author: jasonlewis

src/Provider/LaravelServiceProvider.php

@@ -18,6 +18,8 @@ class LaravelServiceProvider extends DingoServiceProvider
      */
     public function boot()
     {
+        parent::boot();
+
         $this->publishes([realpath(__DIR__.'/../../config/api.php') => config_path('api.php')]);
 
         $kernel = $this->app->make('Illuminate\Contracts\Http\Kernel');
@@ -34,7 +36,9 @@ public function boot()
             $this->updateRouterBindings();
         });
 
-        parent::boot();
+        $this->app['router']->middleware('api.auth', 'Dingo\Api\Http\Middleware\Auth');
+        $this->app['router']->middleware('api.throttle', 'Dingo\Api\Http\Middleware\RateLimit');
+        $this->app['router']->middleware('api.controllers', 'Dingo\Api\Http\Middleware\PrepareController');
     }
 
     /**
@@ -95,26 +99,10 @@ public function register()
     protected function registerRouterAdapter()
     {
         $this->app->singleton('api.router.adapter', function ($app) {
-            return new LaravelAdapter($app, $this->cloneLaravelRouter(), $app['router']->getRoutes());
+            return new LaravelAdapter($app['router']);
         });
     }
 
-    /**
-     * Clone the Laravel router and set the middleware on the cloned router.
-     *
-     * @return \Illuminate\Routing\Router
-     */
-    protected function cloneLaravelRouter()
-    {
-        $router = clone $this->app['router'];
-
-        $router->middleware('api.auth', 'Dingo\Api\Http\Middleware\Auth');
-        $router->middleware('api.throttle', 'Dingo\Api\Http\Middleware\RateLimit');
-        $router->middleware('api.controllers', 'Dingo\Api\Http\Middleware\PrepareController');
-
-        return $router;
-    }
-
     /**
      * Add the request middleware to the beginning of the kernel.
      *

src/Provider/LumenServiceProvider.php

@@ -16,6 +16,8 @@ class LumenServiceProvider extends DingoServiceProvider
      */
     public function boot()
     {
+        parent::boot();
+
         $this->app->configure('api');
 
         $reflection = new ReflectionClass($this->app);
@@ -45,8 +47,6 @@ public function boot()
             'api.throttle' => 'Dingo\Api\Http\Middleware\RateLimit',
             'api.controllers' => 'Dingo\Api\Http\Middleware\PrepareController',
         ]);
-
-        parent::boot();
     }
 
     /**

src/Routing/Adapter/Laravel.php

@@ -34,26 +34,29 @@ class Laravel implements Adapter
     protected $routes = [];
 
     /**
-     * Application routes.
+     * Array of merged old routes and API routes.
+     *
+     * @var array
+     */
+    protected $mergedRoutes = [];
+
+    /**
+     * Routes already defined on the router.
      *
      * @var \Illuminate\Routing\RouteCollection
      */
-    protected $applicationRoutes = [];
+    protected $oldRoutes;
 
     /**
      * Create a new laravel routing adapter instance.
      *
-     * @param \Illuminate\Contracts\Container\Container $container
-     * @param \Illuminate\Routing\Router                $router
-     * @param \Illuminate\Routing\RouteCollection       $applicationRoutes
+     * @param \Illuminate\Routing\Router $router
      *
      * @return void
      */
-    public function __construct(Container $container, Router $router, RouteCollection $applicationRoutes)
+    public function __construct(Router $router)
     {
-        $this->container = $container;
         $this->router = $router;
-        $this->applicationRoutes = $applicationRoutes;
     }
 
     /**
@@ -70,16 +73,37 @@ public function dispatch(Request $request, $version)
             throw new UnknownVersionException;
         }
 
-        $this->router->setRoutes($this->routes[$version]);
+        $routes = $this->mergeOldRoutes($version);
 
-        // Because the above call will reset the routes defined on the applications
-        // UrlGenerator we will simply rebind the routes to the application
-        // container which will trigger the rebinding event.
-        $this->container->instance('routes', $this->applicationRoutes);
+        $this->router->setRoutes($routes);
 
         return $this->router->dispatch($request);
     }
 
+    /**
+     * Merge the old application routes with the API routes.
+     *
+     * @param string $version
+     *
+     * @return array
+     */
+    protected function mergeOldRoutes($version)
+    {
+        if (! isset($this->oldRoutes)) {
+            $this->oldRoutes = $this->router->getRoutes();
+        }
+
+        if (! isset($this->mergedRoutes[$version])) {
+            $this->mergedRoutes[$version] = $this->routes[$version];
+
+            foreach ($this->oldRoutes as $route) {
+                $this->mergedRoutes[$version]->add($route);
+            }
+        }
+
+        return $this->mergedRoutes[$version];
+    }
+
     /**
      * Get the URI, methods, and action from the route.
      *

src/Routing/Route.php

@@ -25,12 +25,7 @@ class Route
      */
     protected $container;
 
-    /**
-     * Request instance.
-     *
-     * @var \Illuminate\Http\Request
-     */
-    protected $request;
+    protected $route;
 
     /**
      * Route URI.
@@ -144,6 +139,7 @@ public function __construct(Adapter $adapter, Container $container, Request $req
     {
         $this->adapter = $adapter;
         $this->container = $container;
+        $this->route = $route;
 
         $this->setupRouteProperties($request, $route);
     }
@@ -628,4 +624,14 @@ public function domain()
     {
         return Arr::get($this->action, 'domain');
     }
+
+    /**
+     * Get the original route.
+     *
+     * @return array|\Illuminate\Routing\Route
+     */
+    public function getOriginalRoute()
+    {
+        return $this->route;
+    }
 }