nextcloud / server

lib/public/Calendar/ICreateFromString.php

Indentation +6 added lines, -6 removed lines

@@ -32,10 +32,10 @@
  */
 interface ICreateFromString extends ICalendar {
 
-	/**
-	 * @since 23.0.0
-	 *
-	 * @throws CalendarException
-	 */
-	public function createFromString(string $name, string $calendarData): void;
+    /**
+     * @since 23.0.0
+     *
+     * @throws CalendarException
+     */
+    public function createFromString(string $name, string $calendarData): void;
 }

lib/private/Calendar/Manager.php

Indentation +337 added lines, -337 removed lines

@@ -48,341 +48,341 @@
 
 class Manager implements IManager {
 
-	/**
-	 * @var ICalendar[] holds all registered calendars
-	 */
-	private $calendars = [];
-
-	/**
-	 * @var \Closure[] to call to load/register calendar providers
-	 */
-	private $calendarLoaders = [];
-
-	/** @var Coordinator */
-	private $coordinator;
-
-	/** @var ContainerInterface */
-	private $container;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	private ITimeFactory $timeFactory;
-
-
-	public function __construct(Coordinator $coordinator,
-								ContainerInterface $container,
-								LoggerInterface $logger,
-								ITimeFactory $timeFactory) {
-		$this->coordinator = $coordinator;
-		$this->container = $container;
-		$this->logger = $logger;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * This function is used to search and find objects within the user's calendars.
-	 * In case $pattern is empty all events/journals/todos will be returned.
-	 *
-	 * @param string $pattern which should match within the $searchProperties
-	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options - optional parameters:
-	 * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
-	 * @param integer|null $limit - limit number of search results
-	 * @param integer|null $offset - offset for paging of search results
-	 * @return array an array of events/journals/todos which are arrays of arrays of key-value-pairs
-	 * @since 13.0.0
-	 */
-	public function search($pattern, array $searchProperties = [], array $options = [], $limit = null, $offset = null) {
-		$this->loadCalendars();
-		$result = [];
-		foreach ($this->calendars as $calendar) {
-			$r = $calendar->search($pattern, $searchProperties, $options, $limit, $offset);
-			foreach ($r as $o) {
-				$o['calendar-key'] = $calendar->getKey();
-				$result[] = $o;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Check if calendars are available
-	 *
-	 * @return bool true if enabled, false if not
-	 * @since 13.0.0
-	 */
-	public function isEnabled() {
-		return !empty($this->calendars) || !empty($this->calendarLoaders);
-	}
-
-	/**
-	 * Registers a calendar
-	 *
-	 * @param ICalendar $calendar
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function registerCalendar(ICalendar $calendar) {
-		$this->calendars[$calendar->getKey()] = $calendar;
-	}
-
-	/**
-	 * Unregisters a calendar
-	 *
-	 * @param ICalendar $calendar
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function unregisterCalendar(ICalendar $calendar) {
-		unset($this->calendars[$calendar->getKey()]);
-	}
-
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * calendars are actually requested
-	 *
-	 * @param \Closure $callable
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function register(\Closure $callable) {
-		$this->calendarLoaders[] = $callable;
-	}
-
-	/**
-	 * @return ICalendar[]
-	 * @since 13.0.0
-	 */
-	public function getCalendars() {
-		$this->loadCalendars();
-
-		return array_values($this->calendars);
-	}
-
-	/**
-	 * removes all registered calendar instances
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function clear() {
-		$this->calendars = [];
-		$this->calendarLoaders = [];
-	}
-
-	/**
-	 * loads all calendars
-	 */
-	private function loadCalendars() {
-		foreach ($this->calendarLoaders as $callable) {
-			$callable($this);
-		}
-		$this->calendarLoaders = [];
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @param array $calendarUris
-	 * @return ICreateFromString[]
-	 */
-	public function getCalendarsForPrincipal(string $principalUri, array $calendarUris = []): array {
-		$context = $this->coordinator->getRegistrationContext();
-		if ($context === null) {
-			return [];
-		}
-
-		return array_merge(
-			...array_map(function ($registration) use ($principalUri, $calendarUris) {
-				try {
-					/** @var ICalendarProvider $provider */
-					$provider = $this->container->get($registration->getService());
-				} catch (Throwable $e) {
-					$this->logger->error('Could not load calendar provider ' . $registration->getService() . ': ' . $e->getMessage(), [
-						'exception' => $e,
-					]);
-					return [];
-				}
-
-				return $provider->getCalendars($principalUri, $calendarUris);
-			}, $context->getCalendarProviders())
-		);
-	}
-
-	public function searchForPrincipal(ICalendarQuery $query): array {
-		/** @var CalendarQuery $query */
-		$calendars = $this->getCalendarsForPrincipal(
-			$query->getPrincipalUri(),
-			$query->getCalendarUris(),
-		);
-
-		$results = [];
-		foreach ($calendars as $calendar) {
-			$r = $calendar->search(
-				$query->getSearchPattern() ?? '',
-				$query->getSearchProperties(),
-				$query->getOptions(),
-				$query->getLimit(),
-				$query->getOffset()
-			);
-
-			foreach ($r as $o) {
-				$o['calendar-key'] = $calendar->getKey();
-				$results[] = $o;
-			}
-		}
-		return $results;
-	}
-
-	public function newQuery(string $principalUri): ICalendarQuery {
-		return new CalendarQuery($principalUri);
-	}
-
-	/**
-	 * @throws \OCP\DB\Exception
-	 */
-	public function handleIMipReply(string $principalUri, string $sender, string $recipient, string $calendarData): bool {
-		/** @var VCalendar $vObject */
-		$vObject = Reader::read($calendarData);
-		/** @var VEvent $vEvent */
-		$vEvent = $vObject->{'VEVENT'};
-
-		// First, we check if the correct method is passed to us
-		if (strcasecmp('REPLY', $vObject->{'METHOD'}->getValue()) !== 0) {
-			$this->logger->warning('Wrong method provided for processing');
-			return false;
-		}
-
-		// check if mail recipient and organizer are one and the same
-		$organizer = substr($vEvent->{'ORGANIZER'}->getValue(), 7);
-
-		if (strcasecmp($recipient, $organizer) !== 0) {
-			$this->logger->warning('Recipient and ORGANIZER must be identical');
-			return false;
-		}
-
-		//check if the event is in the future
-		/** @var DateTime $eventTime */
-		$eventTime = $vEvent->{'DTSTART'};
-		if ($eventTime->getDateTime()->getTimeStamp() < $this->timeFactory->getTime()) { // this might cause issues with recurrences
-			$this->logger->warning('Only events in the future are processed');
-			return false;
-		}
-
-		$calendars = $this->getCalendarsForPrincipal($principalUri);
-		if (empty($calendars)) {
-			$this->logger->warning('Could not find any calendars for principal ' . $principalUri);
-			return false;
-		}
-
-		$found = null;
-		// if the attendee has been found in at least one calendar event with the UID of the iMIP event
-		// we process it.
-		// Benefit: no attendee lost
-		// Drawback: attendees that have been deleted will still be able to update their partstat
-		foreach ($calendars as $calendar) {
-			// We should not search in writable calendars
-			if ($calendar instanceof IHandleImipMessage) {
-				$o = $calendar->search($sender, ['ATTENDEE'], ['uid' => $vEvent->{'UID'}->getValue()]);
-				if (!empty($o)) {
-					$found = $calendar;
-					$name = $o[0]['uri'];
-					break;
-				}
-			}
-		}
-
-		if (empty($found)) {
-			$this->logger->info('Event not found in any calendar for principal ' . $principalUri . 'and UID' . $vEvent->{'UID'}->getValue());
-			return false;
-		}
-
-		try {
-			$found->handleIMipMessage($name, $calendarData); // sabre will handle the scheduling behind the scenes
-		} catch (CalendarException $e) {
-			$this->logger->error('Could not update calendar for iMIP processing', ['exception' => $e]);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @since 25.0.0
-	 * @throws \OCP\DB\Exception
-	 */
-	public function handleIMipCancel(string $principalUri, string $sender, ?string $replyTo, string $recipient, string $calendarData): bool {
-		$vObject = Reader::read($calendarData);
-		/** @var VEvent $vEvent */
-		$vEvent = $vObject->{'VEVENT'};
-
-		// First, we check if the correct method is passed to us
-		if (strcasecmp('CANCEL', $vObject->{'METHOD'}->getValue()) !== 0) {
-			$this->logger->warning('Wrong method provided for processing');
-			return false;
-		}
-
-		$attendee = substr($vEvent->{'ATTENDEE'}->getValue(), 7);
-		if (strcasecmp($recipient, $attendee) !== 0) {
-			$this->logger->warning('Recipient must be an ATTENDEE of this event');
-			return false;
-		}
-
-		// Thirdly, we need to compare the email address the CANCEL is coming from (in Mail)
-		// or the Reply- To Address submitted with the CANCEL email
-		// to the email address in the ORGANIZER.
-		// We don't want to accept a CANCEL request from just anyone
-		$organizer = substr($vEvent->{'ORGANIZER'}->getValue(), 7);
-		$isNotOrganizer = ($replyTo !== null) ? (strcasecmp($sender, $organizer) !== 0 && strcasecmp($replyTo, $organizer) !== 0) : (strcasecmp($sender, $organizer) !== 0);
-		if ($isNotOrganizer) {
-			$this->logger->warning('Sender must be the ORGANIZER of this event');
-			return false;
-		}
-
-		//check if the event is in the future
-		/** @var DateTime $eventTime */
-		$eventTime = $vEvent->{'DTSTART'};
-		if ($eventTime->getDateTime()->getTimeStamp() < $this->timeFactory->getTime()) { // this might cause issues with recurrences
-			$this->logger->warning('Only events in the future are processed');
-			return false;
-		}
-
-		// Check if we have a calendar to work with
-		$calendars = $this->getCalendarsForPrincipal($principalUri);
-		if (empty($calendars)) {
-			$this->logger->warning('Could not find any calendars for principal ' . $principalUri);
-			return false;
-		}
-
-		$found = null;
-		// if the attendee has been found in at least one calendar event with the UID of the iMIP event
-		// we process it.
-		// Benefit: no attendee lost
-		// Drawback: attendees that have been deleted will still be able to update their partstat
-		foreach ($calendars as $calendar) {
-			// We should not search in writable calendars
-			if ($calendar instanceof IHandleImipMessage) {
-				$o = $calendar->search($recipient, ['ATTENDEE'], ['uid' => $vEvent->{'UID'}->getValue()]);
-				if (!empty($o)) {
-					$found = $calendar;
-					$name = $o[0]['uri'];
-					break;
-				}
-			}
-		}
-
-		if (empty($found)) {
-			$this->logger->info('Event not found in any calendar for principal ' . $principalUri . 'and UID' . $vEvent->{'UID'}->getValue());
-			// this is a safe operation
-			// we can ignore events that have been cancelled but were not in the calendar anyway
-			return true;
-		}
-
-		try {
-			$found->handleIMipMessage($name, $calendarData); // sabre will handle the scheduling behind the scenes
-			return true;
-		} catch (CalendarException $e) {
-			$this->logger->error('Could not update calendar for iMIP processing', ['exception' => $e]);
-			return false;
-		}
-	}
+    /**
+     * @var ICalendar[] holds all registered calendars
+     */
+    private $calendars = [];
+
+    /**
+     * @var \Closure[] to call to load/register calendar providers
+     */
+    private $calendarLoaders = [];
+
+    /** @var Coordinator */
+    private $coordinator;
+
+    /** @var ContainerInterface */
+    private $container;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    private ITimeFactory $timeFactory;
+
+
+    public function __construct(Coordinator $coordinator,
+                                ContainerInterface $container,
+                                LoggerInterface $logger,
+                                ITimeFactory $timeFactory) {
+        $this->coordinator = $coordinator;
+        $this->container = $container;
+        $this->logger = $logger;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * This function is used to search and find objects within the user's calendars.
+     * In case $pattern is empty all events/journals/todos will be returned.
+     *
+     * @param string $pattern which should match within the $searchProperties
+     * @param array $searchProperties defines the properties within the query pattern should match
+     * @param array $options - optional parameters:
+     * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
+     * @param integer|null $limit - limit number of search results
+     * @param integer|null $offset - offset for paging of search results
+     * @return array an array of events/journals/todos which are arrays of arrays of key-value-pairs
+     * @since 13.0.0
+     */
+    public function search($pattern, array $searchProperties = [], array $options = [], $limit = null, $offset = null) {
+        $this->loadCalendars();
+        $result = [];
+        foreach ($this->calendars as $calendar) {
+            $r = $calendar->search($pattern, $searchProperties, $options, $limit, $offset);
+            foreach ($r as $o) {
+                $o['calendar-key'] = $calendar->getKey();
+                $result[] = $o;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Check if calendars are available
+     *
+     * @return bool true if enabled, false if not
+     * @since 13.0.0
+     */
+    public function isEnabled() {
+        return !empty($this->calendars) || !empty($this->calendarLoaders);
+    }
+
+    /**
+     * Registers a calendar
+     *
+     * @param ICalendar $calendar
+     * @return void
+     * @since 13.0.0
+     */
+    public function registerCalendar(ICalendar $calendar) {
+        $this->calendars[$calendar->getKey()] = $calendar;
+    }
+
+    /**
+     * Unregisters a calendar
+     *
+     * @param ICalendar $calendar
+     * @return void
+     * @since 13.0.0
+     */
+    public function unregisterCalendar(ICalendar $calendar) {
+        unset($this->calendars[$calendar->getKey()]);
+    }
+
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * calendars are actually requested
+     *
+     * @param \Closure $callable
+     * @return void
+     * @since 13.0.0
+     */
+    public function register(\Closure $callable) {
+        $this->calendarLoaders[] = $callable;
+    }
+
+    /**
+     * @return ICalendar[]
+     * @since 13.0.0
+     */
+    public function getCalendars() {
+        $this->loadCalendars();
+
+        return array_values($this->calendars);
+    }
+
+    /**
+     * removes all registered calendar instances
+     * @return void
+     * @since 13.0.0
+     */
+    public function clear() {
+        $this->calendars = [];
+        $this->calendarLoaders = [];
+    }
+
+    /**
+     * loads all calendars
+     */
+    private function loadCalendars() {
+        foreach ($this->calendarLoaders as $callable) {
+            $callable($this);
+        }
+        $this->calendarLoaders = [];
+    }
+
+    /**
+     * @param string $principalUri
+     * @param array $calendarUris
+     * @return ICreateFromString[]
+     */
+    public function getCalendarsForPrincipal(string $principalUri, array $calendarUris = []): array {
+        $context = $this->coordinator->getRegistrationContext();
+        if ($context === null) {
+            return [];
+        }
+
+        return array_merge(
+            ...array_map(function ($registration) use ($principalUri, $calendarUris) {
+                try {
+                    /** @var ICalendarProvider $provider */
+                    $provider = $this->container->get($registration->getService());
+                } catch (Throwable $e) {
+                    $this->logger->error('Could not load calendar provider ' . $registration->getService() . ': ' . $e->getMessage(), [
+                        'exception' => $e,
+                    ]);
+                    return [];
+                }
+
+                return $provider->getCalendars($principalUri, $calendarUris);
+            }, $context->getCalendarProviders())
+        );
+    }
+
+    public function searchForPrincipal(ICalendarQuery $query): array {
+        /** @var CalendarQuery $query */
+        $calendars = $this->getCalendarsForPrincipal(
+            $query->getPrincipalUri(),
+            $query->getCalendarUris(),
+        );
+
+        $results = [];
+        foreach ($calendars as $calendar) {
+            $r = $calendar->search(
+                $query->getSearchPattern() ?? '',
+                $query->getSearchProperties(),
+                $query->getOptions(),
+                $query->getLimit(),
+                $query->getOffset()
+            );
+
+            foreach ($r as $o) {
+                $o['calendar-key'] = $calendar->getKey();
+                $results[] = $o;
+            }
+        }
+        return $results;
+    }
+
+    public function newQuery(string $principalUri): ICalendarQuery {
+        return new CalendarQuery($principalUri);
+    }
+
+    /**
+     * @throws \OCP\DB\Exception
+     */
+    public function handleIMipReply(string $principalUri, string $sender, string $recipient, string $calendarData): bool {
+        /** @var VCalendar $vObject */
+        $vObject = Reader::read($calendarData);
+        /** @var VEvent $vEvent */
+        $vEvent = $vObject->{'VEVENT'};
+
+        // First, we check if the correct method is passed to us
+        if (strcasecmp('REPLY', $vObject->{'METHOD'}->getValue()) !== 0) {
+            $this->logger->warning('Wrong method provided for processing');
+            return false;
+        }
+
+        // check if mail recipient and organizer are one and the same
+        $organizer = substr($vEvent->{'ORGANIZER'}->getValue(), 7);
+
+        if (strcasecmp($recipient, $organizer) !== 0) {
+            $this->logger->warning('Recipient and ORGANIZER must be identical');
+            return false;
+        }
+
+        //check if the event is in the future
+        /** @var DateTime $eventTime */
+        $eventTime = $vEvent->{'DTSTART'};
+        if ($eventTime->getDateTime()->getTimeStamp() < $this->timeFactory->getTime()) { // this might cause issues with recurrences
+            $this->logger->warning('Only events in the future are processed');
+            return false;
+        }
+
+        $calendars = $this->getCalendarsForPrincipal($principalUri);
+        if (empty($calendars)) {
+            $this->logger->warning('Could not find any calendars for principal ' . $principalUri);
+            return false;
+        }
+
+        $found = null;
+        // if the attendee has been found in at least one calendar event with the UID of the iMIP event
+        // we process it.
+        // Benefit: no attendee lost
+        // Drawback: attendees that have been deleted will still be able to update their partstat
+        foreach ($calendars as $calendar) {
+            // We should not search in writable calendars
+            if ($calendar instanceof IHandleImipMessage) {
+                $o = $calendar->search($sender, ['ATTENDEE'], ['uid' => $vEvent->{'UID'}->getValue()]);
+                if (!empty($o)) {
+                    $found = $calendar;
+                    $name = $o[0]['uri'];
+                    break;
+                }
+            }
+        }
+
+        if (empty($found)) {
+            $this->logger->info('Event not found in any calendar for principal ' . $principalUri . 'and UID' . $vEvent->{'UID'}->getValue());
+            return false;
+        }
+
+        try {
+            $found->handleIMipMessage($name, $calendarData); // sabre will handle the scheduling behind the scenes
+        } catch (CalendarException $e) {
+            $this->logger->error('Could not update calendar for iMIP processing', ['exception' => $e]);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @since 25.0.0
+     * @throws \OCP\DB\Exception
+     */
+    public function handleIMipCancel(string $principalUri, string $sender, ?string $replyTo, string $recipient, string $calendarData): bool {
+        $vObject = Reader::read($calendarData);
+        /** @var VEvent $vEvent */
+        $vEvent = $vObject->{'VEVENT'};
+
+        // First, we check if the correct method is passed to us
+        if (strcasecmp('CANCEL', $vObject->{'METHOD'}->getValue()) !== 0) {
+            $this->logger->warning('Wrong method provided for processing');
+            return false;
+        }
+
+        $attendee = substr($vEvent->{'ATTENDEE'}->getValue(), 7);
+        if (strcasecmp($recipient, $attendee) !== 0) {
+            $this->logger->warning('Recipient must be an ATTENDEE of this event');
+            return false;
+        }
+
+        // Thirdly, we need to compare the email address the CANCEL is coming from (in Mail)
+        // or the Reply- To Address submitted with the CANCEL email
+        // to the email address in the ORGANIZER.
+        // We don't want to accept a CANCEL request from just anyone
+        $organizer = substr($vEvent->{'ORGANIZER'}->getValue(), 7);
+        $isNotOrganizer = ($replyTo !== null) ? (strcasecmp($sender, $organizer) !== 0 && strcasecmp($replyTo, $organizer) !== 0) : (strcasecmp($sender, $organizer) !== 0);
+        if ($isNotOrganizer) {
+            $this->logger->warning('Sender must be the ORGANIZER of this event');
+            return false;
+        }
+
+        //check if the event is in the future
+        /** @var DateTime $eventTime */
+        $eventTime = $vEvent->{'DTSTART'};
+        if ($eventTime->getDateTime()->getTimeStamp() < $this->timeFactory->getTime()) { // this might cause issues with recurrences
+            $this->logger->warning('Only events in the future are processed');
+            return false;
+        }
+
+        // Check if we have a calendar to work with
+        $calendars = $this->getCalendarsForPrincipal($principalUri);
+        if (empty($calendars)) {
+            $this->logger->warning('Could not find any calendars for principal ' . $principalUri);
+            return false;
+        }
+
+        $found = null;
+        // if the attendee has been found in at least one calendar event with the UID of the iMIP event
+        // we process it.
+        // Benefit: no attendee lost
+        // Drawback: attendees that have been deleted will still be able to update their partstat
+        foreach ($calendars as $calendar) {
+            // We should not search in writable calendars
+            if ($calendar instanceof IHandleImipMessage) {
+                $o = $calendar->search($recipient, ['ATTENDEE'], ['uid' => $vEvent->{'UID'}->getValue()]);
+                if (!empty($o)) {
+                    $found = $calendar;
+                    $name = $o[0]['uri'];
+                    break;
+                }
+            }
+        }
+
+        if (empty($found)) {
+            $this->logger->info('Event not found in any calendar for principal ' . $principalUri . 'and UID' . $vEvent->{'UID'}->getValue());
+            // this is a safe operation
+            // we can ignore events that have been cancelled but were not in the calendar anyway
+            return true;
+        }
+
+        try {
+            $found->handleIMipMessage($name, $calendarData); // sabre will handle the scheduling behind the scenes
+            return true;
+        } catch (CalendarException $e) {
+            $this->logger->error('Could not update calendar for iMIP processing', ['exception' => $e]);
+            return false;
+        }
+    }
 }

lib/public/Calendar/IHandleImipMessage.php

Indentation +8 added lines, -8 removed lines

@@ -37,12 +37,12 @@
  */
 interface IHandleImipMessage extends ICalendar {
 
-	/**
-	 * Handle an iMIP VEvent for validation and processing
-	 *
-	 * @since 26.0.0
-	 *
-	 * @throws CalendarException  on validation failure or calendar write error
-	 */
-	public function handleIMipMessage(string $name, string $calendarData): void;
+    /**
+     * Handle an iMIP VEvent for validation and processing
+     *
+     * @since 26.0.0
+     *
+     * @throws CalendarException  on validation failure or calendar write error
+     */
+    public function handleIMipMessage(string $name, string $calendarData): void;
 }

apps/dav/lib/CalDAV/CalendarImpl.php

Indentation +189 added lines, -189 removed lines

@@ -43,193 +43,193 @@
 
 class CalendarImpl implements ICreateFromString, IHandleImipMessage {
 
-	private CalDavBackend $backend;
-	private Calendar $calendar;
-	/** @var array<string, mixed> */
-	private array $calendarInfo;
-
-	public function __construct(Calendar $calendar,
-								array $calendarInfo,
-								CalDavBackend $backend) {
-		$this->calendar = $calendar;
-		$this->calendarInfo = $calendarInfo;
-		$this->backend = $backend;
-	}
-
-	/**
-	 * @return string defining the technical unique key
-	 * @since 13.0.0
-	 */
-	public function getKey(): string {
-		return (string) $this->calendarInfo['id'];
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getUri(): string {
-		return $this->calendarInfo['uri'];
-	}
-
-	/**
-	 * In comparison to getKey() this function returns a human readable (maybe translated) name
-	 * @since 13.0.0
-	 */
-	public function getDisplayName(): ?string {
-		return $this->calendarInfo['{DAV:}displayname'];
-	}
-
-	/**
-	 * Calendar color
-	 * @since 13.0.0
-	 */
-	public function getDisplayColor(): ?string {
-		return $this->calendarInfo['{http://apple.com/ns/ical/}calendar-color'];
-	}
-
-	/**
-	 * @param string $pattern which should match within the $searchProperties
-	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options - optional parameters:
-	 * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
-	 * @param int|null $limit - limit number of search results
-	 * @param int|null $offset - offset for paging of search results
-	 * @return array an array of events/journals/todos which are arrays of key-value-pairs
-	 * @since 13.0.0
-	 */
-	public function search(string $pattern, array $searchProperties = [], array $options = [], $limit = null, $offset = null): array {
-		return $this->backend->search($this->calendarInfo, $pattern,
-			$searchProperties, $options, $limit, $offset);
-	}
-
-	/**
-	 * @return int build up using \OCP\Constants
-	 * @since 13.0.0
-	 */
-	public function getPermissions(): int {
-		$permissions = $this->calendar->getACL();
-		$result = 0;
-		foreach ($permissions as $permission) {
-			switch ($permission['privilege']) {
-				case '{DAV:}read':
-					$result |= Constants::PERMISSION_READ;
-					break;
-				case '{DAV:}write':
-					$result |= Constants::PERMISSION_CREATE;
-					$result |= Constants::PERMISSION_UPDATE;
-					break;
-				case '{DAV:}all':
-					$result |= Constants::PERMISSION_ALL;
-					break;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @since 26.0.0
-	 */
-	public function isDeleted(): bool {
-		return $this->calendar->isDeleted();
-	}
-
-	/**
-	 * Create a new calendar event for this calendar
-	 * by way of an ICS string
-	 *
-	 * @param string $name the file name - needs to contain the .ics ending
-	 * @param string $calendarData a string containing a valid VEVENT ics
-	 *
-	 * @throws CalendarException
-	 */
-	public function createFromString(string $name, string $calendarData): void {
-		$server = new InvitationResponseServer(false);
-
-		/** @var CustomPrincipalPlugin $plugin */
-		$plugin = $server->server->getPlugin('auth');
-		// we're working around the previous implementation
-		// that only allowed the public system principal to be used
-		// so set the custom principal here
-		$plugin->setCurrentPrincipal($this->calendar->getPrincipalURI());
-
-		if (empty($this->calendarInfo['uri'])) {
-			throw new CalendarException('Could not write to calendar as URI parameter is missing');
-		}
-
-		// Build full calendar path
-		[, $user] = uriSplit($this->calendar->getPrincipalURI());
-		$fullCalendarFilename = sprintf('calendars/%s/%s/%s', $user, $this->calendarInfo['uri'], $name);
-
-		// Force calendar change URI
-		/** @var Schedule\Plugin $schedulingPlugin */
-		$schedulingPlugin = $server->server->getPlugin('caldav-schedule');
-		$schedulingPlugin->setPathOfCalendarObjectChange($fullCalendarFilename);
-
-		$stream = fopen('php://memory', 'rb+');
-		fwrite($stream, $calendarData);
-		rewind($stream);
-		try {
-			$server->server->createFile($fullCalendarFilename, $stream);
-		} catch (Conflict $e) {
-			throw new CalendarException('Could not create new calendar event: ' . $e->getMessage(), 0, $e);
-		} finally {
-			fclose($stream);
-		}
-	}
-
-	/**
-	 * @throws CalendarException
-	 */
-	public function handleIMipMessage(string $name, string $calendarData): void {
-		$server = new InvitationResponseServer(false);
-
-		/** @var CustomPrincipalPlugin $plugin */
-		$plugin = $server->server->getPlugin('auth');
-		// we're working around the previous implementation
-		// that only allowed the public system principal to be used
-		// so set the custom principal here
-		$plugin->setCurrentPrincipal($this->calendar->getPrincipalURI());
-
-		if (empty($this->calendarInfo['uri'])) {
-			throw new CalendarException('Could not write to calendar as URI parameter is missing');
-		}
-		// Force calendar change URI
-		/** @var Schedule\Plugin $schedulingPlugin */
-		$schedulingPlugin = $server->server->getPlugin('caldav-schedule');
-		// Let sabre handle the rest
-		$iTipMessage = new Message();
-		/** @var VCalendar $vObject */
-		$vObject = Reader::read($calendarData);
-		/** @var VEvent $vEvent */
-		$vEvent = $vObject->{'VEVENT'};
-
-		if($vObject->{'METHOD'} === null) {
-			throw new CalendarException('No Method provided for scheduling data. Could not process message');
-		}
-
-		if(!isset($vEvent->{'ORGANIZER'}) || !isset($vEvent->{'ATTENDEE'})) {
-			throw new CalendarException('Could not process scheduling data, neccessary data missing from ICAL');
-		}
-		$organizer = $vEvent->{'ORGANIZER'}->getValue();
-		$attendee = $vEvent->{'ATTENDEE'}->getValue();
-
-		$iTipMessage->method = $vObject->{'METHOD'}->getValue();
-		if($iTipMessage->method === 'REPLY') {
-			if ($server->isExternalAttendee($vEvent->{'ATTENDEE'}->getValue())) {
-				$iTipMessage->recipient = $organizer;
-			} else {
-				$iTipMessage->recipient = $attendee;
-			}
-			$iTipMessage->sender = $attendee;
-		} else if($iTipMessage->method === 'CANCEL') {
-			$iTipMessage->recipient = $attendee;
-			$iTipMessage->sender = $organizer;
-		}
-		$iTipMessage->uid = isset($vEvent->{'UID'}) ? $vEvent->{'UID'}->getValue() : '';
-		$iTipMessage->component = 'VEVENT';
-		$iTipMessage->sequence = isset($vEvent->{'SEQUENCE'}) ? (int)$vEvent->{'SEQUENCE'}->getValue() : 0;
-		$iTipMessage->message = $vObject;
-		$schedulingPlugin->scheduleLocalDelivery($iTipMessage);
-	}
+    private CalDavBackend $backend;
+    private Calendar $calendar;
+    /** @var array<string, mixed> */
+    private array $calendarInfo;
+
+    public function __construct(Calendar $calendar,
+                                array $calendarInfo,
+                                CalDavBackend $backend) {
+        $this->calendar = $calendar;
+        $this->calendarInfo = $calendarInfo;
+        $this->backend = $backend;
+    }
+
+    /**
+     * @return string defining the technical unique key
+     * @since 13.0.0
+     */
+    public function getKey(): string {
+        return (string) $this->calendarInfo['id'];
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUri(): string {
+        return $this->calendarInfo['uri'];
+    }
+
+    /**
+     * In comparison to getKey() this function returns a human readable (maybe translated) name
+     * @since 13.0.0
+     */
+    public function getDisplayName(): ?string {
+        return $this->calendarInfo['{DAV:}displayname'];
+    }
+
+    /**
+     * Calendar color
+     * @since 13.0.0
+     */
+    public function getDisplayColor(): ?string {
+        return $this->calendarInfo['{http://apple.com/ns/ical/}calendar-color'];
+    }
+
+    /**
+     * @param string $pattern which should match within the $searchProperties
+     * @param array $searchProperties defines the properties within the query pattern should match
+     * @param array $options - optional parameters:
+     * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
+     * @param int|null $limit - limit number of search results
+     * @param int|null $offset - offset for paging of search results
+     * @return array an array of events/journals/todos which are arrays of key-value-pairs
+     * @since 13.0.0
+     */
+    public function search(string $pattern, array $searchProperties = [], array $options = [], $limit = null, $offset = null): array {
+        return $this->backend->search($this->calendarInfo, $pattern,
+            $searchProperties, $options, $limit, $offset);
+    }
+
+    /**
+     * @return int build up using \OCP\Constants
+     * @since 13.0.0
+     */
+    public function getPermissions(): int {
+        $permissions = $this->calendar->getACL();
+        $result = 0;
+        foreach ($permissions as $permission) {
+            switch ($permission['privilege']) {
+                case '{DAV:}read':
+                    $result |= Constants::PERMISSION_READ;
+                    break;
+                case '{DAV:}write':
+                    $result |= Constants::PERMISSION_CREATE;
+                    $result |= Constants::PERMISSION_UPDATE;
+                    break;
+                case '{DAV:}all':
+                    $result |= Constants::PERMISSION_ALL;
+                    break;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @since 26.0.0
+     */
+    public function isDeleted(): bool {
+        return $this->calendar->isDeleted();
+    }
+
+    /**
+     * Create a new calendar event for this calendar
+     * by way of an ICS string
+     *
+     * @param string $name the file name - needs to contain the .ics ending
+     * @param string $calendarData a string containing a valid VEVENT ics
+     *
+     * @throws CalendarException
+     */
+    public function createFromString(string $name, string $calendarData): void {
+        $server = new InvitationResponseServer(false);
+
+        /** @var CustomPrincipalPlugin $plugin */
+        $plugin = $server->server->getPlugin('auth');
+        // we're working around the previous implementation
+        // that only allowed the public system principal to be used
+        // so set the custom principal here
+        $plugin->setCurrentPrincipal($this->calendar->getPrincipalURI());
+
+        if (empty($this->calendarInfo['uri'])) {
+            throw new CalendarException('Could not write to calendar as URI parameter is missing');
+        }
+
+        // Build full calendar path
+        [, $user] = uriSplit($this->calendar->getPrincipalURI());
+        $fullCalendarFilename = sprintf('calendars/%s/%s/%s', $user, $this->calendarInfo['uri'], $name);
+
+        // Force calendar change URI
+        /** @var Schedule\Plugin $schedulingPlugin */
+        $schedulingPlugin = $server->server->getPlugin('caldav-schedule');
+        $schedulingPlugin->setPathOfCalendarObjectChange($fullCalendarFilename);
+
+        $stream = fopen('php://memory', 'rb+');
+        fwrite($stream, $calendarData);
+        rewind($stream);
+        try {
+            $server->server->createFile($fullCalendarFilename, $stream);
+        } catch (Conflict $e) {
+            throw new CalendarException('Could not create new calendar event: ' . $e->getMessage(), 0, $e);
+        } finally {
+            fclose($stream);
+        }
+    }
+
+    /**
+     * @throws CalendarException
+     */
+    public function handleIMipMessage(string $name, string $calendarData): void {
+        $server = new InvitationResponseServer(false);
+
+        /** @var CustomPrincipalPlugin $plugin */
+        $plugin = $server->server->getPlugin('auth');
+        // we're working around the previous implementation
+        // that only allowed the public system principal to be used
+        // so set the custom principal here
+        $plugin->setCurrentPrincipal($this->calendar->getPrincipalURI());
+
+        if (empty($this->calendarInfo['uri'])) {
+            throw new CalendarException('Could not write to calendar as URI parameter is missing');
+        }
+        // Force calendar change URI
+        /** @var Schedule\Plugin $schedulingPlugin */
+        $schedulingPlugin = $server->server->getPlugin('caldav-schedule');
+        // Let sabre handle the rest
+        $iTipMessage = new Message();
+        /** @var VCalendar $vObject */
+        $vObject = Reader::read($calendarData);
+        /** @var VEvent $vEvent */
+        $vEvent = $vObject->{'VEVENT'};
+
+        if($vObject->{'METHOD'} === null) {
+            throw new CalendarException('No Method provided for scheduling data. Could not process message');
+        }
+
+        if(!isset($vEvent->{'ORGANIZER'}) || !isset($vEvent->{'ATTENDEE'})) {
+            throw new CalendarException('Could not process scheduling data, neccessary data missing from ICAL');
+        }
+        $organizer = $vEvent->{'ORGANIZER'}->getValue();
+        $attendee = $vEvent->{'ATTENDEE'}->getValue();
+
+        $iTipMessage->method = $vObject->{'METHOD'}->getValue();
+        if($iTipMessage->method === 'REPLY') {
+            if ($server->isExternalAttendee($vEvent->{'ATTENDEE'}->getValue())) {
+                $iTipMessage->recipient = $organizer;
+            } else {
+                $iTipMessage->recipient = $attendee;
+            }
+            $iTipMessage->sender = $attendee;
+        } else if($iTipMessage->method === 'CANCEL') {
+            $iTipMessage->recipient = $attendee;
+            $iTipMessage->sender = $organizer;
+        }
+        $iTipMessage->uid = isset($vEvent->{'UID'}) ? $vEvent->{'UID'}->getValue() : '';
+        $iTipMessage->component = 'VEVENT';
+        $iTipMessage->sequence = isset($vEvent->{'SEQUENCE'}) ? (int)$vEvent->{'SEQUENCE'}->getValue() : 0;
+        $iTipMessage->message = $vObject;
+        $schedulingPlugin->scheduleLocalDelivery($iTipMessage);
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -172,7 +172,7 @@ 
 		try {
 			$server->server->createFile($fullCalendarFilename, $stream);
 		} catch (Conflict $e) {
-			throw new CalendarException('Could not create new calendar event: ' . $e->getMessage(), 0, $e);
+			throw new CalendarException('Could not create new calendar event: '.$e->getMessage(), 0, $e);
 		} finally {
 			fclose($stream);
 		}
@@ -204,31 +204,31 @@ 
 		/** @var VEvent $vEvent */
 		$vEvent = $vObject->{'VEVENT'};
 
-		if($vObject->{'METHOD'} === null) {
+		if ($vObject->{'METHOD'} === null) {
 			throw new CalendarException('No Method provided for scheduling data. Could not process message');
 		}
 
-		if(!isset($vEvent->{'ORGANIZER'}) || !isset($vEvent->{'ATTENDEE'})) {
+		if (!isset($vEvent->{'ORGANIZER'}) || !isset($vEvent->{'ATTENDEE'})) {
 			throw new CalendarException('Could not process scheduling data, neccessary data missing from ICAL');
 		}
 		$organizer = $vEvent->{'ORGANIZER'}->getValue();
 		$attendee = $vEvent->{'ATTENDEE'}->getValue();
 
 		$iTipMessage->method = $vObject->{'METHOD'}->getValue();
-		if($iTipMessage->method === 'REPLY') {
+		if ($iTipMessage->method === 'REPLY') {
 			if ($server->isExternalAttendee($vEvent->{'ATTENDEE'}->getValue())) {
 				$iTipMessage->recipient = $organizer;
 			} else {
 				$iTipMessage->recipient = $attendee;
 			}
 			$iTipMessage->sender = $attendee;
-		} else if($iTipMessage->method === 'CANCEL') {
+		} else if ($iTipMessage->method === 'CANCEL') {
 			$iTipMessage->recipient = $attendee;
 			$iTipMessage->sender = $organizer;
 		}
 		$iTipMessage->uid = isset($vEvent->{'UID'}) ? $vEvent->{'UID'}->getValue() : '';
 		$iTipMessage->component = 'VEVENT';
-		$iTipMessage->sequence = isset($vEvent->{'SEQUENCE'}) ? (int)$vEvent->{'SEQUENCE'}->getValue() : 0;
+		$iTipMessage->sequence = isset($vEvent->{'SEQUENCE'}) ? (int) $vEvent->{'SEQUENCE'}->getValue() : 0;
 		$iTipMessage->message = $vObject;
 		$schedulingPlugin->scheduleLocalDelivery($iTipMessage);
 	}