Sabre/VObject returns DateTimeImmutable, not a simple DateTime
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
This commit is contained in:
parent
86f28669fc
commit
a1df91da9d
|
@ -160,11 +160,13 @@ class IMipPlugin extends SabreIMipPlugin {
|
||||||
$lastOccurrence = $component->DTEND->getDateTime()->getTimeStamp();
|
$lastOccurrence = $component->DTEND->getDateTime()->getTimeStamp();
|
||||||
} elseif (isset($component->DURATION)) {
|
} elseif (isset($component->DURATION)) {
|
||||||
$endDate = clone $component->DTSTART->getDateTime();
|
$endDate = clone $component->DTSTART->getDateTime();
|
||||||
$endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
|
// $component->DTEND->getDateTime() returns DateTimeImmutable
|
||||||
|
$endDate = $endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
|
||||||
$lastOccurrence = $endDate->getTimeStamp();
|
$lastOccurrence = $endDate->getTimeStamp();
|
||||||
} elseif (!$component->DTSTART->hasTime()) {
|
} elseif (!$component->DTSTART->hasTime()) {
|
||||||
$endDate = clone $component->DTSTART->getDateTime();
|
$endDate = clone $component->DTSTART->getDateTime();
|
||||||
$endDate->modify('+1 day');
|
// $component->DTSTART->getDateTime() returns DateTimeImmutable
|
||||||
|
$endDate = $endDate->modify('+1 day');
|
||||||
$lastOccurrence = $endDate->getTimeStamp();
|
$lastOccurrence = $endDate->getTimeStamp();
|
||||||
} else {
|
} else {
|
||||||
$lastOccurrence = $firstOccurrence;
|
$lastOccurrence = $firstOccurrence;
|
||||||
|
|
|
@ -107,7 +107,11 @@ class IMipPluginTest extends TestCase {
|
||||||
/** @var Mailer | \PHPUnit_Framework_MockObject_MockObject $mailer */
|
/** @var Mailer | \PHPUnit_Framework_MockObject_MockObject $mailer */
|
||||||
$mailer = $this->getMockBuilder('OC\Mail\Mailer')->disableOriginalConstructor()->getMock();
|
$mailer = $this->getMockBuilder('OC\Mail\Mailer')->disableOriginalConstructor()->getMock();
|
||||||
$mailer->method('createMessage')->willReturn($mailMessage);
|
$mailer->method('createMessage')->willReturn($mailMessage);
|
||||||
|
if ($expectsMail) {
|
||||||
$mailer->expects($this->once())->method('send');
|
$mailer->expects($this->once())->method('send');
|
||||||
|
} else {
|
||||||
|
$mailer->expects($this->never())->method('send');
|
||||||
|
}
|
||||||
/** @var ILogger | \PHPUnit_Framework_MockObject_MockObject $logger */
|
/** @var ILogger | \PHPUnit_Framework_MockObject_MockObject $logger */
|
||||||
$logger = $this->getMockBuilder('OC\Log')->disableOriginalConstructor()->getMock();
|
$logger = $this->getMockBuilder('OC\Log')->disableOriginalConstructor()->getMock();
|
||||||
$timeFactory = $this->getMockBuilder(ITimeFactory::class)->disableOriginalConstructor()->getMock();
|
$timeFactory = $this->getMockBuilder(ITimeFactory::class)->disableOriginalConstructor()->getMock();
|
||||||
|
@ -118,8 +122,8 @@ class IMipPluginTest extends TestCase {
|
||||||
$message->method = 'REQUEST';
|
$message->method = 'REQUEST';
|
||||||
$message->message = new VCalendar();
|
$message->message = new VCalendar();
|
||||||
$message->message->add('VEVENT', array_merge([
|
$message->message->add('VEVENT', array_merge([
|
||||||
'UID' => $message->uid,
|
'UID' => 'uid1337',
|
||||||
'SEQUENCE' => $message->sequence,
|
'SEQUENCE' => 42,
|
||||||
'SUMMARY' => 'Fellowship meeting',
|
'SUMMARY' => 'Fellowship meeting',
|
||||||
], $veventParams));
|
], $veventParams));
|
||||||
$message->sender = 'mailto:gandalf@wiz.ard';
|
$message->sender = 'mailto:gandalf@wiz.ard';
|
||||||
|
@ -139,8 +143,8 @@ class IMipPluginTest extends TestCase {
|
||||||
[['DTSTART' => new \DateTime('2017-01-01 00:00:00')], false],
|
[['DTSTART' => new \DateTime('2017-01-01 00:00:00')], false],
|
||||||
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DTEND' => new \DateTime('2017-01-01 00:00:00')], false],
|
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DTEND' => new \DateTime('2017-01-01 00:00:00')], false],
|
||||||
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DTEND' => new \DateTime('2017-12-31 00:00:00')], true],
|
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DTEND' => new \DateTime('2017-12-31 00:00:00')], true],
|
||||||
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DURATION' => new \DateInterval('P1D')], false],
|
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DURATION' => 'P1D'], false],
|
||||||
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DURATION' => new \DateInterval('P1Y')], true],
|
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DURATION' => 'P52W'], true],
|
||||||
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DTEND' => new \DateTime('2017-01-01 00:00:00'), 'RRULE' => 'FREQ=WEEKLY'], true],
|
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DTEND' => new \DateTime('2017-01-01 00:00:00'), 'RRULE' => 'FREQ=WEEKLY'], true],
|
||||||
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DTEND' => new \DateTime('2017-01-01 00:00:00'), 'RRULE' => 'FREQ=WEEKLY;COUNT=3'], false],
|
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DTEND' => new \DateTime('2017-01-01 00:00:00'), 'RRULE' => 'FREQ=WEEKLY;COUNT=3'], false],
|
||||||
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DTEND' => new \DateTime('2017-01-01 00:00:00'), 'RRULE' => 'FREQ=WEEKLY;UNTIL=20170301T000000Z'], false],
|
[['DTSTART' => new \DateTime('2017-01-01 00:00:00'), 'DTEND' => new \DateTime('2017-01-01 00:00:00'), 'RRULE' => 'FREQ=WEEKLY;UNTIL=20170301T000000Z'], false],
|
||||||
|
|
Loading…
Reference in New Issue