Merge branch '6.1' into 6.2

nicolas-grekas · nicolas-grekas · commit 5a9bd5c543f0 · 2022-12-16T16:08:36.000+01:00
* 6.1:
  [HttpKernel] fix merge
  [HttpKernel] fix merge
  Revert "bug #48089 [Console] Fix clear line with question in section (maxbeckers)"
diff --git a/Output/ConsoleSectionOutput.php b/Output/ConsoleSectionOutput.php
@@ -102,14 +102,6 @@ public function getVisibleContent(): string
         return implode('', \array_slice($this->content, -$this->maxHeight));
     }
 
-    /**
-     * @internal
-     */
-    public function incrementLines()
-    {
-        ++$this->lines;
-    }
-
     /**
      * @internal
      */
diff --git a/Style/SymfonyStyle.php b/Style/SymfonyStyle.php
@@ -23,7 +23,6 @@
 use Symfony\Component\Console\Helper\TableSeparator;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
-use Symfony\Component\Console\Output\ConsoleSectionOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\TrimmedBufferOutput;
 use Symfony\Component\Console\Question\ChoiceQuestion;
@@ -301,11 +300,6 @@ public function askQuestion(Question $question): mixed
         if ($this->input->isInteractive()) {
             $this->newLine();
             $this->bufferedOutput->write("\n");
-            if ($this->output instanceof ConsoleSectionOutput) {
-                // add one line more to the ConsoleSectionOutput because of the `return` to submit the input
-                // this is relevant when a `ConsoleSectionOutput::clear` is called.
-                $this->output->incrementLines();
-            }
         }
 
         return $answer;
diff --git a/Tests/Style/SymfonyStyleTest.php b/Tests/Style/SymfonyStyleTest.php
@@ -16,13 +16,11 @@
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\Input;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\ConsoleSectionOutput;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -183,38 +181,4 @@ public function testMemoryConsumption()
 
         $this->assertSame(0, memory_get_usage() - $start);
     }
-
-    public function testAskAndClearExpectFullSectionCleared()
-    {
-        $answer = 'Answer';
-        $inputStream = fopen('php://memory', 'r+');
-        fwrite($inputStream, $answer.\PHP_EOL);
-        rewind($inputStream);
-        $input = $this->createMock(Input::class);
-        $sections = [];
-        $output = new ConsoleSectionOutput(fopen('php://memory', 'r+', false), $sections, StreamOutput::VERBOSITY_NORMAL, true, new OutputFormatter());
-        $input
-            ->method('isInteractive')
-            ->willReturn(true);
-        $input
-            ->method('getStream')
-            ->willReturn($inputStream);
-
-        $style = new SymfonyStyle($input, $output);
-
-        $style->write('foo');
-        $givenAnswer = $style->ask('Dummy question?');
-        $output->write('bar');
-        $output->clear();
-
-        rewind($output->getStream());
-        $this->assertEquals($answer, $givenAnswer);
-        $this->assertEquals(
-            'foo'.\PHP_EOL. // write foo
-            \PHP_EOL.\PHP_EOL.\PHP_EOL." \033[32mDummy question?\033[39m:".\PHP_EOL.' > '.\PHP_EOL.\PHP_EOL.\PHP_EOL. // question
-            'bar'.\PHP_EOL. // write bar
-            "\033[10A\033[0J", // clear 10 lines (9 output lines and one from the answer input return)
-            stream_get_contents($output->getStream())
-        );
-    }
 }
