Skip to content

[stable31] fix: group imip log messages by removing principal and uri #54053

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

Merged
merged 1 commit into from
Aug 1, 2025
Merged

[stable31] fix: group imip log messages by removing principal and uri #54053

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
10 changes: 8 additions & 2 deletions lib/private/Calendar/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,10 @@ public function handleIMipReply(
}

if (empty($found)) {
$this->logger->warning('iMip message event could not be processed because no corresponding event was found in any calendar ' . $principalUri . 'and UID' . $vEvent->{'UID'}->getValue());
$this->logger->warning('iMip message event could not be processed because no corresponding event was found in any calendar', [
'principalUri' => $principalUri,
'eventUid' => $vEvent->{'UID'}->getValue(),
]);
return false;
}

Expand Down Expand Up @@ -518,7 +521,10 @@ public function handleIMipCancel(
}

if (empty($found)) {
$this->logger->warning('iMip message event could not be processed because no corresponding event was found in any calendar ' . $principalUri . 'and UID' . $vEvent->{'UID'}->getValue());
$this->logger->warning('iMip message event could not be processed because no corresponding event was found in any calendar', [
'principalUri' => $principalUri,
'eventUid' => $vEvent->{'UID'}->getValue(),
]);
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions tests/lib/Calendar/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@ public function testHandleImipReplyEventNotFound(): void {
$calendarData->add('METHOD', 'REPLY');
// construct logger return
$this->logger->expects(self::once())->method('warning')
->with('iMip message event could not be processed because no corresponding event was found in any calendar ' . $principalUri . 'and UID' . $calendarData->VEVENT->UID->getValue());
->with('iMip message event could not be processed because no corresponding event was found in any calendar', ['principalUri' => $principalUri, 'eventUid' => $calendarData->VEVENT->UID->getValue()]);
// Act
$result = $manager->handleIMipReply($principalUri, $sender, $recipient, $calendarData->serialize());
// Assert
Expand Down Expand Up @@ -1525,7 +1525,7 @@ public function testHandleImipCancelEventNotFound(): void {
$calendarData->add('METHOD', 'CANCEL');
// construct logger return
$this->logger->expects(self::once())->method('warning')
->with('iMip message event could not be processed because no corresponding event was found in any calendar ' . $principalUri . 'and UID' . $calendarData->VEVENT->UID->getValue());
->with('iMip message event could not be processed because no corresponding event was found in any calendar', ['principalUri' => $principalUri, 'eventUid' => $calendarData->VEVENT->UID->getValue()]);
// Act
$result = $manager->handleIMipCancel($principalUri, $sender, $replyTo, $recipient, $calendarData->serialize());
// Assert
Expand Down
Loading