Revert back changes of FormatterHelper.php

proggga · proggga · commit 913f8c3c8fda · 2019-10-15T20:50:01.000+03: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(static::strlen($message) + ($large ? 4 : 2), $len);
+            $len = max($this->strlen($message) + ($large ? 4 : 2), $len);
         }
 
         $messages = $large ? [str_repeat(' ', $len)] : [];
         for ($i = 0; isset($lines[$i]); ++$i) {
-            $messages[] = $lines[$i].str_repeat(' ', $len - static::strlen($lines[$i]));
+            $messages[] = $lines[$i].str_repeat(' ', $len - $this->strlen($lines[$i]));
         }
         if ($large) {
             $messages[] = str_repeat(' ', $len);
@@ -83,9 +83,9 @@ public function formatBlock($messages, $style, $large = false)
      */
     public function truncate($message, $length, $suffix = '...')
     {
-        $computedLength = $length - static::strlen($suffix);
+        $computedLength = $length - $this->strlen($suffix);
 
-        if ($computedLength > static::strlen($message)) {
+        if ($computedLength > $this->strlen($message)) {
             return $message;
         }
 
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -217,12 +217,12 @@ protected function prepareChoices($tag, ChoiceQuestion $question)
     {
         $choices = $question->getChoices();
 
-        $maxWidth = max(array_map([static::class, 'strlen'], array_keys($choices)));
+        $maxWidth = max(array_map([$this, 'strlen'], array_keys($choices)));
 
         $messages = [];
 
         foreach ($choices as $key => $value) {
-            $width = $maxWidth - static::strlen($key);
+            $width = $maxWidth - $this->strlen($key);
             // We using strlen + str_repeat to fix sprintf whitespace padding problem with UTF-8)
             $messages[] = sprintf('  [<%s>%s%s</%s>] %s', $tag, $key, str_repeat(' ', $width), $tag, $value);
         }

Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,12 @@ public function formatBlock($messages, $style, $large = false)`
`54`	`54`	`foreach ($messages as $message) {`
`55`	`55`	`$message = OutputFormatter::escape($message);`
`56`	`56`	`$lines[] = sprintf($large ? ' %s ' : ' %s ', $message);`
`57`		`- $len = max(static::strlen($message) + ($large ? 4 : 2), $len);`
	`57`	`+ $len = max($this->strlen($message) + ($large ? 4 : 2), $len);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`$messages = $large ? [str_repeat(' ', $len)] : [];`
`61`	`61`	`for ($i = 0; isset($lines[$i]); ++$i) {`
`62`		`- $messages[] = $lines[$i].str_repeat(' ', $len - static::strlen($lines[$i]));`
	`62`	`+ $messages[] = $lines[$i].str_repeat(' ', $len - $this->strlen($lines[$i]));`
`63`	`63`	`}`
`64`	`64`	`if ($large) {`
`65`	`65`	`$messages[] = str_repeat(' ', $len);`
`@@ -83,9 +83,9 @@ public function formatBlock($messages, $style, $large = false)`
`83`	`83`	`*/`
`84`	`84`	`public function truncate($message, $length, $suffix = '...')`
`85`	`85`	`{`
`86`		`- $computedLength = $length - static::strlen($suffix);`
	`86`	`+ $computedLength = $length - $this->strlen($suffix);`
`87`	`87`
`88`		`- if ($computedLength > static::strlen($message)) {`
	`88`	`+ if ($computedLength > $this->strlen($message)) {`
`89`	`89`	`return $message;`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -217,12 +217,12 @@ protected function prepareChoices($tag, ChoiceQuestion $question)`
`217`	`217`	`{`
`218`	`218`	`$choices = $question->getChoices();`
`219`	`219`
`220`		`- $maxWidth = max(array_map([static::class, 'strlen'], array_keys($choices)));`
	`220`	`+ $maxWidth = max(array_map([$this, 'strlen'], array_keys($choices)));`
`221`	`221`
`222`	`222`	`$messages = [];`
`223`	`223`
`224`	`224`	`foreach ($choices as $key => $value) {`
`225`		`- $width = $maxWidth - static::strlen($key);`
	`225`	`+ $width = $maxWidth - $this->strlen($key);`
`226`	`226`	`// We using strlen + str_repeat to fix sprintf whitespace padding problem with UTF-8)`
`227`	`227`	`$messages[] = sprintf(' [<%s>%s%s</%s>] %s', $tag, $key, str_repeat(' ', $width), $tag, $value);`
`228`	`228`	`}`