Skip to content

[pull] master from php:master #944

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
pull merged 3 commits into from
May 21, 2026
+39 −3
Merged

[pull] master from php:master #944

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
27d593e
ext/intl: Fix argument position for uninitialized calendar arguments
LamentXU123 May 18, 2026
87efb35
Merge branch 'PHP-8.4' into PHP-8.5
devnexen May 21, 2026
cd2e060
Merge branch 'PHP-8.5'
devnexen May 21, 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
6 changes: 3 additions & 3 deletions ext/intl/calendar/calendar_methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ static void _php_intlcal_before_after(

when_co = Z_INTL_CALENDAR_P(when_object);
if (when_co->ucal == NULL) {
zend_argument_error(NULL, 2, "is uninitialized");
zend_argument_error(NULL, hasThis() ? 1 : 2, "is uninitialized");
RETURN_THROWS();
}

Expand Down Expand Up @@ -796,7 +796,7 @@ U_CFUNC PHP_FUNCTION(intlcal_is_equivalent_to)

other_co = Z_INTL_CALENDAR_P(other_object);
if (other_co->ucal == NULL) {
zend_argument_error(NULL, 2, "is uninitialized");
zend_argument_error(NULL, hasThis() ? 1 : 2, "is uninitialized");
RETURN_THROWS();
}

Expand Down Expand Up @@ -933,7 +933,7 @@ U_CFUNC PHP_FUNCTION(intlcal_equals)
CALENDAR_METHOD_FETCH_OBJECT;
other_co = Z_INTL_CALENDAR_P(other_object);
if (other_co->ucal == NULL) {
zend_argument_error(NULL, 2, "is uninitialized");
zend_argument_error(NULL, hasThis() ? 1 : 2, "is uninitialized");
RETURN_THROWS();
}

Expand Down
36 changes: 36 additions & 0 deletions ext/intl/tests/calendar_uninitialized_argument_position.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--TEST--
IntlCalendar methods report the correct argument position for uninitialized calendar arguments
--EXTENSIONS--
intl
--FILE--
<?php

$calendar = IntlGregorianCalendar::createFromDate(2024, 0, 1);
$uninitialized = (new ReflectionClass(IntlGregorianCalendar::class))->newInstanceWithoutConstructor();

foreach (['equals', 'before', 'after', 'isEquivalentTo'] as $method) {
try {
$calendar->$method($uninitialized);
} catch (Error $e) {
echo $method, ': ', $e->getMessage(), PHP_EOL;
}
}

foreach (['intlcal_equals', 'intlcal_before', 'intlcal_after', 'intlcal_is_equivalent_to'] as $function) {
try {
$function($calendar, $uninitialized);
} catch (Error $e) {
echo $function, ': ', $e->getMessage(), PHP_EOL;
}
}

?>
--EXPECT--
equals: IntlCalendar::equals(): Argument #1 ($other) is uninitialized
before: IntlCalendar::before(): Argument #1 ($other) is uninitialized
after: IntlCalendar::after(): Argument #1 ($other) is uninitialized
isEquivalentTo: IntlCalendar::isEquivalentTo(): Argument #1 ($other) is uninitialized
intlcal_equals: intlcal_equals(): Argument #2 ($other) is uninitialized
intlcal_before: intlcal_before(): Argument #2 ($other) is uninitialized
intlcal_after: intlcal_after(): Argument #2 ($other) is uninitialized
intlcal_is_equivalent_to: intlcal_is_equivalent_to(): Argument #2 ($other) is uninitialized