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

Merge pull request #97 from fschwaiger/feature/basic-valet-driver-docroot

Browse Source 
Set DOCUMENT_ROOT correctly when serving index.php files.
This commit is contained in:
Adam Wathan
2016-08-15 21:23:39 -04:00
committed by GitHub
parent 15b2ecb876 d9adae9d37
commit bf463da7ec
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cli/drivers/BasicValetDriver.php
View File

@@ -54,20 +54,22 @@ public function frontControllerPath($sitePath, $siteName, $uri)
if ($this->isActualFile($candidate)) { if ($this->isActualFile($candidate)) {
$_SERVER['SCRIPT_FILENAME'] = $candidate; $_SERVER['SCRIPT_FILENAME'] = $candidate;
$_SERVER['SCRIPT_NAME'] = str_replace($sitePath, '', $candidate); $_SERVER['SCRIPT_NAME'] = str_replace($sitePath, '', $candidate);
$_SERVER['DOCUMENT_ROOT'] = $sitePath;
return $candidate; return $candidate;
} }
} }
$fixedCandidates = [ $fixedCandidatesAndDocroots = [
$this->asRootPhpIndexFile($sitePath), $this->asRootPhpIndexFile($sitePath) => $sitePath,
$this->asPublicPhpIndexFile($sitePath), $this->asPublicPhpIndexFile($sitePath) => $sitePath . '/public',
$this->asPublicHtmlIndexFile($sitePath), $this->asPublicHtmlIndexFile($sitePath) => $sitePath . '/public',
]; ];
foreach ($fixedCandidates as $candidate) { foreach ($fixedCandidatesAndDocroots as $candidate => $docroot) {
if ($this->isActualFile($candidate)) { if ($this->isActualFile($candidate)) {
$_SERVER['SCRIPT_FILENAME'] = $candidate; $_SERVER['SCRIPT_FILENAME'] = $candidate;
$_SERVER['SCRIPT_NAME'] = '/index.php'; $_SERVER['SCRIPT_NAME'] = '/index.php';
$_SERVER['DOCUMENT_ROOT'] = $docroot;
return $candidate; return $candidate;
} }
} }