From 570e67d8648ce4cae6cc50f5555f0137cefdaa4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Fri, 4 Jul 2025 10:51:27 +0200
Subject: [PATCH] [Console] Restore SHELL_VERBOSITY after a command is ran

---
 src/Symfony/Component/Console/Application.php | 18 +++++++++
 .../Console/Tester/ApplicationTester.php      | 38 +++++--------------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 3d5c48f525965..abfcb9d084be2 100644
--- 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
index cebb6f8ebf34a..a6dc8e1ce5178 100644
--- 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);
     }
 }

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/61033.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/61033.patch" target="_blank">pFad Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/61033.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/61033.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>