code cleaning

laravel · Jul 18, 2016 · a8ca2b7 · CupOfTea696 · Jul 19, 2016 · taylorotwell
1 parent d01a835
commit a8ca2b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Illuminate/Routing/UrlGenerator.php b/src/Illuminate/Routing/UrlGenerator.php
@@ -138,9 +138,14 @@ public function previous($fallback = false)
         $referrer = $this->request->headers->get('referer');
 
         $url = $referrer ? $this->to($referrer) : $this->getPreviousUrlFromSession();
-        $fallback = value($fallback) ?: $this->to('/');
 
-        return $url ?: $fallback;
+        if ($url) {
+            return $url;
+        } elseif ($fallback) {
+            return $this->to($fallback);
+        } else {
+            return $this->to('/');
+        }
     }
 
     /**

diff --git a/tests/Routing/RoutingUrlGeneratorTest.php b/tests/Routing/RoutingUrlGeneratorTest.php
@@ -370,9 +370,7 @@ public function testPrevious()
         $url->getRequest()->headers->remove('referer');
         $this->assertEquals($url->to('/'), $url->previous());
 
-        $this->assertEquals($url->to('/foo'), $url->previous(function () use ($url) {
-            return $url->to('/foo');
-        }));
+        $this->assertEquals($url->to('/foo'), $url->previous('/foo'));
     }
 }