diff --git a/bootstrap/paths.php b/bootstrap/paths.php new file mode 100644 index 000000000..c4a965e75 --- /dev/null +++ b/bootstrap/paths.php @@ -0,0 +1,42 @@ + __DIR__.'/../app', + + /* + |-------------------------------------------------------------------------- + | Public Path + |-------------------------------------------------------------------------- + | + | We understand that not all hosting environments allow flexibility with + | public paths. That's why we allow you to change where your public path + | is below. + | + */ + + 'public' => __DIR__.'/../public', + + /* + |-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + | Base Path + |-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + | + | You probably shouldn't be editing this. + | + */ + + 'base' => __DIR__.'/..', + +); diff --git a/bootstrap/start.php b/bootstrap/start.php index 25e906530..643e10175 100644 --- a/bootstrap/start.php +++ b/bootstrap/start.php @@ -15,18 +15,21 @@ /* |-------------------------------------------------------------------------- -| Define The Application Path +| Bind Paths |-------------------------------------------------------------------------- | -| Here we just defined the path to the application directory. Most likely -| you will never need to change this value as the default setup should -| work perfectly fine for the vast majority of all our applications. +| Here we are binding the paths configured in paths.php to the app. You +| should not be changing these here but rather in paths.php. | */ -$app->instance('path', $appPath = __DIR__.'/../app'); +$paths = require __DIR__.'/paths.php'; -$app->instance('path.base', __DIR__.'/..'); +$app->instance('path', $appPath = $paths['app']); + +$app->instance('path.base', $paths['base']); + +$app->instance('path.public', $paths['public']); /* |-------------------------------------------------------------------------- diff --git a/composer.json b/composer.json index d4a91bf9e..9afd6c00f 100644 --- a/composer.json +++ b/composer.json @@ -12,4 +12,4 @@ ] }, "minimum-stability": "dev" -} \ No newline at end of file +} diff --git a/server.php b/server.php index 2084099cc..5f187f344 100644 --- a/server.php +++ b/server.php @@ -4,7 +4,9 @@ $uri = urldecode($uri); -$requested = __DIR__.'/public'.$uri; +$paths = require __DIR__.'/bootstrap/paths.php'; + +$requested = $paths['public'].$uri; // This file allows us to emulate Apache's "mod_rewrite" functionality from the // built-in PHP web server. This provides a convenient way to test a Laravel @@ -14,4 +16,4 @@ return false; } -require_once(__DIR__ . '/public/index.php'); \ No newline at end of file +require_once $paths['public'].'/index.php';