Skip to content

Fix dateformat_format_variant3 test and split into different files #20901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devnexen merged 3 commits into from
Jan 12, 2026
+439 −388
Merged

Fix dateformat_format_variant3 test and split into different files #20901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bce23f
Merge branch 'master' of https://github.com/php/php-src
jordikroon Jan 8, 2026
f34e1e2
split dateformat_format_variant3 into separate tests
jordikroon Jan 10, 2026
3e67aca
Remove dangling --ARGS-- comment
jordikroon Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 134 additions & 0 deletions ext/intl/tests/dateformat_format_code_datetime_objects.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
--TEST--
datefmt_format_code DateTime input
--EXTENSIONS--
intl
--FILE--
<?php
function ut_main()
{
$timezone = 'GMT-10:00';
$locale_entry = 'en_US';

$datetype_arr = [
IntlDateFormatter::FULL,
IntlDateFormatter::LONG,
IntlDateFormatter::MEDIUM,
IntlDateFormatter::SHORT,
IntlDateFormatter::NONE
];

$d1 = new DateTime("2010-01-01 01:02:03", new DateTimeZone("UTC"));
$d2 = new DateTime("2000-12-31 03:04:05", new DateTimeZone("UTC"));
$d2->setTimezone(new DateTimeZone("America/Los_Angeles"));

$dates = [$d1, $d2];
$res_str = '';

foreach ($dates as $date_entry) {
foreach ($datetype_arr as $datetype_entry) {
$res_str .= "\n------------";
$res_str .= "\nDate is: ".var_export($date_entry, true);
$res_str .= "\n------------";

$fmt = ut_datefmt_create($locale_entry, $datetype_entry, $datetype_entry, $timezone, IntlDateFormatter::GREGORIAN);
$formatted = ut_datefmt_format($fmt, $date_entry);

// Replace narrow no-break space (U+202F) with regular space for consistent output.
// INTL doesn't seem to be very consistent about it either
$formatted = str_replace("\u{202F}", ' ', $formatted);

if (intl_get_error_code() == U_ZERO_ERROR) {
$res_str .= "\nFormatted DateTime is : $formatted";
} else {
$res_str .= "\nError while formatting as: '" . intl_get_error_message() . "'";
}
}
}

return $res_str;
}

include_once 'ut_common.inc';
ut_run();
?>
--EXPECT--
------------
Date is: \DateTime::__set_state(array(
'date' => '2010-01-01 01:02:03.000000',
'timezone_type' => 3,
'timezone' => 'UTC',
))
------------
Formatted DateTime is : Thursday, December 31, 2009 at 3:02:03 PM GMT-10:00
------------
Date is: \DateTime::__set_state(array(
'date' => '2010-01-01 01:02:03.000000',
'timezone_type' => 3,
'timezone' => 'UTC',
))
------------
Formatted DateTime is : December 31, 2009 at 3:02:03 PM GMT-10
------------
Date is: \DateTime::__set_state(array(
'date' => '2010-01-01 01:02:03.000000',
'timezone_type' => 3,
'timezone' => 'UTC',
))
------------
Formatted DateTime is : Dec 31, 2009, 3:02:03 PM
------------
Date is: \DateTime::__set_state(array(
'date' => '2010-01-01 01:02:03.000000',
'timezone_type' => 3,
'timezone' => 'UTC',
))
------------
Formatted DateTime is : 12/31/09, 3:02 PM
------------
Date is: \DateTime::__set_state(array(
'date' => '2010-01-01 01:02:03.000000',
'timezone_type' => 3,
'timezone' => 'UTC',
))
------------
Formatted DateTime is : 20091231 03:02 PM
------------
Date is: \DateTime::__set_state(array(
'date' => '2000-12-30 19:04:05.000000',
'timezone_type' => 3,
'timezone' => 'America/Los_Angeles',
))
------------
Formatted DateTime is : Saturday, December 30, 2000 at 5:04:05 PM GMT-10:00
------------
Date is: \DateTime::__set_state(array(
'date' => '2000-12-30 19:04:05.000000',
'timezone_type' => 3,
'timezone' => 'America/Los_Angeles',
))
------------
Formatted DateTime is : December 30, 2000 at 5:04:05 PM GMT-10
------------
Date is: \DateTime::__set_state(array(
'date' => '2000-12-30 19:04:05.000000',
'timezone_type' => 3,
'timezone' => 'America/Los_Angeles',
))
------------
Formatted DateTime is : Dec 30, 2000, 5:04:05 PM
------------
Date is: \DateTime::__set_state(array(
'date' => '2000-12-30 19:04:05.000000',
'timezone_type' => 3,
'timezone' => 'America/Los_Angeles',
))
------------
Formatted DateTime is : 12/30/00, 5:04 PM
------------
Date is: \DateTime::__set_state(array(
'date' => '2000-12-30 19:04:05.000000',
'timezone_type' => 3,
'timezone' => 'America/Los_Angeles',
))
------------
Formatted DateTime is : 20001230 05:04 PM
130 changes: 130 additions & 0 deletions ext/intl/tests/dateformat_format_code_localtime_array.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
--TEST--
datefmt_format_code localtime array
--EXTENSIONS--
intl
--FILE--
<?php
function ut_main()
{
$timezone = 'GMT-10:00';
$locale_entry = 'en_US';

$datetype_arr = [
IntlDateFormatter::FULL,
IntlDateFormatter::LONG,
IntlDateFormatter::MEDIUM,
IntlDateFormatter::SHORT,
IntlDateFormatter::NONE,
];

$localtime_arr = [
[
'tm_sec' => 24,
'tm_min' => 3,
'tm_hour' => 19,
'tm_mday' => 3,
'tm_mon' => 3,
'tm_year' => 105,
],
[
'tm_sec' => 21,
'tm_min' => 5,
'tm_hour' => 7,
'tm_mday' => 13,
'tm_mon' => 4,
'tm_year' => 205,
],
[
'tm_sec' => 11,
'tm_min' => 13,
'tm_hour' => 0,
'tm_mday' => 17,
'tm_mon' => 11,
'tm_year' => -5,
],
];

$res_str = '';

foreach ($localtime_arr as $localtime_entry) {
$res_str .= "\n------------\n";
$res_str .= "\nInput localtime is : ";
$res_str .= implode(' , ', array_map(
function ($k, $v) {
return "$k : '$v'";
},
array_keys($localtime_entry),
$localtime_entry
));

$res_str .= "\n------------\n";

foreach ($datetype_arr as $datetype_entry) {
$res_str .= "\nIntlDateFormatter locale = $locale_entry, datetype = $datetype_entry, timetype = $datetype_entry";
$fmt = ut_datefmt_create($locale_entry, $datetype_entry, $datetype_entry, $timezone, IntlDateFormatter::GREGORIAN);
$formatted = ut_datefmt_format($fmt, $localtime_entry);

// Replace narrow no-break space (U+202F) with regular space for consistent output.
// INTL doesn't seem to be very consistent about it either
$formatted = str_replace("\u{202F}", ' ', $formatted);

if (intl_get_error_code() == U_ZERO_ERROR) {
$res_str .= "\nFormatted localtime_array is : $formatted";
} else {
$res_str .= "\nError while formatting as: '" . intl_get_error_message() . "'";
}
}
}

return $res_str;
}

