clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'PHP-8.3'"

Browse Source 
This reverts commit 5455c3fc01, reversing
changes made to ec8e86b96f.
This commit is contained in:
David Carlier 2023-12-23 16:04:46 +00:00
parent f420ea84aa
commit 20c72e1a43
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/intl/dateformat/dateformat_create.cpp
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() || ((locale_len == 1 && locale_str[0] != 'C') && strlen(locale.getISO3Language()) == 0)) {
zend_argument_value_error(1, "\"%s\" is invalid", locale_str);
if (locale.isBogus() || strlen(locale.getISO3Language()) == 0) {
zend_argument_value_error(1, "\"%s\" is invalid", locale_str);
return FAILURE;
}

15
ext/intl/tests/gh12943.phpt
View File

@ -1,15 +0,0 @@
--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"