Skip to content

Commit 8d5953c

Browse files
committed
Merge branch 'PHP-8.2'
2 parents 71766d7 + cb907d5 commit 8d5953c

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

ext/date/php_date.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ static zend_string *date_format(const char *format, size_t format_len, timelib_t
722722
/* timezone */
723723
case 'I': length = slprintf(buffer, sizeof(buffer), "%d", localtime ? offset->is_dst : 0); break;
724724
case 'p':
725-
if (!localtime || strcmp(offset->abbr, "UTC") == 0 || strcmp(offset->abbr, "Z") == 0) {
725+
if (!localtime || strcmp(offset->abbr, "UTC") == 0 || strcmp(offset->abbr, "Z") == 0 || strcmp(offset->abbr, "GMT+0000") == 0) {
726726
length = slprintf(buffer, sizeof(buffer), "%s", "Z");
727727
break;
728728
}

ext/date/tests/gh10447.phpt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--TEST--
2+
Bug GH-10447 ('p' format specifier does not yield 'Z' for 00:00)
3+
--FILE--
4+
<?php
5+
$date = new \DateTimeImmutable('2023-01-25T00:00:00+00:00');
6+
echo $date->format('Y-m-d\TH:i:sp'), "\n";
7+
8+
$date = new \DateTimeImmutable('2023-01-25T00:00:00-00:00');
9+
echo $date->format('Y-m-d\TH:i:sp'), "\n";
10+
?>
11+
--EXPECT--
12+
2023-01-25T00:00:00Z
13+
2023-01-25T00:00:00Z

0 commit comments

Comments
 (0)