Merge branch '5.4' into 6.0

* 5.4:
  [Messenger] cs fix
  [Messenger] Fix time-limit check exception
  [Console] Fix console `ProgressBar::override()` after manual `ProgressBar::cleanup()`
  [FrameworkBundle] typo default_lifetime example
  [HttpClient] Handle Amp HTTP client v5 incompatibility gracefully
  [HttpKernel] Don’t try to wire Response argument with controller.service_arguments
  [PhpUnitBridge] Fix language deprecations incorrectly marked as direct
  Tell about messenger:consume invalid limit options
  [Messenger] Do not throw 'no handlers' exception when skipping due to duplicate handling

Author: nicolas-grekas

Exception/InvalidOptionException.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Console\Exception;
 
 /**
- * Represents an incorrect option name typed in the console.
+ * Represents an incorrect option name or value typed in the console.
  *
  * @author Jérôme Tamarelle <[email protected]>
  */

Helper/ProgressBar.php

@@ -466,10 +466,13 @@ private function overwrite(string $message): void
                     }
                     $this->output->clear($lineCount);
                 } else {
-                    for ($i = 0; $i < $this->formatLineCount; ++$i) {
-                        $this->cursor->moveToColumn(1);
-                        $this->cursor->clearLine();
-                        $this->cursor->moveUp();
+                    if ('' !== $this->previousMessage) {
+                        // only clear upper lines when last call was not a clear
+                        for ($i = 0; $i < $this->formatLineCount; ++$i) {
+                            $this->cursor->moveToColumn(1);
+                            $this->cursor->clearLine();
+                            $this->cursor->moveUp();
+                        }
                     }
 
                     $this->cursor->moveToColumn(1);

Tests/Helper/ProgressBarTest.php

@@ -812,8 +812,10 @@ public function testMultilineFormat()
         $this->assertEquals(
             ">---------------------------\nfoobar".
             $this->generateOutput("=========>------------------\nfoobar").
-            "\x1B[1G\x1B[2K\x1B[1A\x1B[1G\x1B[2K".
-            $this->generateOutput("============================\nfoobar"),
+            "\x1B[1G\x1B[2K\x1B[1A".
+            $this->generateOutput('').
+            $this->generateOutput('============================').
+            "\nfoobar",
             stream_get_contents($output->getStream())
         );
     }
@@ -1124,4 +1126,29 @@ public function testMultiLineFormatIsFullyCleared()
             stream_get_contents($output->getStream())
         );
     }
+
+    public function testMultiLineFormatIsFullyCorrectlyWithManuallyCleanup()
+    {
+        ProgressBar::setFormatDefinition('normal_nomax', "[%bar%]\n%message%");
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->setMessage('Processing "foobar"...');
+        $bar->start();
+        $bar->clear();
+        $output->writeln('Foo!');
+        $bar->display();
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            "[>---------------------------]\n".
+            'Processing "foobar"...'.
+            "\x1B[1G\x1B[2K\x1B[1A".
+            $this->generateOutput('').
+            'Foo!'.\PHP_EOL.
+            $this->generateOutput('[--->------------------------]').
+            "\nProcessing \"foobar\"...".
+            $this->generateOutput("[----->----------------------]\nProcessing \"foobar\"..."),
+            stream_get_contents($output->getStream())
+        );
+    }
 }