symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
+33Lines changed: 33 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
+33Lines changed: 33 additions & 0 deletions
@@ -236,7 +236,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
         }
 
         if ('csv' === $prefix) {
-            return str_getcsv($env);
+            return str_getcsv($env, ',', '"', \PHP_VERSION_ID >= 70400 ? '' : '\\');
         }
 
         if ('trim' === $prefix) {
 
@@ -478,4 +478,37 @@ public function testRequireFile()
 
         $this->assertEquals('foo', $result);
     }
+
+    /**
+     * @dataProvider validCsv
+     */
+    public function testGetEnvCsv($value, $processed)
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $result = $processor->getEnv('csv', 'foo', function ($name) use ($value) {
+            $this->assertSame('foo', $name);
+
+            return $value;
+        });
+
+        $this->assertSame($processed, $result);
+    }
+
+    public function validCsv()
+    {
+        $complex = <<<'CSV'
+,"""","foo""","\""",\,foo\
+CSV;
+
+        return [
+            ['', [null]],
+            [',', ['', '']],
+            ['1', ['1']],
+            ['1,2," 3 "', ['1', '2', ' 3 ']],
+            ['\\,\\\\', ['\\', '\\\\']],
+            [$complex, \PHP_VERSION_ID >= 70400 ? ['', '"', 'foo"', '\\"', '\\', 'foo\\'] : ['', '"', 'foo"', '\\"",\\,foo\\']],
+            [null, null],
+        ];
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`if ('csv' === $prefix) {`
`239`		`- return str_getcsv($env);`
	`239`	`+ return str_getcsv($env, ',', '"', \PHP_VERSION_ID >= 70400 ? '' : '\\');`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`if ('trim' === $prefix) {`