[Console][FormatterHelper] Use helper strlen statically and remove duplicated code

fancyweb · fancyweb · commit f0d227db2f05 · 2019-12-29T18:51:53.000+01:00
diff --git a/src/Symfony/Component/Console/Helper/FormatterHelper.php b/src/Symfony/Component/Console/Helper/FormatterHelper.php
@@ -54,12 +54,12 @@ public function formatBlock($messages, $style, $large = false)
         foreach ($messages as $message) {
             $message = OutputFormatter::escape($message);
             $lines[] = sprintf($large ? '  %s  ' : ' %s ', $message);
-            $len = max($this->strlen($message) + ($large ? 4 : 2), $len);
+            $len = max(self::strlen($message) + ($large ? 4 : 2), $len);
         }
 
         $messages = $large ? [str_repeat(' ', $len)] : [];
         for ($i = 0; isset($lines[$i]); ++$i) {
-            $messages[] = $lines[$i].str_repeat(' ', $len - $this->strlen($lines[$i]));
+            $messages[] = $lines[$i].str_repeat(' ', $len - self::strlen($lines[$i]));
         }
         if ($large) {
             $messages[] = str_repeat(' ', $len);
@@ -83,17 +83,13 @@ public function formatBlock($messages, $style, $large = false)
      */
     public function truncate($message, $length, $suffix = '...')
     {
-        $computedLength = $length - $this->strlen($suffix);
+        $computedLength = $length - self::strlen($suffix);
 
-        if ($computedLength > $this->strlen($message)) {
+        if ($computedLength > self::strlen($message)) {
             return $message;
         }
 
-        if (false === $encoding = mb_detect_encoding($message, null, true)) {
-            return substr($message, 0, $length).$suffix;
-        }
-
-        return mb_substr($message, 0, $length, $encoding).$suffix;
+        return self::substr($message, 0, $length).$suffix;
     }
 
     /**
