fix

Nyholm · Nyholm · commit 5e65d3b71645 · 2021-04-08T09:27:25.000+02:00
diff --git a/src/Symfony/Component/Console/Helper/FormatterHelper.php b/src/Symfony/Component/Console/Helper/FormatterHelper.php
@@ -48,12 +48,12 @@ public function formatBlock($messages, string $style, bool $large = false)
         foreach ($messages as $message) {
             $message = OutputFormatter::escape($message);
             $lines[] = sprintf($large ? '  %s  ' : ' %s ', $message);
-            $len = max(self::strwidth($message) + ($large ? 4 : 2), $len);
+            $len = max(self::width($message) + ($large ? 4 : 2), $len);
         }
 
         $messages = $large ? [str_repeat(' ', $len)] : [];
         for ($i = 0; isset($lines[$i]); ++$i) {
-            $messages[] = $lines[$i].str_repeat(' ', $len - self::strwidth($lines[$i]));
+            $messages[] = $lines[$i].str_repeat(' ', $len - self::width($lines[$i]));
         }
         if ($large) {
             $messages[] = str_repeat(' ', $len);
@@ -73,9 +73,9 @@ public function formatBlock($messages, string $style, bool $large = false)
      */
     public function truncate(string $message, int $length, string $suffix = '...')
     {
-        $computedLength = $length - self::strwidth($suffix);
+        $computedLength = $length - self::width($suffix);
 
-        if ($computedLength > self::strwidth($message)) {
+        if ($computedLength > self::width($message)) {
             return $message;
         }
 
diff --git a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Console\Output;
 
-use PHPUnit\TextUI\Help;
 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 use Symfony\Component\Console\Helper\Helper;
 use Symfony\Component\Console\Terminal;

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,12 @@ public function formatBlock($messages, string $style, bool $large = false)`
`48`	`48`	`foreach ($messages as $message) {`
`49`	`49`	`$message = OutputFormatter::escape($message);`
`50`	`50`	`$lines[] = sprintf($large ? ' %s ' : ' %s ', $message);`
`51`		`- $len = max(self::strwidth($message) + ($large ? 4 : 2), $len);`
	`51`	`+ $len = max(self::width($message) + ($large ? 4 : 2), $len);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$messages = $large ? [str_repeat(' ', $len)] : [];`
`55`	`55`	`for ($i = 0; isset($lines[$i]); ++$i) {`
`56`		`- $messages[] = $lines[$i].str_repeat(' ', $len - self::strwidth($lines[$i]));`
	`56`	`+ $messages[] = $lines[$i].str_repeat(' ', $len - self::width($lines[$i]));`
`57`	`57`	`}`
`58`	`58`	`if ($large) {`
`59`	`59`	`$messages[] = str_repeat(' ', $len);`
`@@ -73,9 +73,9 @@ public function formatBlock($messages, string $style, bool $large = false)`
`73`	`73`	`*/`
`74`	`74`	`public function truncate(string $message, int $length, string $suffix = '...')`
`75`	`75`	`{`
`76`		`- $computedLength = $length - self::strwidth($suffix);`
	`76`	`+ $computedLength = $length - self::width($suffix);`
`77`	`77`
`78`		`- if ($computedLength > self::strwidth($message)) {`
	`78`	`+ if ($computedLength > self::width($message)) {`
`79`	`79`	`return $message;`
`80`	`80`	`}`
`81`	`81`