improvement of the readability of the code, some adjustments

Author: Marc Cámara

composer.json

@@ -4,7 +4,7 @@
     "keywords": ["localization", "laravel", "php"],
     "homepage": "https://github.com/mcamara/laravel-localization",
     "license": "MIT",
-    "version": "0.14.4",
+    "version": "0.14.5",
     "authors": [
         {
             "name": "Marc Cámara",

src/Mcamara/LaravelLocalization/LaravelLocalization.php

@@ -65,7 +65,7 @@ class LaravelLocalization
 	/**
 	 * Name of the translation key of the current route, it is used for url translations
 	 *
-	 * @var array
+	 * @var array|string
 	 */
 	protected $routesNames = array();
 
@@ -254,20 +254,24 @@ public function localizeURL($url = null, $locale = null)
 	public function getLocalizedURL($locale = null, $url = null)
 	{
 		if ($locale !== false)
-    {   
-    	if (is_null($locale))
-      {
-          $locale = $this->getCurrentLocale();
-      }
-      else
-      {
-          $locales = $this->getSupportedLocales();
-          if (empty($locales[$locale]))
-          {
-              throw new UnsupportedLocaleException('Locale \'' . $locale . '\' is not in the list of supported locales.');
-          }
-      }
-    }
+		{   
+			if (is_null($locale))
+			{
+				$locale = $this->getCurrentLocale();
+			}
+			else
+			{
+				$locales = $this->getSupportedLocales();
+				if (empty($locales[$locale]))
+				{
+					throw new UnsupportedLocaleException('Locale \'' . $locale . '\' is not in the list of supported locales.');
+				}
+			}
+		}
+		else
+		{
+			$locale = $this->defaultLocale;
+		}
 
 		if (is_null($url) || !is_string($url))
 		{
@@ -280,20 +284,21 @@ public function getLocalizedURL($locale = null, $url = null)
 				$urlTranslated = $this->getURLFromRouteNameTranslated($locale);
 				if(!$urlTranslated)
 				{
-					return false;
+					return False;
 				}
 
 				$url = parse_url($url);
 				$urlTranslated = parse_url($urlTranslated);
-				$urlTranslated = array_merge($url,$urlTranslated);
+				$urlTranslated = array_merge($url, $urlTranslated);
 
 				return $this->unparse_url($urlTranslated);
 			}
 		}
 
         $base_path = Request::getBaseUrl();
 		$parsed_url = parse_url($url);
-		if (empty($parsed_url['path']))
+
+		if ( !$parsed_url || empty($parsed_url['path']) )
 		{
 			$path = $parsed_url['path'] = "";
 		}
@@ -385,7 +390,7 @@ public function getURLFromRouteNameTranslated($locale, $transKeysNames = array()
 		{
 			if ($this->translator->has($transKeyName,$locale))
 			{
-				$translation = $this->translator->trans($transKeyName,array(),array(),$locale);
+				$translation = $this->translator->trans($transKeyName, [], "", $locale);
 				$route = $route."/".$translation;
 
 				if (is_array($attributes))
@@ -746,9 +751,9 @@ public function transRoute($routeName)
 	/**
 	 * Returns the translation key for a given path
 	 *
-	 * @param  string $path [description]
+	 * @param  string $path 	Path to get the key translated
 	 *
-	 * @return string	   [description]
+	 * @return string|boolean 	Key for translation
 	 */
 	public function getRouteNameFromAPath($path)
 	{
@@ -759,18 +764,18 @@ public function getRouteNameFromAPath($path)
 		}
 		$path = str_replace('/' . $this->currentLocale . '/', '', $path);
 		$path = trim($path,"/");
-		$routesNames = array();
+		$routesNames = [];
 
 
         foreach ($this->translatedRoutes as $route)
         {
             if ($this->translator->trans($route) == $path)
             {
-                $routesNames[] = $route;
+                return $route;
             }
         }
 
-		return $routesNames;
+		return False;
 	}
 
 

src/Mcamara/LaravelLocalization/LaravelLocalizationServiceProvider.php

@@ -44,21 +44,18 @@ public function register()
                 $localeCode = $params[0];
                 $locales = $app['laravellocalization']->getSupportedLocales();
 
+                // Save any flashed data for redirect
+                Session::reflash();
+                
                 if (!empty($locales[$localeCode]))
                 {
                     if ($localeCode === $defaultLocale && $app['laravellocalization']->hideDefaultLocaleInURL())
                     {
-                    	// Save any flashed data for redirect
-                    	Session::reflash();
-
                         return Redirect::to($app['laravellocalization']->getNonLocalizedURL(), 307)->header('Vary','Accept-Language');
                     }
                 }
                 else if ($currentLocale !== $defaultLocale || !$app['laravellocalization']->hideDefaultLocaleInURL())
                 {
-                    // Save any flashed data for redirect
-                    Session::reflash();
-
                     // If the current url does not contain any locale
                     // The system redirect the user to the very same url "localized"
                     // we use the current locale to redirect him