Skip to content

Fix GH-7979: DatePeriod iterator advances when checking if valid #8175

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 2 commits into from
Closed

Fix GH-7979: DatePeriod iterator advances when checking if valid #8175

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1edfafa
GH-7979: iterator advances when checking if valid
Nacoma Mar 6, 2022
f035efd
style/readability updates
Nacoma Mar 28, 2022
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
32 changes: 20 additions & 12 deletions ext/date/php_date.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1451,16 +1451,6 @@ static int date_period_it_has_more(zend_object_iterator *iter)
{
date_period_it *iterator = (date_period_it *)iter;
php_period_obj *object = Z_PHPPERIOD_P(&iterator->intern.data);
timelib_time *it_time = object->current;

/* apply modification if it's not the first iteration */
if (!object->include_start_date || iterator->current_index > 0) {
it_time->have_relative = 1;
it_time->relative = *object->interval;
it_time->sse_uptodate = 0;
timelib_update_ts(it_time, NULL);
timelib_update_from_sse(it_time);
}

if (object->end) {
return object->current->sse < object->end->sse ? SUCCESS : FAILURE;
Expand Down Expand Up @@ -1505,9 +1495,17 @@ static void date_period_it_current_key(zend_object_iterator *iter, zval *key)
/* {{{ date_period_it_move_forward */
static void date_period_it_move_forward(zend_object_iterator *iter)
{
date_period_it *iterator = (date_period_it *)iter;
date_period_it *iterator = (date_period_it *)iter;
php_period_obj *object = Z_PHPPERIOD_P(&iterator->intern.data);
timelib_time *it_time = object->current;

it_time->have_relative = 1;
it_time->relative = *object->interval;
it_time->sse_uptodate = 0;
timelib_update_ts(it_time, NULL);
timelib_update_from_sse(it_time);

iterator->current_index++;
iterator->current_index++;
date_period_it_invalidate_current(iter);
}
/* }}} */
Expand All @@ -1525,7 +1523,17 @@ static void date_period_it_rewind(zend_object_iterator *iter)
zend_throw_error(NULL, "DatePeriod has not been initialized correctly");
return;
}

iterator->object->current = timelib_time_clone(iterator->object->start);

if (!iterator->object->include_start_date) {
iterator->object->current->have_relative = 1;
iterator->object->current->relative = *iterator->object->interval;
iterator->object->current->sse_uptodate = 0;
timelib_update_ts(iterator->object->current, NULL);
timelib_update_from_sse(iterator->object->current);
}

date_period_it_invalidate_current(iter);
}
/* }}} */
Expand Down
51 changes: 51 additions & 0 deletions ext/date/tests/DatePeriod_no_advance_on_valid.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
--TEST--
Date Period iterators do not advance on `valid()`
--FILE--
<?php

$start = DateTime::createFromFormat('Y-m-d', '2022-01-01');
$end = DateTime::createFromFormat('Y-m-d', '2022-01-04');
$interval = DateInterval::createFromDateString('1 day');
$period = new DatePeriod($start, $interval, $end);
$iterator = $period->getIterator();

foreach ($iterator as $item) {
echo $item->format('Y-m-d') . "\n";
}

echo "---------STEP 2\n";

foreach ($iterator as $item) {
$iterator->valid();
echo $item->format('Y-m-d') . "\n";
}

$period = new DatePeriod($start, $interval, $end, DatePeriod::EXCLUDE_START_DATE);
$iterator = $period->getIterator();

echo "---------STEP 3\n";

foreach ($iterator as $item) {
echo $item->format('Y-m-d') . "\n";
}

echo "---------STEP 4\n";

foreach ($iterator as $item) {
$iterator->valid();
echo $item->format('Y-m-d') . "\n";
}
--EXPECT--
2022-01-01
2022-01-02
2022-01-03
---------STEP 2
2022-01-01
2022-01-02
2022-01-03
---------STEP 3
2022-01-02
2022-01-03
---------STEP 4
2022-01-02
2022-01-03