symfony · Nyholm · Apr 3, 2021 · Apr 3, 2021
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Console\Helper;

 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
-use Symfony\Component\String\UnicodeString;

 /**
 * Helper is the base class for all helper classes.
@@ -46,11 +45,7 @@ public function getHelperSet()
     */
    public static function strlen(?string $string)
    {
-        $string ?? $string = '';
-
-        if (preg_match('//u', $string)) {
-            return (new UnicodeString($string))->width(false);
-        }
+        $string = (string) $string;

        if (false === $encoding = mb_detect_encoding($string, null, true)) {
            return \strlen($string);
@@ -64,9 +59,9 @@ public static function strlen(?string $string)
     *
     * @return string The string subset
     */
-    public static function substr(?string $string, int $from, int $length = null)
+    public static function substr(string $string, int $from, int $length = null)
    {
-        $string ?? $string = '';
+        $string = (string) $string;

        if (false === $encoding = mb_detect_encoding($string, null, true)) {
            return substr($string, $from, $length);
@@ -123,13 +118,7 @@ public static function formatMemory(int $memory)

    public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, ?string $string)
    {
-        $string = self::removeDecoration($formatter, $string);
-
-        if (preg_match('//u', $string)) {
-            return (new UnicodeString($string))->width(true);
-        }
-
-        return self::strlen($string);
+        return self::strlen(self::removeDecoration($formatter, $string));
    }

    public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string)

@@ -311,7 +311,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
                        $remainingCharacters = substr($ret, \strlen(trim($this->mostRecentlyEnteredValue($fullChoice))));
                        $output->write($remainingCharacters);
                        $fullChoice .= $remainingCharacters;
-                        $i = (false === $encoding = mb_detect_encoding($fullChoice, null, true)) ? \strlen($fullChoice) : mb_strlen($fullChoice, $encoding);
+                        $i = self::strlen($fullChoice);

                        $matches = array_filter(
                            $autocomplete($ret),

@@ -501,6 +501,8 @@ private function createBlock(iterable $messages, string $type = null, string $st
            }

            $line = $prefix.$line;
+            $decorationLength = Helper::strlen($line) - Helper::strlenWithoutDecoration($this->getFormatter(), $line);
+            $messageLineLength = min($this->lineLength - $prefixLength - $indentLength + $decorationLength, $this->lineLength);
            $line .= str_repeat(' ', max($this->lineLength - Helper::strlenWithoutDecoration($this->getFormatter(), $line), 0));

            if ($style) {