Merge pull request #11010 from ADmad/patch-2

vimeo · Jun 10, 2024 · 2fa66e0 · 2fa66e0
2 parents d77790b + 626efd5
commit 2fa66e0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -6446,7 +6446,7 @@
 'litespeed_request_headers' => ['array'],
 'litespeed_response_headers' => ['array'],
 'Locale::acceptFromHttp' => ['string|false', 'header'=>'string'],
-'Locale::canonicalize' => ['string', 'locale'=>'string'],
+'Locale::canonicalize' => ['?string', 'locale'=>'string'],
 'Locale::composeLocale' => ['string', 'subtags'=>'array'],
 'Locale::filterMatches' => ['?bool', 'languageTag'=>'string', 'locale'=>'string', 'canonicalize='=>'bool'],
 'Locale::getAllVariants' => ['array', 'locale'=>'string'],

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -3393,7 +3393,7 @@
     'LimitIterator::seek' => ['int', 'offset'=>'int'],
     'LimitIterator::valid' => ['bool'],
     'Locale::acceptFromHttp' => ['string|false', 'header'=>'string'],
-    'Locale::canonicalize' => ['string', 'locale'=>'string'],
+    'Locale::canonicalize' => ['?string', 'locale'=>'string'],
     'Locale::composeLocale' => ['string', 'subtags'=>'array'],
     'Locale::filterMatches' => ['?bool', 'languageTag'=>'string', 'locale'=>'string', 'canonicalize='=>'bool'],
     'Locale::getAllVariants' => ['array', 'locale'=>'string'],

diff --git a/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
@@ -198,7 +198,6 @@ class InternalCallMapHandlerTest extends TestCase
         'infiniteiterator::getinneriterator' => ['8.1', '8.2', '8.3'],
         'iteratoriterator::getinneriterator' => ['8.1', '8.2', '8.3'],
         'limititerator::getinneriterator' => ['8.1', '8.2', '8.3'],
-        'locale::canonicalize' => ['8.1', '8.2', '8.3'],
         'locale::getallvariants' => ['8.1', '8.2', '8.3'],
         'locale::getkeywords' => ['8.1', '8.2', '8.3'],
         'locale::getprimarylanguage' => ['8.1', '8.2', '8.3'],