Use only generateFromUrl()

Author: ivanvermeyen

src/LocalizedUrlGenerator.php

@@ -46,9 +46,7 @@ public function __construct()
      */
     public function generateFromRequest($locale = null, $parameters = null, $absolute = true)
     {
-        return ($this->isDefault404() || $this->isNonLocalizedFallback404() || ! $this->routeHasName())
-            ? $this->generateFromUrl($locale, $parameters, $absolute)
-            : $this->generateFromRoute($locale, $parameters, $absolute);
+        return $this->generateFromUrl($locale, $parameters, $absolute);
     }
 
     /**
@@ -114,6 +112,10 @@ protected function generateFromUrl($locale = null, $parameters = null, $absolute
             return $currentUrl;
         }
 
+        if ( ! $this->isNonLocalizedFallback404() && ! $this->isLocalized()) {
+            return URL::current();
+        }
+
         $locale = $locale ?: App::getLocale();
         $urlParts = parse_url($currentUrl);
         $domains = $this->getCustomDomains();
@@ -135,26 +137,6 @@ protected function generateFromUrl($locale = null, $parameters = null, $absolute
         return $this->unparseUrl($urlParts);
     }
 
-    /**
-     * Generate a localized URL using the current Route instance.
-     *
-     * @param string|null $locale
-     * @param mixed $parameters
-     * @param bool $absolute
-     *
-     * @return string
-     */
-    protected function generateFromRoute($locale = null, $parameters = null, $absolute = true)
-    {
-        if ( ! $this->isLocalized()) {
-            return URL::current();
-        }
-
-        $parameters = $this->prepareParameters($locale, $parameters);
-
-        return route($this->route->getName(), $parameters, $absolute, $locale);
-    }
-
     /**
      * Localize the URL path.
      *