minor #25168 [HttpKernel] don't override existing verbosity env var (xabbuh)

nicolas-grekas · nicolas-grekas · commit 4cfd2d90a536 · 2017-11-27T09:12:26.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpKernel] don't override existing verbosity env var | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | While playing with the changes from #25162 I noticed that setting the `SHELL_VERBOSITY` env var in `phpunit.xml.dist` did not work as the kernel was setting the variable before the logic in the `Logger` class was executed. Commits ------- df4d6d6 don't override existing verbosity env var
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -120,7 +120,7 @@ public function boot()
 
             return;
         }
-        if ($this->debug && !isset($_SERVER['SHELL_VERBOSITY'])) {
+        if ($this->debug && !isset($_ENV['SHELL_VERBOSITY']) && !isset($_SERVER['SHELL_VERBOSITY'])) {
             putenv('SHELL_VERBOSITY=3');
             $_ENV['SHELL_VERBOSITY'] = 3;
             $_SERVER['SHELL_VERBOSITY'] = 3;

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function boot()`
`120`	`120`
`121`	`121`	`return;`
`122`	`122`	`}`
`123`		`- if ($this->debug && !isset($_SERVER['SHELL_VERBOSITY'])) {`
	`123`	`+ if ($this->debug && !isset($_ENV['SHELL_VERBOSITY']) && !isset($_SERVER['SHELL_VERBOSITY'])) {`
`124`	`124`	`putenv('SHELL_VERBOSITY=3');`
`125`	`125`	`$_ENV['SHELL_VERBOSITY'] = 3;`
`126`	`126`	`$_SERVER['SHELL_VERBOSITY'] = 3;`