minor #40272 [Console] Handle calls to mb_ functions with non string arguments (Yopai)

nicolas-grekas · nicolas-grekas · commit b5dc77ea162d · 2021-02-22T19:44:15.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Console] Handle calls to mb_ functions with non string arguments | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #40200 | License | MIT | Doc PR | no In PHP8.1, a number of functions who were accepting null arguments will only accept string ones. (see https://wiki.php.net/rfc/deprecate_null_to_scalar_internal_arg) In the polyfill, mb_* functions are already declared with a strict type checking of "string". Therefore, it is necessary to get rid of the use of non string arguments when calling mb_* functions, so that it won't break when either using the polyfill,or future php8 versions. In every call where the argument may not be a string, this commit enforces the string type of the argument (with transtyping) --- For reviewers * I generally don't like transtyping, but found it was the more "secure" way (on a non-BC point of view) here. Specially in Console/Helper/Table.php, where $cell can be an object (there are 2 "$cell instanceof ... tests) However, where the argument can already be either null or string (and not anything else), there may a beter approach ? * It's the first time I send a PR on symfony, so don't hesitate pointing me to thinks I've forgotten to done. Commits ------- ac45be2 In calls to mb_ functions, silently transform arg into string
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);
         }

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`	`}`