[5.6] fix for route url generator when request()->basePath exists (#2…

…4074)

* make sure Route::to() also removes the request base path

* update implementation, add tests

* update SCRIPT_FILENAME to avoid ambiguity

src/Illuminate/Routing/RouteUrlGenerator.php

@@ -96,7 +96,13 @@ public function to($route, $parameters = [], $absolute = false)
         $uri = strtr(rawurlencode($uri), $this->dontEncode);
 
         if (! $absolute) {
-            return '/'.ltrim(preg_replace('#^(//|[^/?])+#', '', $uri), '/');
+            $uri = preg_replace('#^(//|[^/?])+#', '', $uri);
+
+            if ($base = $this->request->getBasePath()) {
+                $uri = preg_replace('#^'.$base.'#i', '', $uri);
+            }
+
+            return '/'.ltrim($uri, '/');
         }
 
         return $uri;

tests/Routing/RoutingUrlGeneratorTest.php

@@ -64,6 +64,25 @@ public function testBasicGenerationWithHostFormatting()
         $this->assertEquals('/named-route', $url->route('plain', [], false));
     }
 
+    public function testBasicGenerationWithRequestBasePath()
+    {
+        $request = Request::create('http://www.foo.com/subfolder/foo/bar/subfolder/');
+
+        $request->server->set('SCRIPT_FILENAME', '/var/www/laravel-project/public/subfolder/index.php');
+        $request->server->set('PHP_SELF', '/subfolder/index.php');
+
+        $url = new UrlGenerator(
+            $routes = new RouteCollection,
+            $request
+        );
+
+        $route = new Route(['GET'], 'foo/bar/subfolder', ['as' => 'foobar']);
+        $routes->add($route);
+
+        $this->assertEquals('/subfolder', $request->getBasePath());
+        $this->assertEquals('/foo/bar/subfolder', $url->route('foobar', [], false));
+    }
+
     public function testBasicGenerationWithPathFormatting()
     {
         $url = new UrlGenerator(