Fix the name of arguments for PHP 8

azjezz · nicolas-grekas · commit beecef6b463b · 2020-10-23T11:01:57.000+02:00
diff --git a/bootstrap.php b/bootstrap.php
@@ -38,20 +38,20 @@ function sapi_windows_vt100_support($stream, $enable = null) { return p\Php72::s
     function stream_isatty($stream) { return p\Php72::stream_isatty($stream); }
 }
 if (!function_exists('utf8_encode')) {
-    function utf8_encode($s) { return p\Php72::utf8_encode($s); }
+    function utf8_encode($string) { return p\Php72::utf8_encode($string); }
 }
 if (!function_exists('utf8_decode')) {
-    function utf8_decode($s) { return p\Php72::utf8_decode($s); }
+    function utf8_decode($string) { return p\Php72::utf8_decode($string); }
 }
 if (!function_exists('spl_object_id')) {
-    function spl_object_id($s) { return p\Php72::spl_object_id($s); }
+    function spl_object_id($object) { return p\Php72::spl_object_id($object); }
 }
 if (!function_exists('mb_ord')) {
-    function mb_ord($s, $enc = null) { return p\Php72::mb_ord($s, $enc); }
+    function mb_ord($string, $encoding = null) { return p\Php72::mb_ord($string, $encoding); }
 }
 if (!function_exists('mb_chr')) {
-    function mb_chr($code, $enc = null) { return p\Php72::mb_chr($code, $enc); }
+    function mb_chr($codepoint, $encoding = null) { return p\Php72::mb_chr($codepoint, $encoding); }
 }
 if (!function_exists('mb_scrub')) {
-    function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); }
+    function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,20 +38,20 @@ function sapi_windows_vt100_support($stream, $enable = null) { return p\Php72::s`
`38`	`38`	`function stream_isatty($stream) { return p\Php72::stream_isatty($stream); }`
`39`	`39`	`}`
`40`	`40`	`if (!function_exists('utf8_encode')) {`
`41`		`- function utf8_encode($s) { return p\Php72::utf8_encode($s); }`
	`41`	`+ function utf8_encode($string) { return p\Php72::utf8_encode($string); }`
`42`	`42`	`}`
`43`	`43`	`if (!function_exists('utf8_decode')) {`
`44`		`- function utf8_decode($s) { return p\Php72::utf8_decode($s); }`
	`44`	`+ function utf8_decode($string) { return p\Php72::utf8_decode($string); }`
`45`	`45`	`}`
`46`	`46`	`if (!function_exists('spl_object_id')) {`
`47`		`- function spl_object_id($s) { return p\Php72::spl_object_id($s); }`
	`47`	`+ function spl_object_id($object) { return p\Php72::spl_object_id($object); }`
`48`	`48`	`}`
`49`	`49`	`if (!function_exists('mb_ord')) {`
`50`		`- function mb_ord($s, $enc = null) { return p\Php72::mb_ord($s, $enc); }`
	`50`	`+ function mb_ord($string, $encoding = null) { return p\Php72::mb_ord($string, $encoding); }`
`51`	`51`	`}`
`52`	`52`	`if (!function_exists('mb_chr')) {`
`53`		`- function mb_chr($code, $enc = null) { return p\Php72::mb_chr($code, $enc); }`
	`53`	`+ function mb_chr($codepoint, $encoding = null) { return p\Php72::mb_chr($codepoint, $encoding); }`
`54`	`54`	`}`
`55`	`55`	`if (!function_exists('mb_scrub')) {`
`56`		`- function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); }`
	`56`	`+ function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); }`
`57`	`57`	`}`