Added fix to ensure escaped backslash paths are preserved in DB_DATABASE env values (#1266)

jaxwilko · web-flow · commit b5ccea73f13c · 2024-12-04T15:26:45.000-06:00
Co-authored-by: Luke Towers <luke@luketowers.ca> Related #1242
diff --git a/modules/system/console/WinterEnv.php b/modules/system/console/WinterEnv.php
@@ -122,7 +122,12 @@ protected function updateEnvFile(): void
                     $dbConfig = $this->dbConfig()[$default] ?? [];
 
                     foreach ($dbConfig as $dbEnvKey => $dbConfigKey) {
-                        $env->set($dbEnvKey, config(join('.', [$config, 'connections', $default, $dbConfigKey])));
+                        $value = config(join('.', [$config, 'connections', $default, $dbConfigKey]));
+                        // Fix for https://github.com/wintercms/winter/issues/1242#issuecomment-2515344385
+                        if ($dbEnvKey === 'DB_DATABASE' && PHP_OS_FAMILY === 'Windows' && str_contains($value, '\\')) {
+                            $value = str_replace('\\', '\\\\', $value);
+                        }
+                        $env->set($dbEnvKey, $value);
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,12 @@ protected function updateEnvFile(): void`
`122`	`122`	`$dbConfig = $this->dbConfig()[$default] ?? [];`
`123`	`123`
`124`	`124`	`foreach ($dbConfig as $dbEnvKey => $dbConfigKey) {`
`125`		`- $env->set($dbEnvKey, config(join('.', [$config, 'connections', $default, $dbConfigKey])));`
	`125`	`+ $value = config(join('.', [$config, 'connections', $default, $dbConfigKey]));`
	`126`	`+ // Fix for https://github.com/wintercms/winter/issues/1242#issuecomment-2515344385`
	`127`	`+ if ($dbEnvKey === 'DB_DATABASE' && PHP_OS_FAMILY === 'Windows' && str_contains($value, '\\')) {`
	`128`	`+ $value = str_replace('\\', '\\\\', $value);`
	`129`	`+ }`
	`130`	`+ $env->set($dbEnvKey, $value);`
`126`	`131`	`}`
`127`	`132`	`}`
`128`	`133`