In calls to mb_ functions, silently transform arg into string

Yopai · Yopai · commit 46702825b0e6 · 2021-02-22T15:42:20.000+01:00
In PHP8, a number of functions who were accepting null arguments will only accept
string ones.

In the polyfill, mb_* functions are declared with a trict type checking of "string".

Therefore, we deprecate the use of non string arguments, so that it won't break when either using the polyfill,
or future php8 versions.
diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
@@ -47,6 +47,8 @@ public function getHelperSet()
      */
     public static function strlen($string)
     {
+        $string = (string) $string;
+
         if (false === $encoding = mb_detect_encoding($string, null, true)) {
             return \strlen($string);
         }
@@ -65,6 +67,8 @@ public static function strlen($string)
      */
     public static function substr($string, $from, $length = null)
     {
+        $string = (string) $string;
+
         if (false === $encoding = mb_detect_encoding($string, null, true)) {
             return substr($string, $from, $length);
         }
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -513,8 +513,9 @@ private function renderCell(array $row, int $column, string $cellFormat): string
         }
 
         // str_pad won't work properly with multi-byte strings, we need to fix the padding
-        if (false !== $encoding = mb_detect_encoding($cell, null, true)) {
-            $width += \strlen($cell) - mb_strwidth($cell, $encoding);
+        $cellstr = (string) $cell;
+        if (false !== $encoding = mb_detect_encoding($cellstr, null, true)) {
+            $width += \strlen($cellstr) - mb_strwidth($cellstr, $encoding);
         }
 
         $style = $this->getColumnStyle($column);
@@ -523,7 +524,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::strlen($cellstr) - Helper::strlenWithoutDecoration($this->output->getFormatter(), $cellstr);
         $content = sprintf($style->getCellRowContentFormat(), $cell);
 
         return sprintf($cellFormat, str_pad($content, $width, $style->getPaddingChar(), $style->getPadType()));
diff --git a/src/Symfony/Component/ErrorHandler/Resources/views/exception.html.php b/src/Symfony/Component/ErrorHandler/Resources/views/exception.html.php
@@ -16,7 +16,7 @@
 
     <div class="exception-message-wrapper">
         <div class="container">
-            <h1 class="break-long-words exception-message<?= mb_strlen($exceptionMessage) > 180 ? ' long' : ''; ?>"><?= $this->formatFileFromText(nl2br($exceptionMessage)); ?></h1>
+            <h1 class="break-long-words exception-message<?= mb_strlen((string) $exceptionMessage) > 180 ? ' long' : ''; ?>"><?= $this->formatFileFromText(nl2br($exceptionMessage)); ?></h1>
 
             <div class="exception-illustration hidden-xs-down">
                 <?= $this->include('assets/images/symfony-ghost.svg.php'); ?>
diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -155,6 +155,8 @@ public function setAutoEtag()
      */
     public function setContentDisposition($disposition, $filename = '', $filenameFallback = '')
     {
+        $filename = (string) $filename;
+
         if ('' === $filename) {
             $filename = $this->file->getFilename();
         }
diff --git a/src/Symfony/Component/Mime/Test/Constraint/EmailHtmlBodyContains.php b/src/Symfony/Component/Mime/Test/Constraint/EmailHtmlBodyContains.php
@@ -43,7 +43,7 @@ protected function matches($message): bool
             throw new \LogicException('Unable to test a message HTML body on a RawMessage or Message instance.');
         }
 
-        return false !== mb_strpos($message->getHtmlBody(), $this->expectedText);
+        return false !== mb_strpos((string) $message->getHtmlBody(), $this->expectedText);
     }
 
     /**
diff --git a/src/Symfony/Component/Mime/Test/Constraint/EmailTextBodyContains.php b/src/Symfony/Component/Mime/Test/Constraint/EmailTextBodyContains.php
@@ -43,7 +43,7 @@ protected function matches($message): bool
             throw new \LogicException('Unable to test a message text body on a RawMessage or Message instance.');
         }
 
-        return false !== mb_strpos($message->getTextBody(), $this->expectedText);
+        return false !== mb_strpos((string) $message->getTextBody(), $this->expectedText);
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php b/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php
@@ -42,6 +42,8 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
         $keyTop = $this->getPosition($data);
 
         foreach ($messages->all($domain) as $source => $target) {
+            $target = (string) $target;
+
             $resources .= pack('V', $this->getPosition($data));
 
             $data .= pack('V', \strlen($target))
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -185,6 +185,8 @@ public function dumpScalar(Cursor $cursor, $type, $value)
      */
     public function dumpString(Cursor $cursor, $str, $bin, $cut)
     {
+        $str = (string) $str;
+
         $this->dumpKey($cursor);
         $attr = $cursor->attr;
 

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ public function getHelperSet()`
`47`	`47`	`*/`
`48`	`48`	`public static function strlen($string)`
`49`	`49`	`{`
	`50`	`+ $string = (string) $string;`
	`51`	`+`
`50`	`52`	`if (false === $encoding = mb_detect_encoding($string, null, true)) {`
`51`	`53`	`return \strlen($string);`
`52`	`54`	`}`
`@@ -65,6 +67,8 @@ public static function strlen($string)`
`65`	`67`	`*/`
`66`	`68`	`public static function substr($string, $from, $length = null)`
`67`	`69`	`{`
	`70`	`+ $string = (string) $string;`
	`71`	`+`
`68`	`72`	`if (false === $encoding = mb_detect_encoding($string, null, true)) {`
`69`	`73`	`return substr($string, $from, $length);`
`70`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -513,8 +513,9 @@ private function renderCell(array $row, int $column, string $cellFormat): string`
`513`	`513`	`}`
`514`	`514`
`515`	`515`	`// str_pad won't work properly with multi-byte strings, we need to fix the padding`
`516`		`- if (false !== $encoding = mb_detect_encoding($cell, null, true)) {`
`517`		`- $width += \strlen($cell) - mb_strwidth($cell, $encoding);`
	`516`	`+ $cellstr = (string) $cell;`
	`517`	`+ if (false !== $encoding = mb_detect_encoding($cellstr, null, true)) {`
	`518`	`+ $width += \strlen($cellstr) - mb_strwidth($cellstr, $encoding);`
`518`	`519`	`}`
`519`	`520`
`520`	`521`	`$style = $this->getColumnStyle($column);`
`@@ -523,7 +524,7 @@ private function renderCell(array $row, int $column, string $cellFormat): string`
`523`	`524`	`return sprintf($style->getBorderFormat(), str_repeat($style->getBorderChars()[2], $width));`
`524`	`525`	`}`
`525`	`526`
`526`		`- $width += Helper::strlen($cell) - Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);`
	`527`	`+ $width += Helper::strlen($cellstr) - Helper::strlenWithoutDecoration($this->output->getFormatter(), $cellstr);`
`527`	`528`	`$content = sprintf($style->getCellRowContentFormat(), $cell);`
`528`	`529`
`529`	`530`	`return sprintf($cellFormat, str_pad($content, $width, $style->getPaddingChar(), $style->getPadType()));`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,8 @@ public function setAutoEtag()`
`155`	`155`	`*/`
`156`	`156`	`public function setContentDisposition($disposition, $filename = '', $filenameFallback = '')`
`157`	`157`	`{`
	`158`	`+ $filename = (string) $filename;`
	`159`	`+`
`158`	`160`	`if ('' === $filename) {`
`159`	`161`	`$filename = $this->file->getFilename();`
`160`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ protected function matches($message): bool`
`43`	`43`	`throw new \LogicException('Unable to test a message HTML body on a RawMessage or Message instance.');`
`44`	`44`	`}`
`45`	`45`
`46`		`- return false !== mb_strpos($message->getHtmlBody(), $this->expectedText);`
	`46`	`+ return false !== mb_strpos((string) $message->getHtmlBody(), $this->expectedText);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,8 @@ public function dumpScalar(Cursor $cursor, $type, $value)`
`185`	`185`	`*/`
`186`	`186`	`public function dumpString(Cursor $cursor, $str, $bin, $cut)`
`187`	`187`	`{`
	`188`	`+ $str = (string) $str;`
	`189`	`+`
`188`	`190`	`$this->dumpKey($cursor);`
`189`	`191`	`$attr = $cursor->attr;`
`190`	`192`