Skip to content

fix: use RDATE in time range check and use all instances #735

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
SebastianKrupinski wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: use RDATE in time range check and use all instances #735

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
2 changes: 1 addition & 1 deletion lib/Component/VEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class VEvent extends VObject\Component
*/
public function isInTimeRange(\DateTimeInterface $start, \DateTimeInterface $end): bool
{
if ($this->RRULE) {
if ($this->RRULE || $this->RDATE) {
try {
$it = new EventIterator($this, null, $start->getTimezone());
} catch (NoInstancesException $e) {
Expand Down
6 changes: 5 additions & 1 deletion lib/Recur/EventIterator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,12 @@ public function __construct($input, ?string $uid = null, ?\DateTimeZone $timeZon
}

if (isset($this->masterEvent->RDATE)) {
$rdateValues = [];
foreach ($this->masterEvent->RDATE as $rdate) {
$rdateValues = array_merge($rdateValues, $rdate->getParts());
}
$this->recurIterator = new RDateIterator(
$this->masterEvent->RDATE->getParts(),
$rdateValues,
$this->startDate
);
} elseif (isset($this->masterEvent->RRULE)) {
Expand Down
35 changes: 35 additions & 0 deletions tests/VObject/Component/VEventTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,41 @@ public function timeRangeTestData(): array
$vevent9->RRULE = 'FREQ=DAILY';
$tests[] = [$vevent9, new \DateTime('2016-10-31'), new \DateTime('2016-12-12'), true];

// Added this test to check events with RDATE property with multiple dates
$vevent10 = clone $vevent;
$vevent10->DTSTART = '20140901T000000Z';
$vevent10->DTEND = '20140901T010000Z';
$vevent10->add('RDATE', ['20141001T000000Z', '20141101T000000Z']);
// DTSTART is the first occurrence
$tests[] = [$vevent10, new \DateTime('2014-09-01'), new \DateTime('2014-09-02'), true];
// RDATE adds additional occurrences on Oct 1 and Nov 1
$tests[] = [$vevent10, new \DateTime('2014-10-01'), new \DateTime('2014-10-02'), true];
$tests[] = [$vevent10, new \DateTime('2014-11-01'), new \DateTime('2014-11-02'), true];
// No occurrence in December
$tests[] = [$vevent10, new \DateTime('2014-12-01'), new \DateTime('2014-12-31'), false];
// Range that includes first occurrence
$tests[] = [$vevent10, new \DateTime('2014-08-01'), new \DateTime('2014-09-30'), true];
// Range that spans all occurrences
$tests[] = [$vevent10, new \DateTime('2014-08-01'), new \DateTime('2014-12-31'), true];

// Added this test to check events with RDATE property with multiple instances
$vevent11 = clone $vevent;
$vevent11->DTSTART = '20140901T000000Z';
$vevent11->DTEND = '20140901T010000Z';
$vevent11->add('RDATE', '20141001T000000Z');
$vevent11->add('RDATE', '20141101T000000Z');
// DTSTART is the first occurrence
$tests[] = [$vevent11, new \DateTime('2014-09-01'), new \DateTime('2014-09-02'), true];
// RDATE adds additional occurrences on Oct 1 and Nov 1
$tests[] = [$vevent11, new \DateTime('2014-10-01'), new \DateTime('2014-10-02'), true];
$tests[] = [$vevent11, new \DateTime('2014-11-01'), new \DateTime('2014-11-02'), true];
// No occurrence in December
$tests[] = [$vevent11, new \DateTime('2014-12-01'), new \DateTime('2014-12-31'), false];
// Range that includes first occurrence
$tests[] = [$vevent11, new \DateTime('2014-08-01'), new \DateTime('2014-09-30'), true];
// Range that spans all occurrences
$tests[] = [$vevent11, new \DateTime('2014-08-01'), new \DateTime('2014-12-31'), true];

return $tests;
}
}