diff --git a/resources/functionMap.php b/resources/functionMap.php
index 9a27b949e2..e270a95d7d 100644
--- a/resources/functionMap.php
+++ b/resources/functionMap.php
@@ -5953,41 +5953,41 @@
 'linkinfo' => ['int|false', 'filename'=>'string'],
 'litespeed_request_headers' => ['array'],
 'litespeed_response_headers' => ['array|false'],
-'Locale::acceptFromHttp' => ['string|false', 'header'=>'string'],
-'Locale::canonicalize' => ['string', 'locale'=>'string'],
-'Locale::composeLocale' => ['string', 'subtags'=>'array'],
-'Locale::filterMatches' => ['bool', 'langtag'=>'string', 'locale'=>'string', 'canonicalize='=>'bool'],
-'Locale::getAllVariants' => ['array', 'locale'=>'string'],
-'Locale::getDefault' => ['string'],
-'Locale::getDisplayLanguage' => ['string', 'locale'=>'string', 'in_locale='=>'string'],
-'Locale::getDisplayName' => ['string', 'locale'=>'string', 'in_locale='=>'string'],
-'Locale::getDisplayRegion' => ['string', 'locale'=>'string', 'in_locale='=>'string'],
-'Locale::getDisplayScript' => ['string', 'locale'=>'string', 'in_locale='=>'string'],
-'Locale::getDisplayVariant' => ['string', 'locale'=>'string', 'in_locale='=>'string'],
-'Locale::getKeywords' => ['array|false', 'locale'=>'string'],
-'Locale::getPrimaryLanguage' => ['string', 'locale'=>'string'],
-'Locale::getRegion' => ['string', 'locale'=>'string'],
-'Locale::getScript' => ['string', 'locale'=>'string'],
-'Locale::lookup' => ['string', 'langtag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'default='=>'string'],
-'Locale::parseLocale' => ['array', 'locale'=>'string'],
+'Locale::acceptFromHttp' => ['non-empty-string|false', 'header'=>'string'],
+'Locale::canonicalize' => ['non-empty-string|null', 'locale'=>'string'],
+'Locale::composeLocale' => ['string|false', 'subtags'=>'array'],
+'Locale::filterMatches' => ['bool|null', 'langtag'=>'string', 'locale'=>'string', 'canonicalize='=>'bool'],
+'Locale::getAllVariants' => ['array|null', 'locale'=>'string'],
+'Locale::getDefault' => ['non-empty-string'],
+'Locale::getDisplayLanguage' => ['non-empty-string', 'locale'=>'string', 'displayLocale='=>'string'],
+'Locale::getDisplayName' => ['non-empty-string', 'locale'=>'string', 'displayLocale='=>'string'],
+'Locale::getDisplayRegion' => ['non-empty-string', 'locale'=>'string', 'displayLocale='=>'string'],
+'Locale::getDisplayScript' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
+'Locale::getDisplayVariant' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
+'Locale::getKeywords' => ['array|null', 'locale'=>'string'],
+'Locale::getPrimaryLanguage' => ['non-empty-string|null', 'locale'=>'string'],
+'Locale::getRegion' => ['string|null', 'locale'=>'string'],
+'Locale::getScript' => ['string|null', 'locale'=>'string'],
+'Locale::lookup' => ['string|null', 'languageTag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'defaultLocale='=>'string'],
+'Locale::parseLocale' => ['array|null', 'locale'=>'string'],
 'Locale::setDefault' => ['bool', 'locale'=>'string'],
-'locale_accept_from_http' => ['string|false', 'header'=>'string'],
-'locale_canonicalize' => ['', 'arg1'=>''],
+'locale_accept_from_http' => ['non-empty-string|false', 'header'=>'string'],
+'locale_canonicalize' => ['non-empty-string|null', 'locale'=>'string'],
 'locale_compose' => ['string|false', 'subtags'=>'array'],
-'locale_filter_matches' => ['bool', 'langtag'=>'string', 'locale'=>'string', 'canonicalize='=>'bool'],
-'locale_get_all_variants' => ['array', 'locale'=>'string'],
-'locale_get_default' => ['string'],
-'locale_get_display_language' => ['string|false', 'locale'=>'string', 'in_locale='=>'string'],
-'locale_get_display_name' => ['string|false', 'locale'=>'string', 'in_locale='=>'string'],
-'locale_get_display_region' => ['string|false', 'locale'=>'string', 'in_locale='=>'string'],
-'locale_get_display_script' => ['string|false', 'locale'=>'string', 'in_locale='=>'string'],
-'locale_get_display_variant' => ['string|false', 'locale'=>'string', 'in_locale='=>'string'],
-'locale_get_keywords' => ['array|false', 'locale'=>'string'],
-'locale_get_primary_language' => ['string', 'locale'=>'string'],
-'locale_get_region' => ['string', 'locale'=>'string'],
-'locale_get_script' => ['string', 'locale'=>'string'],
-'locale_lookup' => ['string', 'langtag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'default='=>'string'],
-'locale_parse' => ['array', 'locale'=>'string'],
+'locale_filter_matches' => ['bool|null', 'langtag'=>'string', 'locale'=>'string', 'canonicalize='=>'bool'],
+'locale_get_all_variants' => ['array|null', 'locale'=>'string'],
+'locale_get_default' => ['non-empty-string'],
+'locale_get_display_language' => ['non-empty-string', 'locale'=>'string', 'displayLocale='=>'string'],
+'locale_get_display_name' => ['non-empty-string', 'locale'=>'string', 'displayLocale='=>'string'],
+'locale_get_display_region' => ['non-empty-string', 'locale'=>'string', 'displayLocale='=>'string'],
+'locale_get_display_script' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
+'locale_get_display_variant' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
+'locale_get_keywords' => ['array|null', 'locale'=>'string'],
+'locale_get_primary_language' => ['non-empty-string|null', 'locale'=>'string'],
+'locale_get_region' => ['string|null', 'locale'=>'string'],
+'locale_get_script' => ['string|null', 'locale'=>'string'],
+'locale_lookup' => ['string|null', 'langtag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'defaultLocale='=>'string'],
+'locale_parse' => ['array|null', 'locale'=>'string'],
 'locale_set_default' => ['bool', 'locale'=>'string'],
 'localeconv' => ['array'],
 'localtime' => ['array', 'timestamp='=>'int', 'associative_array='=>'bool'],
diff --git a/resources/functionMap_bleedingEdge.php b/resources/functionMap_bleedingEdge.php
index 7c54feb8a6..59a49022ca 100644
--- a/resources/functionMap_bleedingEdge.php
+++ b/resources/functionMap_bleedingEdge.php
@@ -127,6 +127,8 @@
 		'stream_socket_enable_crypto' => ['0|bool', 'stream'=>'resource', 'enable'=>'bool', 'crypto_method='=>'STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT|STREAM_CRYPTO_METHOD_SSLv23_CLIENT|STREAM_CRYPTO_METHOD_ANY_CLIENT|STREAM_CRYPTO_METHOD_TLS_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT|STREAM_CRYPTO_METHOD_SSLv2_SERVER|STREAM_CRYPTO_METHOD_SSLv3_SERVER|STREAM_CRYPTO_METHOD_SSLv23_SERVER|STREAM_CRYPTO_METHOD_ANY_SERVER|STREAM_CRYPTO_METHOD_TLS_SERVER|STREAM_CRYPTO_METHOD_TLSv1_0_SERVER|STREAM_CRYPTO_METHOD_TLSv1_1_SERVER|STREAM_CRYPTO_METHOD_TLSv1_2_SERVER|STREAM_CRYPTO_METHOD_TLSv1_3_SERVER', 'session_stream='=>'resource'],
 		'extract' => ['0|positive-int', '&rw_var_array'=>'array', 'extract_type='=>'EXTR_OVERWRITE|EXTR_SKIP|EXTR_PREFIX_SAME|EXTR_PREFIX_ALL|EXTR_PREFIX_INVALID|EXTR_IF_EXISTS|EXTR_PREFIX_IF_EXISTS|EXTR_REFS', 'prefix='=>'string|null'],
 		'RecursiveIteratorIterator::__construct' => ['void', 'iterator'=>'RecursiveIterator|IteratorAggregate', 'mode='=>'RecursiveIteratorIterator::LEAVES_ONLY|RecursiveIteratorIterator::SELF_FIRST|RecursiveIteratorIterator::CHILD_FIRST', 'flags='=>'0|RecursiveIteratorIterator::CATCH_GET_CHILD'],
+		'Locale::composeLocale' => ['string|false', 'subtags'=>'array{language:string, script?:string, region?:string, variant?:array<array-key,string>, private?:array<array-key,string>, extlang?:array<array-key,string>, variant0?:string, variant1?:string, variant2?:string, variant3?:string, variant4?:string, variant5?:string, variant6?:string, variant7?:string, variant8?:string, variant9?:string, variant10?:string, variant11?:string, variant12?:string, variant13?:string, variant14?:string,  private0?:string, private1?:string, private2?:string, private3?:string, private4?:string, private5?:string, private6?:string, private7?:string, private8?:string, private9?:string, private10?:string, private11?:string, private12?:string, private13?:string, private14?:string, extlang0?:string, extlang1?:string, extlang2?:string}'],
+		'locale_compose' => ['string|false', 'subtags'=>'array{language:string, script?:string, region?:string, variant?:array<array-key,string>, private?:array<array-key,string>, extlang?:array<array-key,string>, variant0?:string, variant1?:string, variant2?:string, variant3?:string, variant4?:string, variant5?:string, variant6?:string, variant7?:string, variant8?:string, variant9?:string, variant10?:string, variant11?:string, variant12?:string, variant13?:string, variant14?:string,  private0?:string, private1?:string, private2?:string, private3?:string, private4?:string, private5?:string, private6?:string, private7?:string, private8?:string, private9?:string, private10?:string, private11?:string, private12?:string, private13?:string, private14?:string, extlang0?:string, extlang1?:string, extlang2?:string}'],
 	],
 	'old' => [