phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-05 08:30:07 +01:00
Code Activity

fixing statamic installer

Browse Source
This commit is contained in:
Taylor Otwell
2016-05-06 09:17:22 -05:00
parent 49cdcea51c
commit fdf126990b
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/StatamicValetDriver.php
View File

@@ -54,6 +54,18 @@ public function frontControllerPath($sitePath, $siteName, $uri)
$_SERVER['SCRIPT_NAME'] = '/index.php';
if (strpos($_SERVER['REQUEST_URI'], '/index.php') === 0) {
$_SERVER['REQUEST_URI'] = substr($_SERVER['REQUEST_URI'], 10);
}
if ($uri === '') {
$uri = '/';
}
if ($uri === '/installer.php') {
return $sitePath.'/installer.php';
}
if (file_exists($indexPath = $sitePath.'/index.php')) {
return $indexPath;
}

4
drivers/ValetDriver.php
View File

@@ -45,10 +45,10 @@ public static function assign($sitePath, $siteName, $uri)
$drivers = static::driversIn(VALET_HOME_PATH.'/Drivers');
$drivers[] = 'LaravelValetDriver';
$drivers[] = 'StatamicValetDriver';
$drivers[] = 'JigsawValetDriver';
$drivers[] = 'WordPressValetDriver';
$drivers[] = 'CraftValetDriver';
$drivers[] = 'StatamicValetDriver';
$drivers[] = 'JigsawValetDriver';
$drivers[] = 'StaticValetDriver';
foreach ($drivers as $driver) {

10
server.php
View File

@@ -74,7 +74,15 @@ function show_valet_404()
*/
$uri = $valetDriver->mutateUri($uri);
if ($uri !== '/' && $staticFilePath = $valetDriver->isStaticFile($valetSitePath, $siteName, $uri)) {
$valetPathInfo = pathinfo($uri);
$isPhpFile = false;
if (isset($valetPathInfo['extension']) && $valetPathInfo['extension'] === 'php') {
$isPhpFile = true;
}
if ($uri !== '/' && ! $isPhpFile && $staticFilePath = $valetDriver->isStaticFile($valetSitePath, $siteName, $uri)) {
return $valetDriver->serveStaticFile($staticFilePath, $valetSitePath, $siteName, $uri);
}