include_once 'ut_common.inc';
ut_run();
?>
--EXPECT--
------------

Input localtime is : tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_mday : '3' , tm_mon : '3' , tm_year : '105'
------------

IntlDateFormatter locale = en_US, datetype = 0, timetype = 0
Formatted localtime_array is : Sunday, April 3, 2005 at 7:03:24 PM GMT-10:00
IntlDateFormatter locale = en_US, datetype = 1, timetype = 1
Formatted localtime_array is : April 3, 2005 at 7:03:24 PM GMT-10
IntlDateFormatter locale = en_US, datetype = 2, timetype = 2
Formatted localtime_array is : Apr 3, 2005, 7:03:24 PM
IntlDateFormatter locale = en_US, datetype = 3, timetype = 3
Formatted localtime_array is : 4/3/05, 7:03 PM
IntlDateFormatter locale = en_US, datetype = -1, timetype = -1
Formatted localtime_array is : 20050403 07:03 PM
------------

Input localtime is : tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_mday : '13' , tm_mon : '4' , tm_year : '205'
------------

IntlDateFormatter locale = en_US, datetype = 0, timetype = 0
Formatted localtime_array is : Wednesday, May 13, 2105 at 7:05:21 AM GMT-10:00
IntlDateFormatter locale = en_US, datetype = 1, timetype = 1
Formatted localtime_array is : May 13, 2105 at 7:05:21 AM GMT-10
IntlDateFormatter locale = en_US, datetype = 2, timetype = 2
Formatted localtime_array is : May 13, 2105, 7:05:21 AM
IntlDateFormatter locale = en_US, datetype = 3, timetype = 3
Formatted localtime_array is : 5/13/05, 7:05 AM
IntlDateFormatter locale = en_US, datetype = -1, timetype = -1
Formatted localtime_array is : 21050513 07:05 AM
------------

Input localtime is : tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_mday : '17' , tm_mon : '11' , tm_year : '-5'
------------

IntlDateFormatter locale = en_US, datetype = 0, timetype = 0
Formatted localtime_array is : Tuesday, December 17, 1895 at 12:13:11 AM GMT-10:00
IntlDateFormatter locale = en_US, datetype = 1, timetype = 1
Formatted localtime_array is : December 17, 1895 at 12:13:11 AM GMT-10
IntlDateFormatter locale = en_US, datetype = 2, timetype = 2
Formatted localtime_array is : Dec 17, 1895, 12:13:11 AM
IntlDateFormatter locale = en_US, datetype = 3, timetype = 3
Formatted localtime_array is : 12/17/95, 12:13 AM
IntlDateFormatter locale = en_US, datetype = -1, timetype = -1
Formatted localtime_array is : 18951217 12:13 AM
Loading
Loading