Revert "Update UrlGenerator to fully extend Illuminates UrlGenerator."

This reverts commit 68eac66.

Author: hskrasek

src/Provider/RoutingServiceProvider.php

@@ -48,23 +48,7 @@ protected function registerRouter()
     protected function registerUrlGenerator()
     {
         $this->app->singleton('api.url', function ($app) {
-            $routes = $app['router']->getRoutes();
-
-            $app->instance('routes', $routes);
-
-            $url = new UrlGenerator(
-                $routes, $app->rebinding(
-                    'request', $this->requestRebinder()
-                )
-            );
-
-            $url->setSessionResolver(function () {
-                return $this->app['session'];
-            });
-
-            $app->rebinding('routes', function ($app, $routes) {
-                $app['url']->setRoutes($routes);
-            });
+            $url = new UrlGenerator($app['request']);
 
             $url->setRouteCollections($app['Dingo\Api\Routing\Router']->getRoutes());
 

src/Routing/UrlGenerator.php

@@ -3,7 +3,6 @@
 namespace Dingo\Api\Routing;
 
 use Illuminate\Http\Request;
-use Illuminate\Routing\RouteCollection as IlluminateRouteCollection;
 use Illuminate\Routing\UrlGenerator as IlluminateUrlGenerator;
 
 class UrlGenerator extends IlluminateUrlGenerator
@@ -18,12 +17,13 @@ class UrlGenerator extends IlluminateUrlGenerator
     /**
      * Create a new URL generator instance.
      *
-     * @param \Illuminate\Routing\RouteCollection $routes
-     * @param \Dingo\Api\Http\Request|Request     $request
+     * @param \Dingo\Api\Http\Request $request
+     *
+     * @return void
      */
-    public function __construct(IlluminateRouteCollection $routes, Request $request)
+    public function __construct(Request $request)
     {
-        parent::__construct($routes, $request);
+        $this->setRequest($request);
     }
 
     /**