diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2023-01-05 15:47:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-05 15:47:29 +0100 |
| commit | c2b6922c336a71d3be9e32b87da9c17bcce53835 (patch) | |
| tree | d4dc2fe7a8da98e51a56e735607b47bfdfe8eaab | |
| parent | 4cda13255d780a7998bc94021918e9ca648f2abd (diff) | |
| parent | d58ecdcfad378132e9b1dcf47b098c45ccbc371d (diff) | |
| download | nextcloud-server-c2b6922c336a71d3be9e32b87da9c17bcce53835.tar.gz nextcloud-server-c2b6922c336a71d3be9e32b87da9c17bcce53835.zip | |
Merge pull request #35973 from nextcloud/fix/hook-into-event-lifecycle
Hook into sabre event lifecycle for iMip Messages
| -rw-r--r-- | apps/dav/lib/CalDAV/CalendarImpl.php | 2 | ||||
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/CalendarImplTest.php | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/apps/dav/lib/CalDAV/CalendarImpl.php b/apps/dav/lib/CalDAV/CalendarImpl.php index 3fb28a631a7..cc57aa36469 100644 --- a/apps/dav/lib/CalDAV/CalendarImpl.php +++ b/apps/dav/lib/CalDAV/CalendarImpl.php @@ -229,7 +229,7 @@ class CalendarImpl implements ICreateFromString, IHandleImipMessage { $iTipMessage->component = 'VEVENT'; $iTipMessage->sequence = isset($vEvent->{'SEQUENCE'}) ? (int)$vEvent->{'SEQUENCE'}->getValue() : 0; $iTipMessage->message = $vObject; - $schedulingPlugin->scheduleLocalDelivery($iTipMessage); + $server->server->emit('schedule', [$iTipMessage]); } public function getInvitationResponseServer(): InvitationResponseServer { diff --git a/apps/dav/tests/unit/CalDAV/CalendarImplTest.php b/apps/dav/tests/unit/CalDAV/CalendarImplTest.php index cc0b963634c..5adb7041e8b 100644 --- a/apps/dav/tests/unit/CalDAV/CalendarImplTest.php +++ b/apps/dav/tests/unit/CalDAV/CalendarImplTest.php @@ -168,9 +168,6 @@ EOF; $schedulingPlugin = $this->createMock(Plugin::class); $iTipMessage = $this->getITipMessage($message); $iTipMessage->recipient = "mailto:lewis@stardew-tent-living.com"; - $schedulingPlugin->expects(self::once()) - ->method('scheduleLocalDelivery') - ->with($iTipMessage); $server = $this->createMock(Server::class); $server->expects($this->any()) @@ -180,6 +177,8 @@ EOF; ['acl', $aclPlugin], ['caldav-schedule', $schedulingPlugin] ]); + $server->expects(self::once()) + ->method('emit'); $invitationResponseServer = $this->createPartialMock(InvitationResponseServer::class, ['getServer', 'isExternalAttendee']); $invitationResponseServer->server = $server; @@ -224,6 +223,8 @@ EOF; ['acl', $aclPlugin], ['caldav-schedule', $schedulingPlugin] ]); + $server->expects(self::never()) + ->method('emit'); $invitationResponseServer = $this->createPartialMock(InvitationResponseServer::class, ['getServer']); $invitationResponseServer->server = $server; |