Add separate checks for all polyfilled functions and constants

JanJakes · nicolas-grekas · commit cda932e91edc · 2020-05-08T18:50:20.000+02:00
diff --git a/bootstrap.php b/bootstrap.php
@@ -20,6 +20,8 @@ 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); }
+    }
+    if (!function_exists('utf8_decode')) {
         function utf8_decode($s) { return p\Php72::utf8_decode($s); }
     }
     if (!function_exists('spl_object_id')) {
@@ -28,9 +30,13 @@ function spl_object_id($s) { return p\Php72::spl_object_id($s); }
     if (!defined('PHP_OS_FAMILY')) {
         define('PHP_OS_FAMILY', p\Php72::php_os_family());
     }
-    if (!function_exists('mb_chr')) {
+    if (!function_exists('mb_ord')) {
         function mb_ord($s, $enc = null) { return p\Php72::mb_ord($s, $enc); }
+    }
+    if (!function_exists('mb_chr')) {
         function mb_chr($code, $enc = null) { return p\Php72::mb_chr($code, $enc); }
+    }
+    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); }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ function stream_isatty($stream) { return p\Php72::stream_isatty($stream); }`
`20`	`20`	`}`
`21`	`21`	`if (!function_exists('utf8_encode')) {`
`22`	`22`	`function utf8_encode($s) { return p\Php72::utf8_encode($s); }`
	`23`	`+ }`
	`24`	`+ if (!function_exists('utf8_decode')) {`
`23`	`25`	`function utf8_decode($s) { return p\Php72::utf8_decode($s); }`
`24`	`26`	`}`
`25`	`27`	`if (!function_exists('spl_object_id')) {`
`@@ -28,9 +30,13 @@ function spl_object_id($s) { return p\Php72::spl_object_id($s); }`
`28`	`30`	`if (!defined('PHP_OS_FAMILY')) {`
`29`	`31`	`define('PHP_OS_FAMILY', p\Php72::php_os_family());`
`30`	`32`	`}`
`31`		`- if (!function_exists('mb_chr')) {`
	`33`	`+ if (!function_exists('mb_ord')) {`
`32`	`34`	`function mb_ord($s, $enc = null) { return p\Php72::mb_ord($s, $enc); }`
	`35`	`+ }`
	`36`	`+ if (!function_exists('mb_chr')) {`
`33`	`37`	`function mb_chr($code, $enc = null) { return p\Php72::mb_chr($code, $enc); }`
	`38`	`+ }`
	`39`	`+ if (!function_exists('mb_scrub')) {`
`34`	`40`	`function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); }`
`35`	`41`	`}`
`36`	`42`	`}`