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

Improve GenericPhpValetDriver, remove unnecessary check in WP driver

Browse Source
This commit is contained in:
Adam Wathan
2016-05-06 15:05:46 -04:00
parent 626e8210df
commit 55bfd79943
2 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/GenericPhpValetDriver.php
View File

@@ -28,7 +28,7 @@ public function isStaticFile($sitePath, $siteName, $uri)
{ {
if (file_exists($staticFilePath = $sitePath.'/public'.$uri)) { if (file_exists($staticFilePath = $sitePath.'/public'.$uri)) {
return $staticFilePath; return $staticFilePath;
} elseif (file_exists($staticFilePath = $sitePath.$uri)) { } elseif (file_exists($staticFilePath = $sitePath.$uri) && ! is_dir($staticFilePath)) {
return $staticFilePath; return $staticFilePath;
} }
@@ -45,14 +45,50 @@ public function isStaticFile($sitePath, $siteName, $uri)
*/ */
public function frontControllerPath($sitePath, $siteName, $uri) public function frontControllerPath($sitePath, $siteName, $uri)
{ {
if (file_exists($frontControllerPath = $sitePath.'/public/index.php')) { $candidates = [
$_SERVER['SCRIPT_FILENAME'] = $sitePath.'/public/index.php'; $this->asActualFile($sitePath, $uri),
$_SERVER['SCRIPT_NAME'] = '/index.php'; $this->asIndexFileInDirectory($sitePath, $uri),
} elseif (file_exists($frontControllerPath = $sitePath.'/index.php')) { ];
$_SERVER['SCRIPT_FILENAME'] = $sitePath.'/index.php';
$_SERVER['SCRIPT_NAME'] = '/index.php'; foreach ($candidates as $candidate) {
if ($this->isActualFile($candidate)) {
$_SERVER['SCRIPT_FILENAME'] = $candidate;
$_SERVER['SCRIPT_NAME'] = str_replace($sitePath, '', $candidate);
return $candidate;
}
} }
return $frontControllerPath; $candidates = [
$this->asPublicIndexFile($sitePath, $uri),
// ...and other possible public prefixes
];
foreach ($candidates as $candidate) {
if ($this->isActualFile($candidate)) {
$_SERVER['SCRIPT_FILENAME'] = $candidate;
$_SERVER['SCRIPT_NAME'] = '/index.php';
return $candidate;
}
}
}
protected function isActualFile($path)
{
return file_exists($path) && ! is_dir($path);
}
protected function asActualFile($sitePath, $uri)
{
return $sitePath.$uri;
}
protected function asIndexFileInDirectory($sitePath, $uri)
{
return $sitePath.rtrim($uri, '/').'/index.php';
}
protected function asPublicIndexFile($sitePath, $uri)
{
return $sitePath.'/public/index.php';
} }
} }

3
drivers/WordPressValetDriver.php
View File

@@ -26,8 +26,7 @@ public function serves($sitePath, $siteName, $uri)
public function isStaticFile($sitePath, $siteName, $uri) public function isStaticFile($sitePath, $siteName, $uri)
{ {
if (file_exists($sitePath.$uri) && if (file_exists($sitePath.$uri) &&
! is_dir($sitePath.$uri) && ! is_dir($sitePath.$uri)) {
pathinfo($sitePath.$uri)['extension'] != 'php') {
return $sitePath.$uri; return $sitePath.$uri;
} }