Fix publish command mangling .env file (#928)

stayallive · cleptric · web-flow · commit c37336f4da08 · 2024-07-19T18:02:16.000Z
Co-authored-by: Michi Hoffmann &lt;cleptric@users.noreply.github.com&gt;
diff --git a/src/Sentry/Laravel/Console/PublishCommand.php b/src/Sentry/Laravel/Console/PublishCommand.php
@@ -107,7 +107,7 @@ private function setEnvValues(array $values): bool
         if (count($values) > 0) {
             foreach ($values as $envKey => $envValue) {
                 if ($this->isEnvKeySet($envKey, $envFileContents)) {
-                    $envFileContents = preg_replace("/^{$envKey}=.*?[\s$]/m", "{$envKey}={$envValue}\n", $envFileContents);
+                    $envFileContents = preg_replace("/^{$envKey}=\"?.*?\"?(\s|$)/m", "{$envKey}={$envValue}\n", $envFileContents);
 
                     $this->info("Updated {$envKey} with new value in your `.env` file.");
                 } else {
@@ -131,7 +131,7 @@ private function isEnvKeySet(string $envKey, ?string $envFileContents = null): b
     {
         $envFileContents = $envFileContents ?? file_get_contents(app()->environmentFilePath());
 
-        return (bool)preg_match("/^{$envKey}=.*?[\s$]/m", $envFileContents);
+        return (bool)preg_match("/^{$envKey}=\"?.*?\"?(\s|$)/m", $envFileContents);
     }
 
     private function askForDsnInput(): string

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ private function setEnvValues(array $values): bool`
`107`	`107`	`if (count($values) > 0) {`
`108`	`108`	`foreach ($values as $envKey => $envValue) {`
`109`	`109`	`if ($this->isEnvKeySet($envKey, $envFileContents)) {`
`110`		`- $envFileContents = preg_replace("/^{$envKey}=.*?[\s$]/m", "{$envKey}={$envValue}\n", $envFileContents);`
	`110`	`+ $envFileContents = preg_replace("/^{$envKey}=\"?.*?\"?(\s\|$)/m", "{$envKey}={$envValue}\n", $envFileContents);`
`111`	`111`
`112`	`112`	$this->info("Updated {$envKey} with new value in your `.env` file.");
`113`	`113`	`} else {`
`@@ -131,7 +131,7 @@ private function isEnvKeySet(string $envKey, ?string $envFileContents = null): b`
`131`	`131`	`{`
`132`	`132`	`$envFileContents = $envFileContents ?? file_get_contents(app()->environmentFilePath());`
`133`	`133`
`134`		`- return (bool)preg_match("/^{$envKey}=.*?[\s$]/m", $envFileContents);`
	`134`	`+ return (bool)preg_match("/^{$envKey}=\"?.*?\"?(\s\|$)/m", $envFileContents);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`private function askForDsnInput(): string`