diff --git a/dictionaries/CallMap_80.php b/dictionaries/CallMap_80.php index fa397fa420a..a5e91fc8eaf 100644 --- a/dictionaries/CallMap_80.php +++ b/dictionaries/CallMap_80.php @@ -26651,7 +26651,7 @@ ), 'get_cfg_var' => array ( - 0 => 'false|string', + 0 => 'array|false|string', 'option' => 'string', ), 'get_class' => diff --git a/dictionaries/CallMap_81.php b/dictionaries/CallMap_81.php index d1fbf0d4968..b62efa620c4 100644 --- a/dictionaries/CallMap_81.php +++ b/dictionaries/CallMap_81.php @@ -25595,7 +25595,7 @@ ), 'get_cfg_var' => array ( - 0 => 'false|string', + 0 => 'array|false|string', 'option' => 'string', ), 'get_class' => diff --git a/dictionaries/CallMap_82.php b/dictionaries/CallMap_82.php index 1f57949fafe..a754341e590 100644 --- a/dictionaries/CallMap_82.php +++ b/dictionaries/CallMap_82.php @@ -25662,7 +25662,7 @@ ), 'get_cfg_var' => array ( - 0 => 'false|string', + 0 => 'array|false|string', 'option' => 'string', ), 'get_class' => diff --git a/dictionaries/CallMap_83.php b/dictionaries/CallMap_83.php index 8088eb4acf0..cfe8cc79b4a 100644 --- a/dictionaries/CallMap_83.php +++ b/dictionaries/CallMap_83.php @@ -26302,7 +26302,7 @@ ), 'get_cfg_var' => array ( - 0 => 'false|string', + 0 => 'array|false|string', 'option' => 'string', ), 'get_class' => diff --git a/dictionaries/CallMap_84.php b/dictionaries/CallMap_84.php index 33db07d0a1e..9bccad5bc35 100644 --- a/dictionaries/CallMap_84.php +++ b/dictionaries/CallMap_84.php @@ -29860,7 +29860,7 @@ ), 'get_cfg_var' => array ( - 0 => 'false|string', + 0 => 'array|false|string', 'option' => 'string', ), 'get_class' => diff --git a/dictionaries/override/CallMap.php b/dictionaries/override/CallMap.php index 52b200cb736..deaf2cfde12 100644 --- a/dictionaries/override/CallMap.php +++ b/dictionaries/override/CallMap.php @@ -15748,7 +15748,7 @@ ), 'get_cfg_var' => array ( - 0 => 'false|string', + 0 => 'array|false|string', 'option' => 'string', ), 'get_class' => diff --git a/dictionaries/override/CallMap_80_delta.php b/dictionaries/override/CallMap_80_delta.php index 4cb416ebfa3..e8f310627b5 100644 --- a/dictionaries/override/CallMap_80_delta.php +++ b/dictionaries/override/CallMap_80_delta.php @@ -7689,7 +7689,7 @@ ), 'new' => array ( - 0 => 'false|string', + 0 => 'array|false|string', 'option' => 'string', ), ), diff --git a/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php index af2eb86a1a6..40ff2e5c5ac 100644 --- a/tests/Internal/Codebase/InternalCallMapHandlerTest.php +++ b/tests/Internal/Codebase/InternalCallMapHandlerTest.php @@ -78,7 +78,6 @@ class InternalCallMapHandlerTest extends TestCase * @var array> */ private static array $ignoredFunctions = [ - 'array_multisort', 'datefmt_create' => ['8.0'], 'get_class' => ['8.3', '8.4'], 'get_parent_class' => ['8.3', '8.4'], @@ -514,15 +513,21 @@ private function assertEntryParameters(ReflectionFunctionAbstract $function, arr 'optional' => false, 'type' => $entry, ]; - if (strncmp($normalizedKey, '&', 1) === 0) { - $normalizedEntry['byRef'] = true; - $normalizedKey = substr($normalizedKey, 1); - } - if (strncmp($normalizedKey, '...', 3) === 0) { - $normalizedEntry['variadic'] = true; - $normalizedKey = substr($normalizedKey, 3); - } + do { + if (strncmp($normalizedKey, '...', 3) === 0) { + $normalizedEntry['variadic'] = true; + $normalizedKey = substr($normalizedKey, 3); + continue; + } + + if (strncmp($normalizedKey, '&', 1) === 0) { + $normalizedEntry['byRef'] = true; + $normalizedKey = substr($normalizedKey, 1); + continue; + } + break; + } while (true); // Read the reference mode if ($normalizedEntry['byRef']) {