properly parse backslashes in unquoted env vars

xabbuh · xabbuh · commit 173fbff33e0e · 2018-11-14T15:05:20.000+01:00
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -246,7 +246,7 @@ private function lexValue()
 
                     ++$this->cursor;
                 }
-                $value = rtrim($value);
+                $value = str_replace('\\\\', '\\', rtrim($value));
                 $resolvedValue = $value;
                 $resolvedValue = $this->resolveVariables($resolvedValue);
                 $resolvedValue = $this->resolveCommands($resolvedValue);
diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
@@ -66,6 +66,11 @@ public function getEnvData()
         $_ENV['REMOTE'] = 'remote';
 
         $tests = array(
+            // backslashes
+            array('FOO=foo\\\\bar', array('FOO' => 'foo\\bar')),
+            array("FOO='foo\\\\bar'", array('FOO' => 'foo\\\\bar')),
+            array('FOO="foo\\\\bar"', array('FOO' => 'foo\\bar')),
+
             // spaces
             array('FOO=bar', array('FOO' => 'bar')),
             array(' FOO=bar ', array('FOO' => 'bar')),

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ private function lexValue()`
`246`	`246`
`247`	`247`	`++$this->cursor;`
`248`	`248`	`}`
`249`		`- $value = rtrim($value);`
	`249`	`+ $value = str_replace('\\\\', '\\', rtrim($value));`
`250`	`250`	`$resolvedValue = $value;`
`251`	`251`	`$resolvedValue = $this->resolveVariables($resolvedValue);`
`252`	`252`	`$resolvedValue = $this->resolveCommands($resolvedValue);`