Merge pull request #495 from malaynayak/php8-compatibility

paragonie-scott · web-flow · commit 8937eb3f627c · 2022-09-26T02:55:48.000-04:00
Fixed php 8 compatibility related to INI directive mbstring.func_overload.
diff --git a/src/Core.php b/src/Core.php
@@ -285,7 +285,7 @@ public static function ourStrlen($str)
     {
         static $exists = null;
         if ($exists === null) {
-            $exists = \extension_loaded('mbstring') && \ini_get('mbstring.func_overload') !== false && (int)\ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING;
+            $exists = \extension_loaded('mbstring') && \function_exists('mb_strlen');
         }
         if ($exists) {
             $length = \mb_strlen($str, '8bit');
@@ -311,7 +311,7 @@ public static function ourSubstr($str, $start, $length = null)
     {
         static $exists = null;
         if ($exists === null) {
-            $exists = \extension_loaded('mbstring') && \ini_get('mbstring.func_overload') !== false && (int)\ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING;
+            $exists = \extension_loaded('mbstring') && \function_exists('mb_substr');
         }
 
         // This is required to make mb_substr behavior identical to substr.

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ public static function ourStrlen($str)`
`285`	`285`	`{`
`286`	`286`	`static $exists = null;`
`287`	`287`	`if ($exists === null) {`
`288`		`- $exists = \extension_loaded('mbstring') && \ini_get('mbstring.func_overload') !== false && (int)\ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING;`
	`288`	`+ $exists = \extension_loaded('mbstring') && \function_exists('mb_strlen');`
`289`	`289`	`}`
`290`	`290`	`if ($exists) {`
`291`	`291`	`$length = \mb_strlen($str, '8bit');`
`@@ -311,7 +311,7 @@ public static function ourSubstr($str, $start, $length = null)`
`311`	`311`	`{`
`312`	`312`	`static $exists = null;`
`313`	`313`	`if ($exists === null) {`
`314`		`- $exists = \extension_loaded('mbstring') && \ini_get('mbstring.func_overload') !== false && (int)\ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING;`
	`314`	`+ $exists = \extension_loaded('mbstring') && \function_exists('mb_substr');`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`// This is required to make mb_substr behavior identical to substr.`