Merge branch '6.0' into 6.1

fabpot · fabpot · commit 1f6444d23c07 · 2022-07-20T15:46:29.000+02:00
* 6.0:
  Fix CS
  Fix CS
diff --git a/Command/CompleteCommand.php b/Command/CompleteCommand.php
@@ -78,15 +78,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         try {
             // uncomment when a bugfix or BC break has been introduced in the shell completion scripts
-            //$version = $input->getOption('symfony');
-            //if ($version && version_compare($version, 'x.y', '>=')) {
+            // $version = $input->getOption('symfony');
+            // if ($version && version_compare($version, 'x.y', '>=')) {
             //    $message = sprintf('Completion script version is not supported ("%s" given, ">=x.y" required).', $version);
             //    $this->log($message);
 
             //    $output->writeln($message.' Install the Symfony completion script again by using the "completion" command.');
 
             //    return 126;
-            //}
+            // }
 
             $shell = $input->getOption('shell');
             if (!$shell) {
diff --git a/Helper/QuestionHelper.php b/Helper/QuestionHelper.php
@@ -24,6 +24,7 @@
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Terminal;
+
 use function Symfony\Component\String\s;
 
 /**
diff --git a/Tests/Formatter/OutputFormatterTest.php b/Tests/Formatter/OutputFormatterTest.php
@@ -283,7 +283,7 @@ public function testContentWithLineBreaks()
 <info>
 some text</info>
 EOF
-        ));
+            ));
 
         $this->assertEquals(<<<EOF
 \033[32msome text
@@ -293,7 +293,7 @@ public function testContentWithLineBreaks()
 <info>some text
 </info>
 EOF
-        ));
+            ));
 
         $this->assertEquals(<<<EOF
 \033[32m
@@ -305,7 +305,7 @@ public function testContentWithLineBreaks()
 some text
 </info>
 EOF
-        ));
+            ));
 
         $this->assertEquals(<<<EOF
 \033[32m
@@ -319,7 +319,7 @@ public function testContentWithLineBreaks()
 more text
 </info>
 EOF
-        ));
+            ));
     }
 
     public function testFormatAndWrap()
diff --git a/Tests/Helper/SymfonyQuestionHelperTest.php b/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -162,7 +162,7 @@ public function testChoiceQuestionPadding()
   [łabądź] baz
  >
 EOT
-        , $output, true);
+            , $output, true);
     }
 
     public function testChoiceQuestionCustomPrompt()
@@ -181,7 +181,7 @@ public function testChoiceQuestionCustomPrompt()
   [0] foo
  >ccc>
 EOT
-        , $output, true);
+            , $output, true);
     }
 
     protected function getInputStream($input)

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function testChoiceQuestionPadding()`
`162`	`162`	`[łabądź] baz`
`163`	`163`	`>`
`164`	`164`	`EOT`
`165`		`- , $output, true);`
	`165`	`+ , $output, true);`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`public function testChoiceQuestionCustomPrompt()`
`@@ -181,7 +181,7 @@ public function testChoiceQuestionCustomPrompt()`
`181`	`181`	`[0] foo`
`182`	`182`	`>ccc>`
`183`	`183`	`EOT`
`184`		`- , $output, true);`
	`184`	`+ , $output, true);`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`protected function getInputStream($input)`