Fixing the addRouteFromFile in RouteServiceProvider

ARCANEDEV · Sep 9, 2015 · e603730 · e603730
1 parent c890b20
commit e603730
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/src/Laravel/Providers/RouteServiceProvider.php b/src/Laravel/Providers/RouteServiceProvider.php
@@ -138,20 +138,23 @@ private function checkRouteNamespace()
      * Add route from file.
      *
      * @param  SplFileInfo  $file
-     * @param  string       $needle
      */
-    private function addRouteFromFile(SplFileInfo $file, $needle = 'Routes\\')
+    private function addRouteFromFile(SplFileInfo $file)
     {
-        if ($file->isFile() && pathinfo($file, PATHINFO_EXTENSION) === 'php') {
-            $pos = strpos($file->getRealPath(), $needle);
-
-            if ($pos !== false) {
-                $route  = substr(
-                    str_replace('.php', '', $file->getRealPath()),
-                    $pos + strlen($needle)
-                );
-                $this->addRoute($route);
-            }
+        if (
+            ! $file->isFile() ||
+            pathinfo($file, PATHINFO_EXTENSION) !== 'php'
+        ) return;
+
+        $routeFolder = 'Routes' . DS;
+        $pos         = strpos($file->getRealPath(), $routeFolder);
+
+        if ($pos !== false) {
+            $route  = substr(
+                str_replace('.php', '', $file->getRealPath()),
+                $pos + strlen($routeFolder)
+            );
+            $this->addRoute($route);
         }
     }