Skip to content

[intl] Preserve PHP-side state when cloning formatters #23652

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

Open
iliaal wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+54 −0
Open

[intl] Preserve PHP-side state when cloning formatters #23652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ PHP NEWS
registrations are freed while still reachable from the cycle collector.
(Ilia Alshanetsky)

- Intl:
. Fixed cloning IntlDateFormatter and MessageFormatter losing PHP-side state
such as dateType, timeType, calendar and the message pattern. (Ilia Alshanetsky)

@LamentXU123 LamentXU123 Sep 11, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: no need for new empty lines.


24 Sep 2026, PHP 8.4.26

Expand Down
7 changes: 7 additions & 0 deletions ext/intl/dateformat/dateformat_class.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ zend_object *IntlDateFormatter_object_clone(zend_object *object)
/* clone standard parts */
zend_objects_clone_members(&new_dfo->zo, &dfo->zo);

new_dfo->date_type = dfo->date_type;
new_dfo->time_type = dfo->time_type;
new_dfo->calendar = dfo->calendar;
if (dfo->requested_locale != NULL) {
new_dfo->requested_locale = estrdup(dfo->requested_locale);
}

/* clone formatter object */
if (DATE_FORMAT_OBJECT(dfo) != NULL) {
UErrorCode error = U_ZERO_ERROR;
Expand Down
6 changes: 6 additions & 0 deletions ext/intl/msgformat/msgformat_class.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ zend_object *MessageFormatter_object_clone(zend_object *object)
/* clone standard parts */
zend_objects_clone_members(&new_mfo->zo, &mfo->zo);

if (mfo->mf_data.orig_format != NULL) {
new_mfo->mf_data.orig_format = estrndup(mfo->mf_data.orig_format, mfo->mf_data.orig_format_len);
new_mfo->mf_data.orig_format_len = mfo->mf_data.orig_format_len;
}
new_mfo->mf_data.tz_set = mfo->mf_data.tz_set;

/* clone formatter object */
if (MSG_FORMAT_OBJECT(mfo) != NULL) {
UErrorCode error = U_ZERO_ERROR;
Expand Down
37 changes: 37 additions & 0 deletions ext/intl/tests/clone_preserves_php_fields.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
--TEST--
Cloning IntlDateFormatter and MessageFormatter preserves PHP-side fields
--EXTENSIONS--
intl
--FILE--
<?php
$d = new IntlDateFormatter('de_DE', IntlDateFormatter::LONG, IntlDateFormatter::MEDIUM, 'UTC', IntlDateFormatter::GREGORIAN);
$c = clone $d;
var_dump($c->getDateType());
var_dump($c->getTimeType());
var_dump($c->getCalendar());
var_dump($c->format(strtotime('2024-01-02 03:04:05 UTC')));
$c->setCalendar(IntlDateFormatter::GREGORIAN);
var_dump($c->getPattern());

$m = new MessageFormatter('en_US', '{0, number}');
$mc = clone $m;
var_dump($mc->getPattern());
var_dump($mc->format([1.5]));

date_default_timezone_set('UTC');
$t = new MessageFormatter('en_US', '{0,time,short}');
$dt = new DateTimeImmutable('2024-01-02 03:04:05', new DateTimeZone('UTC'));
$t->format([$dt]);
$tc = clone $t;
date_default_timezone_set('America/New_York');
var_dump($t->format([$dt]) === $tc->format([$dt]));
?>
--EXPECT--
int(1)
int(2)
int(1)
string(26) "2. Januar 2024 um 03:04:05"
string(23) "d. MMMM y 'um' HH:mm:ss"
string(11) "{0, number}"
string(3) "1.5"
bool(true)
Loading