symfony
diff --git a/‎src/Symfony/Component/Console/Helper/Helper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Helper/Helper.php
+33-7Lines changed: 33 additions & 7 deletions b/‎src/Symfony/Component/Console/Helper/Helper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Helper/Helper.php
+33-7Lines changed: 33 additions & 7 deletions
diff --git a/‎src/Symfony/Component/Console/Helper/ProgressBar.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Helper/ProgressBar.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Console/Helper/ProgressBar.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Helper/ProgressBar.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Console/Helper/Table.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Helper/Table.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Console/Helper/Table.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Helper/Table.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -45,6 +45,17 @@ public function getHelperSet()
      * @return int The length of the string
      */
     public static function strlen(?string $string)
+    {
+        return self::width($string);
+    }
+
+    /**
+     * Returns the width of a string, using mb_strwidth if it is available.
+     * The width is how many characters positions the string will use.
+     *
+     * @internal in Symfony 5.2
+     */
+    public static function width(?string $string): int
     {
         $string ?? $string = '';
 
@@ -59,6 +70,27 @@ public static function strlen(?string $string)
         return mb_strwidth($string, $encoding);
     }
 
+    /**
+     * Returns the length of a string, using mb_strlen if it is available.
+     * The length is related to how many bytes the string will use.
+     *
+     * @internal in Symfony 5.2
+     */
+    public static function length(?string $string): int
+    {
+        $string ?? $string = '';
+
+        if (preg_match('//u', $string)) {
+            return (new UnicodeString($string))->length();
+        }
+
+        if (false === $encoding = mb_detect_encoding($string, null, true)) {
+            return \strlen($string);
+        }
+
+        return mb_strlen($string, $encoding);
+    }
+
     /**
      * Returns the subset of a string, using mb_substr if it is available.
      *
@@ -123,13 +155,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::width(self::removeDecoration($formatter, $string));
     }
 
     public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string)
 
@@ -513,7 +513,7 @@ private static function initPlaceholderFormatters(): array
                 $completeBars = $bar->getBarOffset();
                 $display = str_repeat($bar->getBarCharacter(), $completeBars);
                 if ($completeBars < $bar->getBarWidth()) {
-                    $emptyBars = $bar->getBarWidth() - $completeBars - Helper::strlenWithoutDecoration($output->getFormatter(), $bar->getProgressCharacter());
+                    $emptyBars = $bar->getBarWidth() - $completeBars - Helper::length(Helper::removeDecoration($output->getFormatter(), $bar->getProgressCharacter()));
                     $display .= $bar->getProgressCharacter().str_repeat($bar->getEmptyBarCharacter(), $emptyBars);
                 }
 
 
@@ -511,7 +511,7 @@ private function renderCell(array $row, int $column, string $cellFormat): string
             return sprintf($style->getBorderFormat(), str_repeat($style->getBorderChars()[2], $width));
         }
 
-        $width += Helper::strlen($cell) - Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
+        $width += Helper::length($cell) - Helper::length(Helper::removeDecoration($this->output->getFormatter(), $cell));
         $content = sprintf($style->getCellRowContentFormat(), $cell);
 
         $padType = $style->getPadType();
Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ private static function initPlaceholderFormatters(): array`
`513`	`513`	`$completeBars = $bar->getBarOffset();`
`514`	`514`	`$display = str_repeat($bar->getBarCharacter(), $completeBars);`
`515`	`515`	`if ($completeBars < $bar->getBarWidth()) {`
`516`		`- $emptyBars = $bar->getBarWidth() - $completeBars - Helper::strlenWithoutDecoration($output->getFormatter(), $bar->getProgressCharacter());`
	`516`	`+ $emptyBars = $bar->getBarWidth() - $completeBars - Helper::length(Helper::removeDecoration($output->getFormatter(), $bar->getProgressCharacter()));`
`517`	`517`	`$display .= $bar->getProgressCharacter().str_repeat($bar->getEmptyBarCharacter(), $emptyBars);`
`518`	`518`	`}`
`519`	`519`
Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ private function renderCell(array $row, int $column, string $cellFormat): string`
`511`	`511`	`return sprintf($style->getBorderFormat(), str_repeat($style->getBorderChars()[2], $width));`
`512`	`512`	`}`
`513`	`513`
`514`		`- $width += Helper::strlen($cell) - Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);`
	`514`	`+ $width += Helper::length($cell) - Helper::length(Helper::removeDecoration($this->output->getFormatter(), $cell));`
`515`	`515`	`$content = sprintf($style->getCellRowContentFormat(), $cell);`
`516`	`516`
`517`	`517`	`$padType = $style->getPadType();`