Fixes route urls building from Artisan for websites under sub-path

Alexander Obuhovich · Alexander Obuhovich · commit 34307581495e · 2017-08-27T18:40:36.000+03:00
diff --git a/src/Illuminate/Foundation/Bootstrap/SetRequestForConsole.php b/src/Illuminate/Foundation/Bootstrap/SetRequestForConsole.php
@@ -15,8 +15,15 @@ class SetRequestForConsole
      */
     public function bootstrap(Application $app)
     {
-        $app->instance('request', Request::create(
-            $app->make('config')->get('app.url', 'http://localhost'), 'GET', [], [], [], $_SERVER
-        ));
+        $uri = $app->make('config')->get('app.url', 'http://localhost');
+        $components = parse_url($uri);
+        $server = $_SERVER;
+
+        if (isset($components['path'])) {
+            $server['SCRIPT_FILENAME'] = $components['path'];
+            $server['SCRIPT_NAME'] = $components['path'];
+        }
+
+        $app->instance('request', Request::create($uri, 'GET', [], [], [], $server));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,15 @@ class SetRequestForConsole`
`15`	`15`	`*/`
`16`	`16`	`public function bootstrap(Application $app)`
`17`	`17`	`{`
`18`		`- $app->instance('request', Request::create(`
`19`		`- $app->make('config')->get('app.url', 'http://localhost'), 'GET', [], [], [], $_SERVER`
`20`		`- ));`
	`18`	`+ $uri = $app->make('config')->get('app.url', 'http://localhost');`
	`19`	`+ $components = parse_url($uri);`
	`20`	`+ $server = $_SERVER;`
	`21`	`+`
	`22`	`+ if (isset($components['path'])) {`
	`23`	`+ $server['SCRIPT_FILENAME'] = $components['path'];`
	`24`	`+ $server['SCRIPT_NAME'] = $components['path'];`
	`25`	`+ }`
	`26`	`+`
	`27`	`+ $app->instance('request', Request::create($uri, 'GET', [], [], [], $server));`
`21`	`28`	`}`
`22`	`29`	`}`