Update code that resolves the custom UrlGenerator (#77)

Author: ivanvermeyen

src/Illuminate/Routing/UrlGenerator.php

@@ -2,31 +2,13 @@
 
 namespace CodeZero\LocalizedRoutes\Illuminate\Routing;
 
-use Illuminate\Http\Request;
-use Illuminate\Routing\RouteCollection;
 use Illuminate\Routing\UrlGenerator as BaseUrlGenerator;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Route;
 
 class UrlGenerator extends BaseUrlGenerator
 {
-    /**
-     * Create a new URL Generator instance.
-     *
-     * @param \Illuminate\Routing\RouteCollection $routes
-     * @param \Illuminate\Http\Request $request
-     * @param string $assetRoot
-     */
-    public function __construct($routes, Request $request, $assetRoot = null)
-    {
-        if (!$routes instanceof RouteCollection && !(interface_exists('\Illuminate\Routing\RouteCollectionInterface') && is_subclass_of($routes, '\Illuminate\Routing\RouteCollectionInterface'))) {
-            throw new \InvalidArgumentException('The $routes parameter has to be of type RouteCollection or RouteCollectionInterface for L6+.');
-        }
-
-        parent::__construct($routes, $request, $assetRoot);
-    }
-
     /**
      * Resolve the URL to a named route or a localized version of it.
      *

src/LocalizedRoutesServiceProvider.php

@@ -9,7 +9,7 @@
 use CodeZero\LocalizedRoutes\Macros\Route\LocalizedMacro;
 use CodeZero\LocalizedRoutes\Macros\Route\LocalizedUrlMacro;
 use CodeZero\Localizer\LocalizerServiceProvider;
-use Illuminate\Container\Container;
+use Illuminate\Contracts\Routing\UrlGenerator as UrlGeneratorContract;
 use Illuminate\Support\ServiceProvider;
 
 class LocalizedRoutesServiceProvider extends ServiceProvider
@@ -92,10 +92,8 @@ protected function registerProviders()
     }
 
     /**
-     * Register the URL generator service.
-     *
-     * The UrlGenerator class that is instantiated is determined
-     * by the "use" statement at the top of this file.
+     * Register a custom URL generator that extends the one that comes with Laravel.
+     * This will override a few methods that enables us to generate localized URLs.
      *
      * This method is an exact copy from:
      * \Illuminate\Routing\RoutingServiceProvider
@@ -104,24 +102,22 @@ protected function registerProviders()
      */
     protected function registerUrlGenerator()
     {
-        $this->app->singleton('url', function () {
-            $app = Container::getInstance();
-
+        $this->app->singleton('url', function ($app) {
             $routes = $app['router']->getRoutes();
 
             // The URL generator needs the route collection that exists on the router.
             // Keep in mind this is an object, so we're passing by references here
             // and all the registered routes will be available to the generator.
             $app->instance('routes', $routes);
 
-            $url = $app->make(UrlGenerator::class, [
-                'routes' => $routes,
-                'request' => $app->rebinding(
+            return new UrlGenerator(
+                $routes, $app->rebinding(
                     'request', $this->requestRebinder()
-                ),
-                'assetRoot' => $app['config']['app.asset_url']
-            ]);
+                ), $app['config']['app.asset_url']
+            );
+        });
 
+        $this->app->extend('url', function (UrlGeneratorContract $url, $app) {
             // Next we will set a few service resolvers on the URL generator so it can
             // get the information it needs to function. This just provides some of
             // the convenience features to this URL generator like "signed" URLs.