Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit b5cf7fb2333e · 2022-06-27T19:24:16.000+02:00
* 6.0:
  CS fixes
  Bump Symfony version to 6.0.11
  Update VERSION for 6.0.10
  Update CHANGELOG for 6.0.10
  Bump Symfony version to 5.4.11
  Update VERSION for 5.4.10
  Update CHANGELOG for 5.4.10
  Bump Symfony version to 4.4.44
  Update VERSION for 4.4.43
  Update CONTRIBUTORS for 4.4.43
  Update CHANGELOG for 4.4.43
diff --git a/Helper/Table.php b/Helper/Table.php
@@ -674,7 +674,7 @@ private function fillNextRows(array $rows, int $line): array
     {
         $unmergedRows = [];
         foreach ($rows[$line] as $column => $cell) {
-            if (null !== $cell && !$cell instanceof TableCell && !is_scalar($cell) && !$cell instanceof \Stringable) {
+            if (null !== $cell && !$cell instanceof TableCell && !\is_scalar($cell) && !$cell instanceof \Stringable) {
                 throw new InvalidArgumentException(sprintf('A cell must be a TableCell, a scalar or an object implementing "__toString()", "%s" given.', get_debug_type($cell)));
             }
             if ($cell instanceof TableCell && $cell->getRowspan() > 1) {
diff --git a/Logger/ConsoleLogger.php b/Logger/ConsoleLogger.php
@@ -106,7 +106,7 @@ private function interpolate(string $message, array $context): string
 
         $replacements = [];
         foreach ($context as $key => $val) {
-            if (null === $val || is_scalar($val) || $val instanceof \Stringable) {
+            if (null === $val || \is_scalar($val) || $val instanceof \Stringable) {
                 $replacements["{{$key}}"] = $val;
             } elseif ($val instanceof \DateTimeInterface) {
                 $replacements["{{$key}}"] = $val->format(\DateTime::RFC3339);
diff --git a/Style/SymfonyStyle.php b/Style/SymfonyStyle.php
@@ -422,18 +422,18 @@ private function autoPrependBlock(): void
         $chars = substr(str_replace(\PHP_EOL, "\n", $this->bufferedOutput->fetch()), -2);
 
         if (!isset($chars[0])) {
-            $this->newLine(); //empty history, so we should start with a new line.
+            $this->newLine(); // empty history, so we should start with a new line.
 
             return;
         }
-        //Prepend new line for each non LF chars (This means no blank line was output before)
+        // Prepend new line for each non LF chars (This means no blank line was output before)
         $this->newLine(2 - substr_count($chars, "\n"));
     }
 
     private function autoPrependText(): void
     {
         $fetched = $this->bufferedOutput->fetch();
-        //Prepend new line if last char isn't EOL:
+        // Prepend new line if last char isn't EOL:
         if (!str_ends_with($fetched, "\n")) {
             $this->newLine();
         }
diff --git a/Tests/Command/CompleteCommandTest.php b/Tests/Command/CompleteCommandTest.php
@@ -139,7 +139,7 @@ public function configure(): void
         $this->setName('hello')
              ->setAliases(['ahoy'])
              ->addArgument('name', InputArgument::REQUIRED)
-         ;
+        ;
     }
 
     public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
diff --git a/Tests/Tester/CommandTesterTest.php b/Tests/Tester/CommandTesterTest.php
@@ -237,8 +237,7 @@ public function testErrorOutput()
         $command->addArgument('foo');
         $command->setCode(function ($input, $output) {
             $output->getErrorOutput()->write('foo');
-        }
-        );
+        });
 
         $tester = new CommandTester($command);
         $tester->execute(

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ private function fillNextRows(array $rows, int $line): array`
`674`	`674`	`{`
`675`	`675`	`$unmergedRows = [];`
`676`	`676`	`foreach ($rows[$line] as $column => $cell) {`
`677`		`- if (null !== $cell && !$cell instanceof TableCell && !is_scalar($cell) && !$cell instanceof \Stringable) {`
	`677`	`+ if (null !== $cell && !$cell instanceof TableCell && !\is_scalar($cell) && !$cell instanceof \Stringable) {`
`678`	`678`	`throw new InvalidArgumentException(sprintf('A cell must be a TableCell, a scalar or an object implementing "__toString()", "%s" given.', get_debug_type($cell)));`
`679`	`679`	`}`
`680`	`680`	`if ($cell instanceof TableCell && $cell->getRowspan() > 1) {`
Original file line number	Diff line number	Diff line change
`@@ -422,18 +422,18 @@ private function autoPrependBlock(): void`
`422`	`422`	`$chars = substr(str_replace(\PHP_EOL, "\n", $this->bufferedOutput->fetch()), -2);`
`423`	`423`
`424`	`424`	`if (!isset($chars[0])) {`
`425`		`- $this->newLine(); //empty history, so we should start with a new line.`
	`425`	`+ $this->newLine(); // empty history, so we should start with a new line.`
`426`	`426`
`427`	`427`	`return;`
`428`	`428`	`}`
`429`		`- //Prepend new line for each non LF chars (This means no blank line was output before)`
	`429`	`+ // Prepend new line for each non LF chars (This means no blank line was output before)`
`430`	`430`	`$this->newLine(2 - substr_count($chars, "\n"));`
`431`	`431`	`}`
`432`	`432`
`433`	`433`	`private function autoPrependText(): void`
`434`	`434`	`{`
`435`	`435`	`$fetched = $this->bufferedOutput->fetch();`
`436`		`- //Prepend new line if last char isn't EOL:`
	`436`	`+ // Prepend new line if last char isn't EOL:`
`437`	`437`	`if (!str_ends_with($fetched, "\n")) {`
`438`	`438`	`$this->newLine();`
`439`	`439`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public function configure(): void`
`139`	`139`	`$this->setName('hello')`
`140`	`140`	`->setAliases(['ahoy'])`
`141`	`141`	`->addArgument('name', InputArgument::REQUIRED)`
`142`		`- ;`
	`142`	`+ ;`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void`