Commitd42f633

committed

[DependencyInjection] Fix autocasting null env values to empty string

1 parent7a8457d commitd42f633Copy full SHA for d42f633

File tree

+36

-2

lines changed

+36

-2

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,15 @@ protected function getEnv(string $name)`
`390`	`390`	`$prefix ='string';`
`391`	`391`	`$localName =$name;`
`392`	`392`	`}`
`393`		`-$processor =$processors->has($prefix) ?$processors->get($prefix) :newEnvVarProcessor($this);`
	`393`	`+`
	`394`	`+if ($processors->has($prefix)) {`
	`395`	`+$processor =$processors->get($prefix);`
	`396`	`+ }else {`
	`397`	`+$processor =newEnvVarProcessor($this);`
	`398`	`+if (false ===$i &&'string' ===$prefix) {`
	`399`	`+$prefix ='';`
	`400`	`+ }`
	`401`	`+ }`
`394`	`402`
`395`	`403`	`$this->resolving[$envName] =true;`
`396`	`404`	`try {`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,12 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
	`129`	`+$returnNull =false;`
	`130`	`+if ('' ===$prefix) {`
	`131`	`+$returnNull =true;`
	`132`	`+$prefix ='string';`
	`133`	`+ }`
	`134`	`+`
`129`	`135`	`if (false !==$i \|\|'string' !==$prefix) {`
`130`	`136`	`$env =$getEnv($name);`
`131`	`137`	`}elseif (isset($_ENV[$name])) {`
`@@ -177,6 +183,10 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)`
`177`	`183`	`}`
`178`	`184`
`179`	`185`	`if (null ===$env) {`
	`186`	`+if ($returnNull) {`
	`187`	`+returnnull;`
	`188`	`+ }`
	`189`	`+`
`180`	`190`	`if (!isset($this->getProvidedTypes()[$prefix])) {`
`181`	`191`	`thrownewRuntimeException(sprintf('Unsupported env var prefix "%s".',$prefix));`
`182`	`192`	`}`

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -763,12 +763,13 @@ public static function provideGetEnvUrlPath()`
`763`	`763`
`764`	`764`	`/**`
`765`	`765`	`* @testWith ["", "string"]`
	`766`	`+ * [null, ""]`
`766`	`767`	`* [false, "bool"]`
`767`	`768`	`* [true, "not"]`
`768`	`769`	`* [0, "int"]`
`769`	`770`	`* [0.0, "float"]`
`770`	`771`	`*/`
`771`		`-publicfunctiontestGetEnvCastsNull($expected,string$prefix)`
	`772`	`+publicfunctiontestGetEnvCastsNullBehavior($expected,string$prefix)`
`772`	`773`	`{`
`773`	`774`	`$processor =newEnvVarProcessor(newContainer());`
`774`	`775`
`@@ -778,4 +779,19 @@ public function testGetEnvCastsNull($expected, string $prefix)`
`778`	`779`	`});`
`779`	`780`	`}));`
`780`	`781`	`}`
	`782`	`+`
	`783`	`+publicfunctiontestGetEnvWithEmptyStringPrefixCastsToString()`
	`784`	`+ {`
	`785`	`+$processor =newEnvVarProcessor(newContainer());`
	`786`	`+ unset($_ENV['FOO']);`
	`787`	`+$_ENV['FOO'] =4;`
	`788`	`+`
	`789`	`+try {`
	`790`	`+$this->assertSame('4',$processor->getEnv('','FOO',staticfunction () {`
	`791`	`+$this->fail('Should not be called');`
	`792`	`+ }));`
	`793`	`+ }finally {`
	`794`	`+ unset($_ENV['FOO']);`
	`795`	`+ }`
	`796`	`+ }`
`781`	`797`	`}`

Comments

(0)