1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 16:22:37 +01:00

Merge branch 'PHP-8.3'

This commit is contained in:
David Carlier
2023-12-22 17:28:29 +00:00
2 changed files with 17 additions and 2 deletions

View File

@@ -112,8 +112,8 @@ 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) {
zend_argument_value_error(1, "\"%s\" is invalid", locale_str);
if (locale.isBogus() || ((locale_len == 1 && locale_str[0] != 'C') && strlen(locale.getISO3Language()) == 0)) {
zend_argument_value_error(1, "\"%s\" is invalid", locale_str);
return FAILURE;
}

View File

@@ -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"