make locale_lookup 4th parameter optional

Summary: Closes : facebook#6598 Closes facebook#6605 Reviewed By: sgolemon, JoelMarcey Differential Revision: D2700468 Pulled By: JoelMarcey fb-gh-sync-id: dd0bf39e8f2e8bd7f9ef7d5e3e4ed27bbb600bee
h4ck3rm1k3 · Nov 27, 2015 · 1940228 · 1940228
1 parent b707c69
commit 1940228
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/hphp/runtime/ext/icu/ext_icu_locale.php b/hphp/runtime/ext/icu/ext_icu_locale.php
@@ -504,7 +504,7 @@ function locale_get_script(string $locale): mixed {
 function locale_lookup(array $langtag,
                        string $locale,
                        bool $canonicalize = false,
-                       string $default): string {
+                       string $default = ""): string {
   return Locale::lookup($langtag, $locale, $canonicalize, $default);
 }
 

diff --git a/hphp/test/slow/ext_icu/locale-lookup-two-params.php b/hphp/test/slow/ext_icu/locale-lookup-two-params.php
@@ -0,0 +1,8 @@
+<?php
+$arr = array(
+    'de-DEVA',
+    'de-DE-1996',
+    'de',
+    'de-De'
+);
+echo locale_lookup($arr, 'de-DE-1996-x-prv1-prv2');
diff --git a/hphp/test/slow/ext_icu/locale-lookup-two-params.php.expect b/hphp/test/slow/ext_icu/locale-lookup-two-params.php.expect
@@ -0,0 +1 @@
+de-DE-1996