Sync safe fixes from upstream laravel/valet

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;
     }
 }

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['*'] ?? [];
 

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;
     }
 

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;