Fixing doc comments & other stuff

ARCANEDEV · Sep 13, 2015 · 611087e · 611087e
1 parent 93521d3
commit 611087e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/src/Contracts/LocalizationInterface.php b/src/Contracts/LocalizationInterface.php
@@ -101,7 +101,7 @@ public function setBaseUrl($url);
     /**
      * Set current route name.
      *
-     * @param  string  $routeName
+     * @param  false|string  $routeName
      */
     public function setRouteName($routeName);
 

diff --git a/src/Localization.php b/src/Localization.php
@@ -318,11 +318,13 @@ public function setBaseUrl($url)
     /**
      * Set current route name.
      *
-     * @param  string  $routeName
+     * @param  false|string  $routeName
      */
     public function setRouteName($routeName)
     {
-        $this->routeName = $routeName;
+        if (is_string($routeName)) {
+            $this->routeName = $routeName;
+        }
     }
 
     /* ------------------------------------------------------------------------------------------------

diff --git a/src/Middleware/LocaleCookieRedirect.php b/src/Middleware/LocaleCookieRedirect.php
@@ -50,11 +50,12 @@ public function handle(Request $request, Closure $next )
             )
         ) {
             app('session')->reflash();
-            $redirection = localization()->getLocalizedURL($locale);
 
-            return new RedirectResponse($redirection, 302, [
-                'Vary' => 'Accept-Language'
-            ]);
+            if (is_string($redirection = localization()->getLocalizedURL($locale))) {
+                return new RedirectResponse($redirection, 302, [
+                    'Vary' => 'Accept-Language'
+                ]);
+            }
         }
 
         return $next($request);

diff --git a/src/Middleware/LocaleSessionRedirect.php b/src/Middleware/LocaleSessionRedirect.php
@@ -50,11 +50,12 @@ public function handle(Request $request, Closure $next)
             )
         ) {
             app('session')->reflash();
-            $redirection = localization()->getLocalizedURL($locale);
 
-            return new RedirectResponse($redirection, 302, [
-                'Vary' => 'Accept-Language'
-            ]);
+            if (is_string($redirection = localization()->getLocalizedURL($locale))) {
+                return new RedirectResponse($redirection, 302, [
+                    'Vary' => 'Accept-Language'
+                ]);
+            }
         }
 
         return $next($request);