fixup! fix(CalDAV reminders): Fix timezone drift for all-day events

Signed-off-by: Christoph Wurst <[email protected]>

apps/dav/lib/CalDAV/Reminder/ReminderService.php

@@ -308,6 +308,10 @@ public function onCalendarObjectCreate(array $objectData):void {
 
 					try {
 						$triggerTime = $valarm->getEffectiveTriggerTime();
+						/**
+						 * @psalm-suppress DocblockTypeContradiction
+						 *   https://github.com/vimeo/psalm/issues/9244
+						 */
 						if ($triggerTime->getTimezone() === false || $triggerTime->getTimezone()->getName() === 'UTC') {
 							$triggerTime = new DateTimeImmutable(
 								$triggerTime->format('Y-m-d H:i:s'),
@@ -396,6 +400,10 @@ private function getRemindersForVAlarm(VAlarm $valarm,
 		$isRelative = $this->isAlarmRelative($valarm);
 		/** @var DateTimeImmutable $notificationDate */
 		$notificationDate = $valarm->getEffectiveTriggerTime();
+		/**
+		 * @psalm-suppress DocblockTypeContradiction
+		 *   https://github.com/vimeo/psalm/issues/9244
+		 */
 		if ($notificationDate->getTimezone() === false || $notificationDate->getTimezone()->getName() === 'UTC') {
 			$notificationDate = new DateTimeImmutable(
 				$notificationDate->format('Y-m-d H:i:s'),
@@ -855,10 +863,11 @@ private function getCalendarTimeZone(int $calendarid): DateTimeZone {
 			// Defaulting to UTC
 			return new DateTimeZone('UTC');
 		}
-		// This property contains a VCALENDAR with a single
-		// VTIMEZONE.
+		// This property contains a VCALENDAR with a single VTIMEZONE
+		/** @var string $timezoneProp */
+		$timezoneProp = $calendarInfo[$tzProp];
 		/** @var VObject\Component\VCalendar $vtimezoneObj */
-		$vtimezoneObj = VObject\Reader::read($calendarInfo[$tzProp]);
+		$vtimezoneObj = VObject\Reader::read($timezoneProp);
 		/** @var VObject\Component\VTimeZone $vtimezone */
 		$vtimezone = $vtimezoneObj->VTIMEZONE;
 		return $vtimezone->getTimeZone();