diff --git a/cli/Valet/Drivers/Specific/CraftValetDriver.php b/cli/Valet/Drivers/Specific/CraftValetDriver.php index 57a68a5..d640bea 100644 --- a/cli/Valet/Drivers/Specific/CraftValetDriver.php +++ b/cli/Valet/Drivers/Specific/CraftValetDriver.php @@ -194,6 +194,10 @@ public function frontControllerPath(string $sitePath, string $siteName, string $ $_SERVER['PHP_SELF'] = $scriptName; $_SERVER['DOCUMENT_ROOT'] = $sitePath.'/'.$frontControllerDirectory; + if (isset($_SERVER['argv'])) { + unset($_SERVER['argv']); + } + return $indexPath; } } diff --git a/cli/Valet/Drivers/ValetDriver.php b/cli/Valet/Drivers/ValetDriver.php index 4217cf5..7593e7e 100755 --- a/cli/Valet/Drivers/ValetDriver.php +++ b/cli/Valet/Drivers/ValetDriver.php @@ -185,7 +185,7 @@ public function loadServerEnvironmentVariables(string $sitePath, string $siteNam return; } - $variables = include_once $varFilePath; + $variables = include $varFilePath; $variablesToSet = $variables['*'] ?? []; diff --git a/cli/Valet/Server.php b/cli/Valet/Server.php index d097e7f..c39b090 100644 --- a/cli/Valet/Server.php +++ b/cli/Valet/Server.php @@ -36,7 +36,7 @@ public static function domainFromSiteName(string $siteName): string public static function show404() { http_response_code(404); - require_once __DIR__.'/../../cli/templates/404.html'; + require __DIR__.'/../../cli/templates/404.html'; exit; } diff --git a/server.php b/server.php index fcdd946..b0427d5 100644 --- a/server.php +++ b/server.php @@ -101,6 +101,22 @@ Server::show404(); } +/** + * Unset our variables to avoid leaking Valet internals into the user's application. + */ +unset( + $valetConfig, + $uriForIpAddressExtraction, + $host, + $server, + $uri, + $siteName, + $valetSitePath, + $valetDriver, + $isPhpFile, + $staticFilePath, +); + chdir(dirname($frontControllerPath)); -require_once $frontControllerPath; +require $frontControllerPath;