Commit82f3418

committed

[DI] Add CSV env var processor tests

1 parentfbfdebc commit82f3418Copy full SHA for 82f3418

File tree

+34

-1

lines changed

src/Symfony/Component/DependencyInjection
- EnvVarProcessor.php
- Tests
  - EnvVarProcessorTest.php

+34

-1

lines changed

Lines changed: 1 addition & 1 deletion

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`		`-returnstr_getcsv($env);`
	`239`	`+returnstr_getcsv($env,',','"', \PHP_VERSION_ID >=70400 ?'' :'\\');`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`if ('trim' ===$prefix) {`

Lines changed: 33 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -478,4 +478,37 @@ public function testRequireFile()`
`478`	`478`
`479`	`479`	`$this->assertEquals('foo',$result);`
`480`	`480`	`}`
	`481`	`+`
	`482`	`+/**`
	`483`	`+ * @dataProvider validCsv`
	`484`	`+ */`
	`485`	`+publicfunctiontestGetEnvCsv($value,$processed)`
	`486`	`+ {`
	`487`	`+$processor =newEnvVarProcessor(newContainer());`
	`488`	`+`
	`489`	`+$result =$processor->getEnv('csv','foo',function ($name)use ($value) {`
	`490`	`+$this->assertSame('foo',$name);`
	`491`	`+`
	`492`	`+return$value;`
	`493`	`+ });`
	`494`	`+`
	`495`	`+$this->assertSame($processed,$result);`
	`496`	`+ }`
	`497`	`+`
	`498`	`+publicfunctionvalidCsv()`
	`499`	`+ {`
	`500`	`+$complex = <<<'CSV'`
	`501`	`+,"""","foo""","\""",\,foo\`
	`502`	`+CSV;`
	`503`	`+`
	`504`	`+return [`
	`505`	`+ ['', [null]],`
	`506`	`+ [',', ['','']],`
	`507`	`+ ['1', ['1']],`
	`508`	`+ ['1,2," 3 "', ['1','2',' 3']],`
	`509`	`+ ['\\,\\\\', ['\\','\\\\']],`
	`510`	`+ [$complex, \PHP_VERSION_ID >=70400 ? ['','"','foo"','\\"','\\','foo\\'] : ['','"','foo"','\\"",\\,foo\\']],`
	`511`	`+ [null,null],`
	`512`	`+ ];`
	`513`	`+ }`
`481`	`514`	`}`

Comments

(0)