More fixes to readability, getRouteNameFromAPath returns array

Author: mcamara

phpunit.xml

@@ -15,4 +15,4 @@
             <directory suffix=".php">./tests/</directory>
         </testsuite>
     </testsuites>
-</phpunit>
+</phpunit>

src/Mcamara/LaravelLocalization/Facades/LaravelLocalization.php

@@ -14,4 +14,4 @@ protected static function getFacadeAccessor()
 		return 'laravellocalization';
 	}
 
-}
+}

src/Mcamara/LaravelLocalization/LaravelLocalization.php

@@ -8,7 +8,6 @@
 use Session;
 use Cookie;
 use App;
-use View;
 use Config;
 
 class LaravelLocalization
@@ -65,7 +64,7 @@ class LaravelLocalization
 	/**
 	 * Name of the translation key of the current route, it is used for url translations
 	 *
-	 * @var array|string
+	 * @var array
 	 */
 	protected $routesNames = array();
 
@@ -170,7 +169,7 @@ public function setLocale($locale = null)
 	 * @param  boolean $abbr 			Should languages be abbreviate to their locale codes?
 	 * @param  string $customView 		Which template should the language bar have?
 	 *
-	 * @return string 					Returns an html view with a language bar
+	 * @return \Illuminate\View\View 	Returns an html view with a language bar
      *
      * @deprecated will be removed in v1.0 please see updated readme for details on making your own language bar template.
 	 */
@@ -344,10 +343,10 @@ public function getLocalizedURL($locale = null, $url = null)
 	 * Returns an URL adapted to the route name and the locale given
 	 *
 	 * @param  string $locale 			Locale to adapt
-	 * @param  string $transKeyName  	Translation key name of the url to adapt
+	 * @param  string $transKeysNames  	Translation key name of the url to adapt
 	 * @param  array $attributes  		Attributes for the route (only needed if transKeyName needs them)
 	 *
-	 * @return string|boolean 			URL translated
+	 * @return string|false 			URL translated
 	 */
 	public function getURLFromRouteNameTranslated($locale, $transKeysNames = array(), $attributes = array())
 	{
@@ -718,17 +717,32 @@ public function getTranslatedRoutes()
 
 	/**
 	 * Set current route name
-	 * @param string $name  current route name
+	 * @param string|array $routeNames  current route name
 	 */
-	public function setRouteName($name, $add = false)
+	public function setRouteName($routeNames, $add = false)
 	{
 		if ($add)
 		{
-			$this->routesNames[] = $name;
+			if(is_string($routeNames))
+			{
+				$this->routesNames[] = $routeNames;
+			}
+			else
+			{
+				$this->routesNames = array_merge($this->routesNames, $routeNames);
+			}
 		}
 		else
 		{
-			$this->routesNames = $name;
+			if(is_string($routeNames))
+			{
+				$this->routesNames = [];
+				$this->routesNames[] = $routeNames;
+			}
+			else
+			{
+				$this->routesNames = $routeNames;
+			}
 		}
 	}
 
@@ -753,7 +767,7 @@ public function transRoute($routeName)
 	 *
 	 * @param  string $path 	Path to get the key translated
 	 *
-	 * @return string|boolean 	Key for translation
+	 * @return arrays 			Keys for translation
 	 */
 	public function getRouteNameFromAPath($path)
 	{
@@ -766,16 +780,15 @@ public function getRouteNameFromAPath($path)
 		$path = trim($path,"/");
 		$routesNames = [];
 
-
         foreach ($this->translatedRoutes as $route)
         {
             if ($this->translator->trans($route) == $path)
             {
-                return $route;
+                $routesNames[] = $route;
             }
         }
 
-		return False;
+		return $routesNames;
 	}
 
 
@@ -955,8 +968,3 @@ public function negotiateLanguage()
 	}
 
 }
-
-class UnsupportedLocaleException extends Exception
-{
-
-}

src/Mcamara/LaravelLocalization/UnsupportedLocaleException.php

@@ -0,0 +1,8 @@
+<?php namespace Mcamara\LaravelLocalization;
+
+use Exception;
+
+class UnsupportedLocaleException extends Exception
+{
+
+}