More CS fixes

nicolas-grekas · nicolas-grekas · commit 7bbcaf3fdb1e · 2026-04-13T17:27:04.000+02:00
diff --git a/Command/TraceableCommand.php b/Command/TraceableCommand.php
@@ -62,9 +62,7 @@ public function __construct(
         parent::__construct($command->getName());
 
         // init below enables calling {@see parent::run()}
-        [$code, $processTitle, $ignoreValidationErrors] = \Closure::bind(function () {
-            return [$this->code, $this->processTitle, $this->ignoreValidationErrors];
-        }, $command, Command::class)();
+        [$code, $processTitle, $ignoreValidationErrors] = \Closure::bind(fn () => [$this->code, $this->processTitle, $this->ignoreValidationErrors], $command, Command::class)();
 
         if (\is_callable($code)) {
             $this->setCode($code);
diff --git a/Input/ArgvInput.php b/Input/ArgvInput.php
@@ -130,9 +130,8 @@ private function parseShortOptionSet(string $name): void
                 $this->addLongOption($option->getName(), $i === $len - 1 ? null : substr($name, $i + 1));
 
                 break;
-            } else {
-                $this->addLongOption($option->getName(), null);
             }
+            $this->addLongOption($option->getName(), null);
         }
     }
 
diff --git a/Output/AnsiColorMode.php b/Output/AnsiColorMode.php
@@ -96,11 +96,11 @@ private function degradeHexColorToAnsi8(int $r, int $g, int $b): int
             }
 
             return (int) round(($r - 8) / 247 * 24) + 232;
-        } else {
-            return 16 +
-                    (36 * (int) round($r / 255 * 5)) +
-                    (6 * (int) round($g / 255 * 5)) +
-                    (int) round($b / 255 * 5);
         }
+
+        return 16 +
+                (36 * (int) round($r / 255 * 5)) +
+                (6 * (int) round($g / 255 * 5)) +
+                (int) round($b / 255 * 5);
     }
 }
diff --git a/Tests/Formatter/OutputFormatterTest.php b/Tests/Formatter/OutputFormatterTest.php
@@ -306,51 +306,59 @@ public function testContentWithLineBreaks()
     {
         $formatter = new OutputFormatter(true);
 
-        $this->assertEquals(<<<EOF
-            \033[32m
-            some text\033[39m
-            EOF
-            , $formatter->format(<<<'EOF'
+        $this->assertEquals(
+            <<<EOF
+                \033[32m
+                some text\033[39m
+                EOF,
+            $formatter->format(<<<'EOF'
                 <info>
                 some text</info>
                 EOF
-            ));
+            )
+        );
 
-        $this->assertEquals(<<<EOF
-            \033[32msome text
-            \033[39m
-            EOF
-            , $formatter->format(<<<'EOF'
+        $this->assertEquals(
+            <<<EOF
+                \033[32msome text
+                \033[39m
+                EOF,
+            $formatter->format(<<<'EOF'
                 <info>some text
                 </info>
                 EOF
-            ));
-
-        $this->assertEquals(<<<EOF
-            \033[32m
-            some text
-            \033[39m
-            EOF
-            , $formatter->format(<<<'EOF'
+            )
+        );
+
+        $this->assertEquals(
+            <<<EOF
+                \033[32m
+                some text
+                \033[39m
+                EOF,
+            $formatter->format(<<<'EOF'
                 <info>
                 some text
                 </info>
                 EOF
-            ));
-
-        $this->assertEquals(<<<EOF
-            \033[32m
-            some text
-            more text
-            \033[39m
-            EOF
-            , $formatter->format(<<<'EOF'
+            )
+        );
+
+        $this->assertEquals(
+            <<<EOF
+                \033[32m
+                some text
+                more text
+                \033[39m
+                EOF,
+            $formatter->format(<<<'EOF'
                 <info>
                 some text
                 more text
                 </info>
                 EOF
-            ));
+            )
+        );
     }
 
     public function testFormatAndWrap()

Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,8 @@ private function parseShortOptionSet(string $name): void`
`130`	`130`	`$this->addLongOption($option->getName(), $i === $len - 1 ? null : substr($name, $i + 1));`
`131`	`131`
`132`	`132`	`break;`
`133`		`- } else {`
`134`		`- $this->addLongOption($option->getName(), null);`
`135`	`133`	`}`
	`134`	`+ $this->addLongOption($option->getName(), null);`
`136`	`135`	`}`
`137`	`136`	`}`
`138`	`137`
Original file line number	Diff line number	Diff line change
`@@ -96,11 +96,11 @@ private function degradeHexColorToAnsi8(int $r, int $g, int $b): int`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`return (int) round(($r - 8) / 247 * 24) + 232;`
`99`		`- } else {`
`100`		`- return 16 +`
`101`		`- (36 * (int) round($r / 255 * 5)) +`
`102`		`- (6 * (int) round($g / 255 * 5)) +`
`103`		`- (int) round($b / 255 * 5);`
`104`	`99`	`}`
	`100`	`+`
	`101`	`+ return 16 +`
	`102`	`+ (36 * (int) round($r / 255 * 5)) +`
	`103`	`+ (6 * (int) round($g / 255 * 5)) +`
	`104`	`+ (int) round($b / 255 * 5);`
`105`	`105`	`}`
`106`	`106`	`}`