Merge pull request #54053 from nextcloud/backport/54016/stable31

Author: skjnldsv

lib/private/Calendar/Manager.php

@@ -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;
 		}
 
@@ -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;
 		}
 

tests/lib/Calendar/ManagerTest.php

@@ -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
@@ -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