Merge branch '6.0' into 6.1

fabpot · fabpot · commit 7a86c1c42fbc · 2022-06-26T15:01:30.000+02:00
* 6.0:
  Fix double authentication via RememberMe resulting in wrong RememberMe cookie being set in client
  [Security] Fix legacy impersonation system
  Fix global state pollution between tests run with ApplicationTester
  µcs fix
  [Messenger] Do not log the message object itself
  [Intl] Fix the IntlDateFormatter::formatObject signature
diff --git a/Tester/ApplicationTester.php b/Tester/ApplicationTester.php
@@ -49,17 +49,37 @@ public function __construct(Application $application)
      */
     public function run(array $input, array $options = []): int
     {
-        $this->input = new ArrayInput($input);
-        if (isset($options['interactive'])) {
-            $this->input->setInteractive($options['interactive']);
-        }
+        $prevShellVerbosity = getenv('SHELL_VERBOSITY');
 
-        if ($this->inputs) {
-            $this->input->setStream(self::createStream($this->inputs));
-        }
+        try {
+            $this->input = new ArrayInput($input);
+            if (isset($options['interactive'])) {
+                $this->input->setInteractive($options['interactive']);
+            }
 
-        $this->initOutput($options);
+            if ($this->inputs) {
+                $this->input->setStream(self::createStream($this->inputs));
+            }
 
-        return $this->statusCode = $this->application->run($this->input, $this->output);
+            $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;
+            }
+        }
     }
 }
