[Console] Restore SHELL_VERBOSITY after a command is ran

lyrixx · lyrixx · commit 570e67d8648c · 2025-07-11T11:35:51.000+02:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -187,6 +187,8 @@ public function run(?InputInterface $input = null, ?OutputInterface $output = nu
             }
         }
 
+        $prevShellVerbosity = getenv('SHELL_VERBOSITY');
+
         try {
             $this->configureIO($input, $output);
 
@@ -224,6 +226,22 @@ public function run(?InputInterface $input = null, ?OutputInterface $output = nu
                     $phpHandler[0]->setExceptionHandler($finalHandler);
                 }
             }
+
+            // SHELL_VERBOSITY is set by Application::configureIO so we need to unset/reset it
+            // to its previous value to avoid one command verbosity to spread to other commands
+            if (false === $prevShellVerbosity) {
+                if (\function_exists('putenv')) {
+                    @putenv('SHELL_VERBOSITY');
+                }
+                unset($_ENV['SHELL_VERBOSITY']);
+                unset($_SERVER['SHELL_VERBOSITY']);
+            } else {
+                if (\function_exists('putenv')) {
+                    @putenv('SHELL_VERBOSITY='.$prevShellVerbosity);
+                }
+                $_ENV['SHELL_VERBOSITY'] = $prevShellVerbosity;
+                $_SERVER['SHELL_VERBOSITY'] = $prevShellVerbosity;
+            }
         }
 
         if ($this->autoExit) {
diff --git a/src/Symfony/Component/Console/Tester/ApplicationTester.php b/src/Symfony/Component/Console/Tester/ApplicationTester.php
@@ -47,37 +47,17 @@ public function __construct(
      */
     public function run(array $input, array $options = []): int
     {
-        $prevShellVerbosity = getenv('SHELL_VERBOSITY');
-
-        try {
-            $this->input = new ArrayInput($input);
-            if (isset($options['interactive'])) {
-                $this->input->setInteractive($options['interactive']);
-            }
+        $this->input = new ArrayInput($input);
+        if (isset($options['interactive'])) {
+            $this->input->setInteractive($options['interactive']);
+        }
 
-            if ($this->inputs) {
-                $this->input->setStream(self::createStream($this->inputs));
-            }
+        if ($this->inputs) {
+            $this->input->setStream(self::createStream($this->inputs));
+        }
 
-            $this->initOutput($options);
+        $this->initOutput($options);
 
-            return $this->statusCode = $this->application->run($this->input, $this->output);
-        } finally {
-            // SHELL_VERBOSITY is set by Application::configureIO so we need to unset/reset it
-            // to its previous value to avoid one test's verbosity to spread to the following tests
-            if (false === $prevShellVerbosity) {
-                if (\function_exists('putenv')) {
-                    @putenv('SHELL_VERBOSITY');
-                }
-                unset($_ENV['SHELL_VERBOSITY']);
-                unset($_SERVER['SHELL_VERBOSITY']);
-            } else {
-                if (\function_exists('putenv')) {
-                    @putenv('SHELL_VERBOSITY='.$prevShellVerbosity);
-                }
-                $_ENV['SHELL_VERBOSITY'] = $prevShellVerbosity;
-                $_SERVER['SHELL_VERBOSITY'] = $prevShellVerbosity;
-            }
-        }
+        return $this->statusCode = $this->application->run($this->input, $this->output);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,8 @@ public function run(?InputInterface $input = null, ?OutputInterface $output = nu`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
	`190`	`+ $prevShellVerbosity = getenv('SHELL_VERBOSITY');`
	`191`	`+`
`190`	`192`	`try {`
`191`	`193`	`$this->configureIO($input, $output);`
`192`	`194`
`@@ -224,6 +226,22 @@ public function run(?InputInterface $input = null, ?OutputInterface $output = nu`
`224`	`226`	`$phpHandler[0]->setExceptionHandler($finalHandler);`
`225`	`227`	`}`
`226`	`228`	`}`
	`229`	`+`
	`230`	`+ // SHELL_VERBOSITY is set by Application::configureIO so we need to unset/reset it`
	`231`	`+ // to its previous value to avoid one command verbosity to spread to other commands`
	`232`	`+ if (false === $prevShellVerbosity) {`
	`233`	`+ if (\function_exists('putenv')) {`
	`234`	`+ @putenv('SHELL_VERBOSITY');`
	`235`	`+ }`
	`236`	`+ unset($_ENV['SHELL_VERBOSITY']);`
	`237`	`+ unset($_SERVER['SHELL_VERBOSITY']);`
	`238`	`+ } else {`
	`239`	`+ if (\function_exists('putenv')) {`
	`240`	`+ @putenv('SHELL_VERBOSITY='.$prevShellVerbosity);`
	`241`	`+ }`
	`242`	`+ $_ENV['SHELL_VERBOSITY'] = $prevShellVerbosity;`
	`243`	`+ $_SERVER['SHELL_VERBOSITY'] = $prevShellVerbosity;`
	`244`	`+ }`
`227`	`245`	`}`
`228`	`246`
`229`	`247`	`if ($this->autoExit) {`