don't override existing verbosity env var

xabbuh · xabbuh · commit df4d6d6e1603 · 2017-11-26T21:27:09.000+01:00
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;`