minor #50089 [DependencyInjection] More predictable EnvVarProcessor CSV empty string parsing (andreyserdjuk)

nicolas-grekas · nicolas-grekas · commit 12499a1df152 · 2023-04-21T17:34:45.000+02:00
This PR was squashed before being merged into the 6.3 branch. Discussion ---------- [DependencyInjection] More predictable EnvVarProcessor CSV empty string parsing | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no | Deprecations? | no | License | MIT Small improvement, that solves problem of getting non-empty array: `[0 => null]`, when parse empty string by csv processor. After this fix '%env(csv:EMPTY_STRING)%' will return `[]`, but not `[0 => null]`. Commits ------- aea85f5 [DependencyInjection] More predictable EnvVarProcessor CSV empty string parsing
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -313,7 +313,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
         }
 
         if ('csv' === $prefix) {
-            return str_getcsv($env, ',', '"', '');
+            return '' === $env ? [] : str_getcsv($env, ',', '"', '');
         }
 
         if ('trim' === $prefix) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -714,7 +714,7 @@ public static function validCsv()
 CSV;
 
         return [
-            ['', [null]],
+            ['', []],
             [',', ['', '']],
             ['1', ['1']],
             ['1,2," 3 "', ['1', '2', ' 3 ']],

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`if ('csv' === $prefix) {`
`316`		`- return str_getcsv($env, ',', '"', '');`
	`316`	`+ return '' === $env ? [] : str_getcsv($env, ',', '"', '');`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`if ('trim' === $prefix) {`