CS fixes

nicolas-grekas · nicolas-grekas · commit 412cf753ce49 · 2022-06-27T15:16:42.000+02:00
diff --git a/DependencyInjection/AddConsoleCommandPass.php b/DependencyInjection/AddConsoleCommandPass.php
@@ -55,7 +55,7 @@ public function process(ContainerBuilder $container)
                 if (!$r->isSubclassOf(Command::class)) {
                     throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, $this->commandTag, Command::class));
                 }
-                $commandName = $class::getDefaultName() !== null ? str_replace('%', '%%', $class::getDefaultName()) : null;
+                $commandName = null !== $class::getDefaultName() ? str_replace('%', '%%', $class::getDefaultName()) : null;
             }
 
             if (null === $commandName) {
diff --git a/Helper/Table.php b/Helper/Table.php
@@ -641,7 +641,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) && !(\is_object($cell) && method_exists($cell, '__toString'))) {
+            if (null !== $cell && !$cell instanceof TableCell && !\is_scalar($cell) && !(\is_object($cell) && method_exists($cell, '__toString'))) {
                 throw new InvalidArgumentException(sprintf('A cell must be a TableCell, a scalar or an object implementing "__toString()", "%s" given.', \gettype($cell)));
             }
             if ($cell instanceof TableCell && $cell->getRowspan() > 1) {
diff --git a/Logger/ConsoleLogger.php b/Logger/ConsoleLogger.php
@@ -110,7 +110,7 @@ private function interpolate(string $message, array $context): string
 
         $replacements = [];
         foreach ($context as $key => $val) {
-            if (null === $val || is_scalar($val) || (\is_object($val) && method_exists($val, '__toString'))) {
+            if (null === $val || \is_scalar($val) || (\is_object($val) && method_exists($val, '__toString'))) {
                 $replacements["{{$key}}"] = $val;
             } elseif ($val instanceof \DateTimeInterface) {
                 $replacements["{{$key}}"] = $val->format(\DateTime::RFC3339);
diff --git a/Style/SymfonyStyle.php b/Style/SymfonyStyle.php
@@ -430,18 +430,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/Tester/CommandTesterTest.php b/Tests/Tester/CommandTesterTest.php
@@ -217,8 +217,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
`@@ -55,7 +55,7 @@ public function process(ContainerBuilder $container)`
`55`	`55`	`if (!$r->isSubclassOf(Command::class)) {`
`56`	`56`	`throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, $this->commandTag, Command::class));`
`57`	`57`	`}`
`58`		`- $commandName = $class::getDefaultName() !== null ? str_replace('%', '%%', $class::getDefaultName()) : null;`
	`58`	`+ $commandName = null !== $class::getDefaultName() ? str_replace('%', '%%', $class::getDefaultName()) : null;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if (null === $commandName) {`
Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ private function fillNextRows(array $rows, int $line): array`
`641`	`641`	`{`
`642`	`642`	`$unmergedRows = [];`
`643`	`643`	`foreach ($rows[$line] as $column => $cell) {`
`644`		`- if (null !== $cell && !$cell instanceof TableCell && !is_scalar($cell) && !(\is_object($cell) && method_exists($cell, '__toString'))) {`
	`644`	`+ if (null !== $cell && !$cell instanceof TableCell && !\is_scalar($cell) && !(\is_object($cell) && method_exists($cell, '__toString'))) {`
`645`	`645`	`throw new InvalidArgumentException(sprintf('A cell must be a TableCell, a scalar or an object implementing "__toString()", "%s" given.', \gettype($cell)));`
`646`	`646`	`}`
`647`	`647`	`if ($cell instanceof TableCell && $cell->getRowspan() > 1) {`
Original file line number	Diff line number	Diff line change
`@@ -430,18 +430,18 @@ private function autoPrependBlock(): void`
`430`	`430`	`$chars = substr(str_replace(\PHP_EOL, "\n", $this->bufferedOutput->fetch()), -2);`
`431`	`431`
`432`	`432`	`if (!isset($chars[0])) {`
`433`		`- $this->newLine(); //empty history, so we should start with a new line.`
	`433`	`+ $this->newLine(); // empty history, so we should start with a new line.`
`434`	`434`
`435`	`435`	`return;`
`436`	`436`	`}`
`437`		`- //Prepend new line for each non LF chars (This means no blank line was output before)`
	`437`	`+ // Prepend new line for each non LF chars (This means no blank line was output before)`
`438`	`438`	`$this->newLine(2 - substr_count($chars, "\n"));`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`private function autoPrependText(): void`
`442`	`442`	`{`
`443`	`443`	`$fetched = $this->bufferedOutput->fetch();`
`444`		`- //Prepend new line if last char isn't EOL:`
	`444`	`+ // Prepend new line if last char isn't EOL:`
`445`	`445`	`if (!str_ends_with($fetched, "\n")) {`
`446`	`446`	`$this->newLine();`
`447`	`447`	`}`