GH-12943 ext/intl accept C as acceptable locale argument.

Close GH-12955

Author: devnexen

NEWS

@@ -17,6 +17,10 @@ PHP                                                                        NEWS
     (Jakub Zelenka)
   . Fixed bug GH-12905 (FFI::new interacts badly with observers). (nielsdos)
 
+- Intl:
+  . Fixed GH-12943 (IntlDateFormatter::__construct accepts 'C' as valid locale).
+    (David Carlier)
+
 - Hash:
   . Fixed bug GH-12936 (hash() function hangs endlessly if using sha512 on
     strings >= 4GiB). (nielsdos)

ext/intl/dateformat/dateformat_create.cpp

@@ -112,7 +112,7 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_error_handlin
 	}
 	locale = Locale::createFromName(locale_str);
 	/* get*Name accessors being set does not preclude being bogus */
-	if (locale.isBogus() || strlen(locale.getISO3Language()) == 0) {
+	if (locale.isBogus() || ((locale_len == 1 && locale_str[0] != 'C') && strlen(locale.getISO3Language()) == 0)) {
 		goto error;
 	}
 

ext/intl/tests/gh12943.phpt

@@ -0,0 +1,15 @@
+--TEST--
+GitHub #12943 IntlDateFormatter::locale accepting "C".
+--EXTENSIONS--
+intl
+--FILE--
+<?php
+
+$fmt = new IntlDateFormatter(
+        'C',
+        IntlDateFormatter::FULL,
+        IntlDateFormatter::FULL,
+        );
+var_dump($fmt->getLocale(ULOC_VALID_LOCALE));
+--EXPECTF--
+string(%d) "%s"