Commit308e3a3

committed

properly handle SYMFONY_DOTENV_VARS being the empty string

1 parent8d06a8a commit308e3a3Copy full SHA for 308e3a3

File tree

+30

-1

lines changed

src/Symfony/Component/Dotenv
- Command
  - DebugCommand.php
- Tests/Command
  - DebugCommandTest.php

+30

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`82`	`82`
`83`	`83`	`privatefunctiongetVariables(array$envFiles):array`
`84`	`84`	`{`
`85`		`-$vars =explode(',',$_SERVER['SYMFONY_DOTENV_VARS'] ??'');`
	`85`	`+$dotenvVars =$_SERVER['SYMFONY_DOTENV_VARS'] ??'';`
	`86`	`+`
	`87`	`+if ('' ===$dotenvVars) {`
	`88`	`+return [];`
	`89`	`+ }`
	`90`	`+`
	`91`	`+$vars =explode(',',$dotenvVars);`
`86`	`92`	`sort($vars);`
`87`	`93`
`88`	`94`	`$output = [];`

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ class DebugCommandTest extends TestCase`
`25`	`25`	`*/`
`26`	`26`	`publicfunctiontestErrorOnUninitializedDotenv()`
`27`	`27`	`{`
	`28`	`+ unset($_SERVER['SYMFONY_DOTENV_VARS']);`
	`29`	`+`
`28`	`30`	`$command =newDebugCommand('dev',__DIR__.'/Fixtures/Scenario1');`
`29`	`31`	`$command->setHelperSet(newHelperSet([newFormatterHelper()]));`
`30`	`32`	`$tester =newCommandTester($command);`
`@@ -34,6 +36,27 @@ public function testErrorOnUninitializedDotenv()`
`34`	`36`	`$this->assertStringContainsString('[ERROR] Dotenv component is not initialized',$output);`
`35`	`37`	`}`
`36`	`38`
	`39`	`+publicfunctiontestEmptyDotEnvVarsList()`
	`40`	`+ {`
	`41`	`+$_SERVER['SYMFONY_DOTENV_VARS'] ='';`
	`42`	`+`
	`43`	`+$command =newDebugCommand('dev',__DIR__.'/Fixtures/Scenario1');`
	`44`	`+$command->setHelperSet(newHelperSet([newFormatterHelper()]));`
	`45`	`+$tester =newCommandTester($command);`
	`46`	`+$tester->execute([]);`
	`47`	`+$output =$tester->getDisplay();`
	`48`	`+`
	`49`	`+$expectedFormat = <<<'OUTPUT'`
	`50`	`+%a`
	`51`	`+ ---------- ------- ------------ ------%S`
	`52`	`+ Variable Value .env.local .env%S`
	`53`	`+ ---------- ------- ------------ ------%S`
	`54`	`+%a`
	`55`	`+OUTPUT;`
	`56`	`+`
	`57`	`+$this->assertStringMatchesFormat($expectedFormat,$output);`
	`58`	`+ }`
	`59`	`+`
`37`	`60`	`publicfunctiontestScenario1InDevEnv()`
`38`	`61`	`{`
`39`	`62`	`$output =$this->executeCommand(__DIR__.'/Fixtures/Scenario1','dev');`

Comments

(0)