Fix: diagnose command replace backslashes with forwardslashes, and filter the valet home path.

- Fix for the nginx config check command, where it errors out because it couldn't find the file due to the path after the `-c` option couldn't be the shortened username via the `valetBinPath()`. Changed it back to use `__DIR__` . And added an escaped double quotes (`\"`) around it.

- Fix for the nginx config check command, where it also errorred out not finding the file due to the replacing of all backslashes in the command. This meant that with the new escaped double quotes it changed the backslash to forward slash. So instead of `-c \"C:/Users/...` it was changed to `-c /"C:/Users/...` and the system interpreted it as ``"C:/C:/Users/...`
Fixed by changing the replace function to use a regex that only replaces single backslashes and disregards the escaped quotes.

- Fix for the composer global diagnose command where it would error out when there's a space in the user directory name. Fixed by making sure it also uses the shortname via the `pathFilter()`.

Author: yCodeTech

cli/Valet/Diagnose.php

@@ -28,9 +28,9 @@ public function __construct(CommandLine $cli, Filesystem $files) {
 			'systeminfo',
 			'valet --version',
 			'cat ~/.config/valet/config.json',
-			valetBinPath() . 'nginx\nginx.exe -v 2>&1',
-			valetBinPath() . 'nginx\nginx.exe -c ' . valetBinPath() . 'nginx\conf\nginx.conf -t -p ' . valetBinPath() . 'nginx 2>&1',
-			'foreach ($file in get-ChildItem -Path "' . valetBinPath() . 'nginx\conf\nginx.conf", "' . valetBinPath() . 'nginx\valet\valet.conf", "' . VALET_HOME_PATH . '/Nginx/*.conf"){echo $file.fullname --------------------`n; Get-Content -Path $file; echo `n;}',
+			valetBinPath() . 'nginx/nginx.exe -v 2>&1',
+			valetBinPath() . 'nginx/nginx.exe -c \"' . __DIR__ . '/../../bin/nginx/conf/nginx.conf\" -t -p ' . valetBinPath() . 'nginx 2>&1',
+			'foreach ($file in get-ChildItem -Path "' . valetBinPath() . 'nginx/conf/nginx.conf", "' . valetBinPath() . 'nginx/valet/valet.conf", "' . VALET_HOME_PATH . '/Nginx/*.conf"){echo $file.fullname --------------------`n; Get-Content -Path $file; echo `n;}',
 			valetBinPath() . 'ngrok.exe version',
 			'php -v',
 			'cmd /C "where /f php"',
@@ -97,7 +97,11 @@ protected function beforeRun() {
 		if ($this->print) {
 			return;
 		}
-		$this->commands = str_replace("\\", "/", $this->commands);
+
+		// Replace only single backslashes (\) within paths to forward slashes (/), ie. does not replace the backslashes
+		// before a double quote. So the double quote is still escaped.
+		// e.g. \"\..\path\" --> \"/../path\"
+		$this->commands = preg_replace('/\\\(?![\\"])/', "/", $this->commands);
 
 		$this->progressBar = progressbar(count($this->commands), "Diagnosing", "Valet");
 	}

cli/includes/helpers.php

@@ -19,7 +19,7 @@
 /*
  * Define the ~/.config/valet path as a constant.
  */
-define('VALET_HOME_PATH', $_SERVER['HOME'] . '/.config/valet');
+define('VALET_HOME_PATH', pathFilter($_SERVER['HOME'] . '/.config/valet'));
 define('VALET_SERVER_PATH', str_replace('\\', '/', realpath(__DIR__ . '/../../server.php')));
 define('VALET_STATIC_PREFIX', '41c270e4-5535-4daa-b23e-c269744c2f45');
 /**
@@ -404,7 +404,7 @@ function pathFilter($path) {
 
 	$path = implode(DIRECTORY_SEPARATOR, $path);
 
-	return $path;
+	return str_replace('\\', '/', $path);
 }
 
 /**