Skip to content

GH-8458: DateInterval::createFromDateString does not throw if non-relative items are present #8500

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

Closed
wants to merge 1 commit into from
Closed

GH-8458: DateInterval::createFromDateString does not throw if non-relative items are present #8500

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 @@ -14,6 +14,10 @@ PHP NEWS
- Curl:
. Added support for CURLOPT_XFERINFOFUNCTION. (David Carlier)

- Date:
. Fixed GH-8458 (DateInterval::createFromDateString does not throw if
non-relative items are present). (Derick)

- FPM:
. Emit error for invalid port setting. (David Carlier)
. Added extra check for FPM proc dumpable on SELinux based systems.
Expand Down
6 changes: 6 additions & 0 deletions ext/date/php_date.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4333,6 +4333,12 @@ PHP_FUNCTION(date_interval_create_from_date_string)
goto cleanup;
}

if (time->have_date || time->have_time || time->have_zone) {
php_error_docref(NULL, E_WARNING, "String '%s' contains non-relative elements", ZSTR_VAL(time_str));
RETVAL_FALSE;
goto cleanup;
}

php_date_instantiate(date_ce_interval, return_value);
diobj = Z_PHPINTERVAL_P(return_value);
diobj->diff = timelib_rel_time_clone(&time->relative);
Expand Down
16 changes: 7 additions & 9 deletions ext/date/tests/DateInterval_serialize-003.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ Test DateInterval::__serialize and DateInterval::__unserialize
<?php
date_default_timezone_set("Europe/London");

// the 15:30 gets ignored, as it's not a "relative" interval.
// See: https://github.com/php/php-src/issues/8458
$d = DateInterval::createFromDateString('next weekday 15:30');
$d = DateInterval::createFromDateString('next weekday');
echo "Original object:\n";
var_dump($d);

Expand All @@ -26,7 +24,7 @@ $d = new DateInterval('P2Y4DT6H8M');
$d->__unserialize(
[
'from_string' => true,
'date_string' => 'next weekday 15:30',
'date_string' => 'next weekday',
]
);
var_dump($d);
Expand All @@ -42,20 +40,20 @@ object(DateInterval)#1 (%d) {
["from_string"]=>
bool(true)
["date_string"]=>
string(18) "next weekday 15:30"
string(%d) "next weekday"
}


Serialised object:
string(92) "O:12:"DateInterval":2:{s:11:"from_string";b:1;s:11:"date_string";s:18:"next weekday 15:30";}"
string(%d) "O:12:"DateInterval":2:{s:11:"from_string";b:1;s:11:"date_string";s:%d:"next weekday";}"


Unserialised object:
object(DateInterval)#2 (2) {
["from_string"]=>
bool(true)
["date_string"]=>
string(18) "next weekday 15:30"
string(%d) "next weekday"
}


Expand All @@ -64,7 +62,7 @@ array(2) {
["from_string"]=>
bool(true)
["date_string"]=>
string(18) "next weekday 15:30"
string(%d) "next weekday"
}


Expand All @@ -73,7 +71,7 @@ object(DateInterval)#3 (2) {
["from_string"]=>
bool(true)
["date_string"]=>
string(18) "next weekday 15:30"
string(%d) "next weekday"
}


Expand Down
36 changes: 36 additions & 0 deletions ext/date/tests/date_interval_non_relative_warning.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--TEST--
GH-8458 (DateInterval::createFromDateString does not warn when non-relative items are present)
--FILE--
<?php
$formats = [
'next weekday 15:30',
'+5 hours noon',
'-8 days March 23',
'+72 seconds UTC',
];

foreach ($formats as $format) {
$d = DateInterval::createFromDateString($format);
}

foreach ($formats as $format) {
$d = date_interval_create_from_date_string($format);
}

?>
--EXPECTF--
Warning: DateInterval::createFromDateString(): String 'next weekday 15:30' contains non-relative elements in %sdate_interval_non_relative_warning.php on line %d

Warning: DateInterval::createFromDateString(): String '+5 hours noon' contains non-relative elements in %sdate_interval_non_relative_warning.php on line %d

Warning: DateInterval::createFromDateString(): String '-8 days March 23' contains non-relative elements in %sdate_interval_non_relative_warning.php on line %d

Warning: DateInterval::createFromDateString(): String '+72 seconds UTC' contains non-relative elements in %sdate_interval_non_relative_warning.php on line %d

Warning: date_interval_create_from_date_string(): String 'next weekday 15:30' contains non-relative elements in %sdate_interval_non_relative_warning.php on line %d

Warning: date_interval_create_from_date_string(): String '+5 hours noon' contains non-relative elements in %sdate_interval_non_relative_warning.php on line %d

Warning: date_interval_create_from_date_string(): String '-8 days March 23' contains non-relative elements in %sdate_interval_non_relative_warning.php on line %d

Warning: date_interval_create_from_date_string(): String '+72 seconds UTC' contains non-relative elements in %sdate_interval_non_relative_warning.php on line %d