nextcloud / server

apps/dav/tests/unit/CalDAV/Schedule/IMipServiceTest.php

Indentation +2172 added lines, -2172 removed lines

@@ -24,2177 +24,2177 @@
 use Test\TestCase;
 
 class IMipServiceTest extends TestCase {
-	private URLGenerator&MockObject $urlGenerator;
-	private IConfig&MockObject $config;
-	private IDBConnection&MockObject $db;
-	private ISecureRandom&MockObject $random;
-	private IFactory&MockObject $l10nFactory;
-	private IL10N&MockObject $l10n;
-	private ITimeFactory&MockObject $timeFactory;
-	private IMipService $service;
-
-
-	private VCalendar $vCalendar1a;
-	private VCalendar $vCalendar1b;
-	private VCalendar $vCalendar2;
-	private VCalendar $vCalendar3;
-	/** @var DateTime DateTime object that will be returned by DateTime() or DateTime('now') */
-	public static $datetimeNow;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->urlGenerator = $this->createMock(URLGenerator::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->db = $this->createMock(IDBConnection::class);
-		$this->random = $this->createMock(ISecureRandom::class);
-		$this->l10nFactory = $this->createMock(IFactory::class);
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->l10nFactory->expects(self::once())
-			->method('findGenericLanguage')
-			->willReturn('en');
-		$this->l10nFactory->expects(self::once())
-			->method('get')
-			->with('dav', 'en')
-			->willReturn($this->l10n);
-		$this->service = new IMipService(
-			$this->urlGenerator,
-			$this->config,
-			$this->db,
-			$this->random,
-			$this->l10nFactory,
-			$this->timeFactory
-		);
-
-		// construct calendar with a 1 hour event and same start/end time zones
-		$this->vCalendar1a = new VCalendar();
-		$vEvent = $this->vCalendar1a->add('VEVENT', []);
-		$vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
-		$vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('SUMMARY', 'Testing Event');
-		$vEvent->add('ORGANIZER', 'mailto:organizer@testing.com', ['CN' => 'Organizer']);
-		$vEvent->add('ATTENDEE', 'mailto:attendee1@testing.com', [
-			'CN' => 'Attendee One',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-
-		// construct calendar with a 1 hour event and different start/end time zones
-		$this->vCalendar1b = new VCalendar();
-		$vEvent = $this->vCalendar1b->add('VEVENT', []);
-		$vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
-		$vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Vancouver']);
-		$vEvent->add('SUMMARY', 'Testing Event');
-		$vEvent->add('ORGANIZER', 'mailto:organizer@testing.com', ['CN' => 'Organizer']);
-		$vEvent->add('ATTENDEE', 'mailto:attendee1@testing.com', [
-			'CN' => 'Attendee One',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-
-		// construct calendar with a full day event
-		$this->vCalendar2 = new VCalendar();
-		// time zone component
-		$vTimeZone = $this->vCalendar2->add('VTIMEZONE');
-		$vTimeZone->add('TZID', 'America/Toronto');
-		// event component
-		$vEvent = $this->vCalendar2->add('VEVENT', []);
-		$vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
-		$vEvent->add('DTSTART', '20240701');
-		$vEvent->add('DTEND', '20240702');
-		$vEvent->add('SUMMARY', 'Testing Event');
-		$vEvent->add('ORGANIZER', 'mailto:organizer@testing.com', ['CN' => 'Organizer']);
-		$vEvent->add('ATTENDEE', 'mailto:attendee1@testing.com', [
-			'CN' => 'Attendee One',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-
-		// construct calendar with a multi day event
-		$this->vCalendar3 = new VCalendar();
-		// time zone component
-		$vTimeZone = $this->vCalendar3->add('VTIMEZONE');
-		$vTimeZone->add('TZID', 'America/Toronto');
-		// event component
-		$vEvent = $this->vCalendar3->add('VEVENT', []);
-		$vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
-		$vEvent->add('DTSTART', '20240701');
-		$vEvent->add('DTEND', '20240706');
-		$vEvent->add('SUMMARY', 'Testing Event');
-		$vEvent->add('ORGANIZER', 'mailto:organizer@testing.com', ['CN' => 'Organizer']);
-		$vEvent->add('ATTENDEE', 'mailto:attendee1@testing.com', [
-			'CN' => 'Attendee One',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-	}
-
-	public function testGetFrom(): void {
-		$senderName = 'Detective McQueen';
-		$default = 'Twin Lakes Police Department - Darkside Division';
-		$expected = 'Detective McQueen via Twin Lakes Police Department - Darkside Division';
-
-		$this->l10n->expects(self::once())
-			->method('t')
-			->willReturn($expected);
-
-		$actual = $this->service->getFrom($senderName, $default);
-		$this->assertEquals($expected, $actual);
-	}
-
-	public function testBuildBodyDataCreated(): void {
-
-		// construct l10n return(s)
-		$this->l10n->method('l')->willReturnCallback(
-			function ($v1, $v2, $v3) {
-				return match (true) {
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
-					$v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'full'] => 'July 1, 2024'
-				};
-			}
-		);
-		$this->l10n->method('n')->willReturnMap([
-			[
-				'In a day on %1$s between %2$s - %3$s',
-				'In %n days on %1$s between %2$s - %3$s',
-				1,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			]
-		]);
-		// construct time factory return(s)
-		$this->timeFactory->method('getDateTime')->willReturnCallback(
-			function ($v1, $v2) {
-				return match (true) {
-					$v1 == 'now' && $v2 == null => (new \DateTime('20240630T000000'))
-				};
-			}
-		);
-		/** test singleton partial day event*/
-		$vCalendar = clone $this->vCalendar1a;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// define expected output
-		$expected = [
-			'meeting_when' => $this->service->generateWhenString($eventReader),
-			'meeting_description' => '',
-			'meeting_title' => 'Testing Event',
-			'meeting_location' => '',
-			'meeting_url' => '',
-			'meeting_url_html' => '',
-		];
-		// generate actual output
-		$actual = $this->service->buildBodyData($vCalendar->VEVENT[0], null);
-		// test output
-		$this->assertEquals($expected, $actual);
-	}
-
-	public function testBuildBodyDataUpdate(): void {
-
-		// construct l10n return(s)
-		$this->l10n->method('l')->willReturnCallback(
-			function ($v1, $v2, $v3) {
-				return match (true) {
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
-					$v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'full'] => 'July 1, 2024'
-				};
-			}
-		);
-		$this->l10n->method('n')->willReturnMap([
-			[
-				'In a day on %1$s between %2$s - %3$s',
-				'In %n days on %1$s between %2$s - %3$s',
-				1,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			]
-		]);
-		// construct time factory return(s)
-		$this->timeFactory->method('getDateTime')->willReturnCallback(
-			function ($v1, $v2) {
-				return match (true) {
-					$v1 == 'now' && $v2 == null => (new \DateTime('20240630T000000'))
-				};
-			}
-		);
-		/** test singleton partial day event*/
-		$vCalendarNew = clone $this->vCalendar1a;
-		$vCalendarOld = clone $this->vCalendar1a;
-		// construct event reader
-		$eventReaderNew = new EventReader($vCalendarNew, $vCalendarNew->VEVENT[0]->UID->getValue());
-		// alter old event label/title
-		$vCalendarOld->VEVENT[0]->SUMMARY->setValue('Testing Singleton Event');
-		// define expected output
-		$expected = [
-			'meeting_when' => $this->service->generateWhenString($eventReaderNew),
-			'meeting_description' => '',
-			'meeting_title' => 'Testing Event',
-			'meeting_location' => '',
-			'meeting_url' => '',
-			'meeting_url_html' => '',
-			'meeting_when_html' => $this->service->generateWhenString($eventReaderNew),
-			'meeting_title_html' => sprintf("<span style='text-decoration: line-through'>%s</span><br />%s", 'Testing Singleton Event', 'Testing Event'),
-			'meeting_description_html' => '',
-			'meeting_location_html' => ''
-		];
-		// generate actual output
-		$actual = $this->service->buildBodyData($vCalendarNew->VEVENT[0], $vCalendarOld->VEVENT[0]);
-		// test output
-		$this->assertEquals($expected, $actual);
-	}
-
-	public function testGetLastOccurrenceRRULE(): void {
-		$vCalendar = new VCalendar();
-		$vCalendar->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
-		]);
-
-		$occurrence = $this->service->getLastOccurrence($vCalendar);
-		$this->assertEquals(1454284800, $occurrence);
-	}
-
-	public function testGetLastOccurrenceEndDate(): void {
-		$vCalendar = new VCalendar();
-		$vCalendar->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'DTEND' => new \DateTime('2017-01-01 00:00:00'),
-		]);
-
-		$occurrence = $this->service->getLastOccurrence($vCalendar);
-		$this->assertEquals(1483228800, $occurrence);
-	}
-
-	public function testGetLastOccurrenceDuration(): void {
-		$vCalendar = new VCalendar();
-		$vCalendar->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'DURATION' => 'P12W',
-		]);
-
-		$occurrence = $this->service->getLastOccurrence($vCalendar);
-		$this->assertEquals(1458864000, $occurrence);
-	}
-
-	public function testGetLastOccurrenceAllDay(): void {
-		$vCalendar = new VCalendar();
-		$vEvent = $vCalendar->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-		]);
-
-		// rewrite from DateTime to Date
-		$vEvent->DTSTART['VALUE'] = 'DATE';
-
-		$occurrence = $this->service->getLastOccurrence($vCalendar);
-		$this->assertEquals(1451692800, $occurrence);
-	}
-
-	public function testGetLastOccurrenceFallback(): void {
-		$vCalendar = new VCalendar();
-		$vCalendar->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-		]);
-
-		$occurrence = $this->service->getLastOccurrence($vCalendar);
-		$this->assertEquals(1451606400, $occurrence);
-	}
-
-	public function testGenerateWhenStringSingular(): void {
-
-		// construct l10n return(s)
-		$this->l10n->method('l')->willReturnCallback(
-			function ($v1, $v2, $v3) {
-				return match (true) {
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
-					$v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'full'] => 'July 1, 2024',
-					$v1 === 'date' && $v2 == (new \DateTime('20240701T000000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'full'] => 'July 1, 2024'
-				};
-			}
-		);
-		$this->l10n->method('t')->willReturnMap([
-			[
-				'In the past on %1$s for the entire day',
-				['July 1, 2024'],
-				'In the past on July 1, 2024 for the entire day'
-			],
-			[
-				'In the past on %1$s between %2$s - %3$s',
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In the past on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-		]);
-		$this->l10n->method('n')->willReturnMap([
-			// singular entire day
-			[
-				'In a minute on %1$s for the entire day',
-				'In %n minutes on %1$s for the entire day',
-				1,
-				['July 1, 2024'],
-				'In a minute on July 1, 2024 for the entire day'
-			],
-			[
-				'In a hour on %1$s for the entire day',
-				'In %n hours on %1$s for the entire day',
-				1,
-				['July 1, 2024'],
-				'In a hour on July 1, 2024 for the entire day'
-			],
-			[
-				'In a day on %1$s for the entire day',
-				'In %n days on %1$s for the entire day',
-				1,
-				['July 1, 2024'],
-				'In a day on July 1, 2024 for the entire day'
-			],
-			[
-				'In a week on %1$s for the entire day',
-				'In %n weeks on %1$s for the entire day',
-				1,
-				['July 1, 2024'],
-				'In a week on July 1, 2024 for the entire day'
-			],
-			[
-				'In a month on %1$s for the entire day',
-				'In %n months on %1$s for the entire day',
-				1,
-				['July 1, 2024'],
-				'In a month on July 1, 2024 for the entire day'
-			],
-			[
-				'In a year on %1$s for the entire day',
-				'In %n years on %1$s for the entire day',
-				1,
-				['July 1, 2024'],
-				'In a year on July 1, 2024 for the entire day'
-			],
-			// plural entire day
-			[
-				'In a minute on %1$s for the entire day',
-				'In %n minutes on %1$s for the entire day',
-				2,
-				['July 1, 2024'],
-				'In 2 minutes on July 1, 2024 for the entire day'
-			],
-			[
-				'In a hour on %1$s for the entire day',
-				'In %n hours on %1$s for the entire day',
-				2,
-				['July 1, 2024'],
-				'In 2 hours on July 1, 2024 for the entire day'
-			],
-			[
-				'In a day on %1$s for the entire day',
-				'In %n days on %1$s for the entire day',
-				2,
-				['July 1, 2024'],
-				'In 2 days on July 1, 2024 for the entire day'
-			],
-			[
-				'In a week on %1$s for the entire day',
-				'In %n weeks on %1$s for the entire day',
-				2,
-				['July 1, 2024'],
-				'In 2 weeks on July 1, 2024 for the entire day'
-			],
-			[
-				'In a month on %1$s for the entire day',
-				'In %n months on %1$s for the entire day',
-				2,
-				['July 1, 2024'],
-				'In 2 months on July 1, 2024 for the entire day'
-			],
-			[
-				'In a year on %1$s for the entire day',
-				'In %n years on %1$s for the entire day',
-				2,
-				['July 1, 2024'],
-				'In 2 years on July 1, 2024 for the entire day'
-			],
-			// singular partial day
-			[
-				'In a minute on %1$s between %2$s - %3$s',
-				'In %n minutes on %1$s between %2$s - %3$s',
-				1,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In a minute on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-			[
-				'In a hour on %1$s between %2$s - %3$s',
-				'In %n hours on %1$s between %2$s - %3$s',
-				1,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In a hour on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-			[
-				'In a day on %1$s between %2$s - %3$s',
-				'In %n days on %1$s between %2$s - %3$s',
-				1,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-			[
-				'In a week on %1$s between %2$s - %3$s',
-				'In %n weeks on %1$s between %2$s - %3$s',
-				1,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In a week on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-			[
-				'In a month on %1$s between %2$s - %3$s',
-				'In %n months on %1$s between %2$s - %3$s',
-				1,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In a month on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-			[
-				'In a year on %1$s between %2$s - %3$s',
-				'In %n years on %1$s between %2$s - %3$s',
-				1,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In a year on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-			// plural partial day
-			[
-				'In a minute on %1$s between %2$s - %3$s',
-				'In %n minutes on %1$s between %2$s - %3$s',
-				2,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In 2 minutes on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-			[
-				'In a hour on %1$s between %2$s - %3$s',
-				'In %n hours on %1$s between %2$s - %3$s',
-				2,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In 2 hours on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-			[
-				'In a day on %1$s between %2$s - %3$s',
-				'In %n days on %1$s between %2$s - %3$s',
-				2,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In 2 days on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-			[
-				'In a week on %1$s between %2$s - %3$s',
-				'In %n weeks on %1$s between %2$s - %3$s',
-				2,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In 2 weeks on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-			[
-				'In a month on %1$s between %2$s - %3$s',
-				'In %n months on %1$s between %2$s - %3$s',
-				2,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In 2 months on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-			[
-				'In a year on %1$s between %2$s - %3$s',
-				'In %n years on %1$s between %2$s - %3$s',
-				2,
-				['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
-				'In 2 years on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
-			],
-		]);
-
-		// construct time factory return(s)
-		$this->timeFactory->method('getDateTime')->willReturnOnConsecutiveCalls(
-			// past interval test dates
-			(new \DateTime('20240702T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240703T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240702T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240703T170000', (new \DateTimeZone('America/Toronto')))),
-			// minute interval test dates
-			(new \DateTime('20240701T075900', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240630T235900', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240701T075800', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240630T235800', (new \DateTimeZone('America/Toronto')))),
-			// hour interval test dates
-			(new \DateTime('20240701T070000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240630T230000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240701T060000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240630T220000', (new \DateTimeZone('America/Toronto')))),
-			// day interval test dates
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			// week interval test dates
-			(new \DateTime('20240621T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240621T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240614T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240614T170000', (new \DateTimeZone('America/Toronto')))),
-			// month interval test dates
-			(new \DateTime('20240530T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240530T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240430T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240430T170000', (new \DateTimeZone('America/Toronto')))),
-			// year interval test dates
-			(new \DateTime('20230630T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20230630T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20220630T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20220630T170000', (new \DateTimeZone('America/Toronto'))))
-		);
-
-		/** test partial day event in 1 day in the past*/
-		$vCalendar = clone $this->vCalendar1a;
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		$this->assertEquals(
-			'In the past on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 1 day in the past*/
-		$vCalendar = clone $this->vCalendar2;
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		$this->assertEquals(
-			'In the past on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test partial day event in 2 days in the past*/
-		$vCalendar = clone $this->vCalendar1a;
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		$this->assertEquals(
-			'In the past on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 2 days in the past*/
-		$vCalendar = clone $this->vCalendar2;
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		$this->assertEquals(
-			'In the past on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test partial day event in 1 minute*/
-		$vCalendar = clone $this->vCalendar1a;
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		$this->assertEquals(
-			'In a minute on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 1 minute*/
-		$vCalendar = clone $this->vCalendar2;
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		$this->assertEquals(
-			'In a minute on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test partial day event in 2 minutes*/
-		$vCalendar = clone $this->vCalendar1a;
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		$this->assertEquals(
-			'In 2 minutes on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 2 minutes*/
-		$vCalendar = clone $this->vCalendar2;
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		$this->assertEquals(
-			'In 2 minutes on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test partial day event in 1 hour*/
-		$vCalendar = clone $this->vCalendar1a;
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		$this->assertEquals(
-			'In a hour on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 1 hour*/
-		$vCalendar = clone $this->vCalendar2;
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		$this->assertEquals(
-			'In a hour on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test partial day event in 2 hours*/
-		$vCalendar = clone $this->vCalendar1a;
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		$this->assertEquals(
-			'In 2 hours on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 2 hours*/
-		$vCalendar = clone $this->vCalendar2;
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		$this->assertEquals(
-			'In 2 hours on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test patrial day event in 1 day*/
-		$vCalendar = clone $this->vCalendar1a;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 1 day*/
-		$vCalendar = clone $this->vCalendar2;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test patrial day event in 2 days*/
-		$vCalendar = clone $this->vCalendar1a;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 2 days*/
-		$vCalendar = clone $this->vCalendar2;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test patrial day event in 1 week*/
-		$vCalendar = clone $this->vCalendar1a;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a week on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 1 week*/
-		$vCalendar = clone $this->vCalendar2;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a week on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test patrial day event in 2 weeks*/
-		$vCalendar = clone $this->vCalendar1a;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 weeks on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 2 weeks*/
-		$vCalendar = clone $this->vCalendar2;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 weeks on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test patrial day event in 1 month*/
-		$vCalendar = clone $this->vCalendar1a;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a month on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 1 month*/
-		$vCalendar = clone $this->vCalendar2;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a month on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test patrial day event in 2 months*/
-		$vCalendar = clone $this->vCalendar1a;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 months on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 2 months*/
-		$vCalendar = clone $this->vCalendar2;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 months on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test patrial day event in 1 year*/
-		$vCalendar = clone $this->vCalendar1a;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a year on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 1 year*/
-		$vCalendar = clone $this->vCalendar2;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a year on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test patrial day event in 2 years*/
-		$vCalendar = clone $this->vCalendar1a;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 years on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event in 2 years*/
-		$vCalendar = clone $this->vCalendar2;
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 years on July 1, 2024 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-	}
-
-	public function testGenerateWhenStringRecurringDaily(): void {
-
-		// construct l10n return maps
-		$this->l10n->method('l')->willReturnCallback(
-			function ($v1, $v2, $v3) {
-				return match (true) {
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
-					$v1 === 'date' && $v2 == (new \DateTime('20240713T080000', (new \DateTimeZone('UTC')))) && $v3 == ['width' => 'long'] => 'July 13, 2024'
-				};
-			}
-		);
-		$this->l10n->method('t')->willReturnMap([
-			['Every Day for the entire day', [], 'Every Day for the entire day'],
-			['Every Day for the entire day until %1$s', ['July 13, 2024'], 'Every Day for the entire day until July 13, 2024'],
-			['Every Day between %1$s - %2$s', ['8:00 AM', '9:00 AM (America/Toronto)'], 'Every Day between 8:00 AM - 9:00 AM (America/Toronto)'],
-			['Every Day between %1$s - %2$s until %3$s', ['8:00 AM', '9:00 AM (America/Toronto)', 'July 13, 2024'], 'Every Day between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024'],
-			['Every %1$d Days for the entire day', [3], 'Every 3 Days for the entire day'],
-			['Every %1$d Days for the entire day until %2$s', [3, 'July 13, 2024'], 'Every 3 Days for the entire day until July 13, 2024'],
-			['Every %1$d Days between %2$s - %3$s', [3, '8:00 AM', '9:00 AM (America/Toronto)'], 'Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto)'],
-			['Every %1$d Days between %2$s - %3$s until %4$s', [3, '8:00 AM', '9:00 AM (America/Toronto)', 'July 13, 2024'], 'Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024'],
-			['Could not generate event recurrence statement', [], 'Could not generate event recurrence statement'],
-		]);
-
-		/** test partial day event with every day interval and no conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=1;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Day between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test partial day event with every day interval and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=1;UNTIL=20240713T080000Z');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Day between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test partial day event every 3rd day interval and no conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=3;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test partial day event with every 3rd day interval and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=3;UNTIL=20240713T080000Z');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event with every day interval and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=1;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Day for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event with every day interval and conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=1;UNTIL=20240713T080000Z');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Day for the entire day until July 13, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event with every 3rd day interval and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=3;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 3 Days for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event with every 3rd day interval and conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=3;UNTIL=20240713T080000Z');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 3 Days for the entire day until July 13, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-	}
-
-	public function testGenerateWhenStringRecurringWeekly(): void {
-
-		// construct l10n return maps
-		$this->l10n->method('l')->willReturnCallback(
-			function ($v1, $v2, $v3) {
-				return match (true) {
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
-					$v1 === 'date' && $v2 == (new \DateTime('20240722T080000', (new \DateTimeZone('UTC')))) && $v3 == ['width' => 'long'] => 'July 13, 2024'
-				};
-			}
-		);
-		$this->l10n->method('t')->willReturnMap([
-			['Every Week on %1$s for the entire day', ['Monday, Wednesday, Friday'], 'Every Week on Monday, Wednesday, Friday for the entire day'],
-			['Every Week on %1$s for the entire day until %2$s', ['Monday, Wednesday, Friday', 'July 13, 2024'], 'Every Week on Monday, Wednesday, Friday for the entire day until July 13, 2024'],
-			['Every Week on %1$s between %2$s - %3$s', ['Monday, Wednesday, Friday', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)'],
-			['Every Week on %1$s between %2$s - %3$s until %4$s', ['Monday, Wednesday, Friday', '8:00 AM', '9:00 AM (America/Toronto)', 'July 13, 2024'], 'Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024'],
-			['Every %1$d Weeks on %2$s for the entire day', [2, 'Monday, Wednesday, Friday'], 'Every 2 Weeks on Monday, Wednesday, Friday for the entire day'],
-			['Every %1$d Weeks on %2$s for the entire day until %3$s', [2, 'Monday, Wednesday, Friday', 'July 13, 2024'], 'Every 2 Weeks on Monday, Wednesday, Friday for the entire day until July 13, 2024'],
-			['Every %1$d Weeks on %2$s between %3$s - %4$s', [2, 'Monday, Wednesday, Friday', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)'],
-			['Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s', [2, 'Monday, Wednesday, Friday', '8:00 AM', '9:00 AM (America/Toronto)', 'July 13, 2024'], 'Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024'],
-			['Could not generate event recurrence statement', [], 'Could not generate event recurrence statement'],
-			['Monday', [], 'Monday'],
-			['Wednesday', [], 'Wednesday'],
-			['Friday', [], 'Friday'],
-		]);
-
-		/** test partial day event with every week interval on Mon, Wed, Fri and no conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test partial day event with every week interval on Mon, Wed, Fri and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;UNTIL=20240722T080000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test partial day event with every 2nd week interval on Mon, Wed, Fri and no conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;INTERVAL=2;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test partial day event with every 2nd week interval on Mon, Wed, Fri and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;INTERVAL=2;UNTIL=20240722T080000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event with every week interval on Mon, Wed, Fri and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Week on Monday, Wednesday, Friday for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event with every week interval on Mon, Wed, Fri and conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;UNTIL=20240722T080000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Week on Monday, Wednesday, Friday for the entire day until July 13, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event with every 2nd week interval on Mon, Wed, Fri and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;INTERVAL=2;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Weeks on Monday, Wednesday, Friday for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event with every 2nd week interval on Mon, Wed, Fri and conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;INTERVAL=2;UNTIL=20240722T080000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Weeks on Monday, Wednesday, Friday for the entire day until July 13, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-	}
-
-	public function testGenerateWhenStringRecurringMonthly(): void {
-
-		// construct l10n return maps
-		$this->l10n->method('l')->willReturnCallback(
-			function ($v1, $v2, $v3) {
-				return match (true) {
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
-					$v1 === 'date' && $v2 == (new \DateTime('20241231T080000', (new \DateTimeZone('UTC')))) && $v3 == ['width' => 'long'] => 'December 31, 2024'
-				};
-			}
-		);
-		$this->l10n->method('t')->willReturnMap([
-			['Every Month on the %1$s for the entire day', ['1, 8'], 'Every Month on the 1, 8 for the entire day'],
-			['Every Month on the %1$s for the entire day until %2$s', ['1, 8', 'December 31, 2024'], 'Every Month on the 1, 8 for the entire day until December 31, 2024'],
-			['Every Month on the %1$s between %2$s - %3$s', ['1, 8', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)'],
-			['Every Month on the %1$s between %2$s - %3$s until %4$s', ['1, 8', '8:00 AM', '9:00 AM (America/Toronto)', 'December 31, 2024'], 'Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024'],
-			['Every %1$d Months on the %2$s for the entire day', [2, '1, 8'], 'Every 2 Months on the 1, 8 for the entire day'],
-			['Every %1$d Months on the %2$s for the entire day until %3$s', [2, '1, 8', 'December 31, 2024'], 'Every 2 Months on the 1, 8 for the entire day until December 31, 2024'],
-			['Every %1$d Months on the %2$s between %3$s - %4$s', [2, '1, 8', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)'],
-			['Every %1$d Months on the %2$s between %3$s - %4$s until %5$s', [2, '1, 8', '8:00 AM', '9:00 AM (America/Toronto)', 'December 31, 2024'], 'Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024'],
-			['Every Month on the %1$s for the entire day', ['First Sunday, Saturday'], 'Every Month on the First Sunday, Saturday for the entire day'],
-			['Every Month on the %1$s for the entire day until %2$s', ['First Sunday, Saturday', 'December 31, 2024'], 'Every Month on the First Sunday, Saturday for the entire day until December 31, 2024'],
-			['Every Month on the %1$s between %2$s - %3$s', ['First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)'],
-			['Every Month on the %1$s between %2$s - %3$s until %4$s', ['First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)', 'December 31, 2024'], 'Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024'],
-			['Every %1$d Months on the %2$s for the entire day', [2, 'First Sunday, Saturday'], 'Every 2 Months on the First Sunday, Saturday for the entire day'],
-			['Every %1$d Months on the %2$s for the entire day until %3$s', [2, 'First Sunday, Saturday', 'December 31, 2024'], 'Every 2 Months on the First Sunday, Saturday for the entire day until December 31, 2024'],
-			['Every %1$d Months on the %2$s between %3$s - %4$s', [2, 'First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)'],
-			['Every %1$d Months on the %2$s between %3$s - %4$s until %5$s', [2, 'First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)', 'December 31, 2024'], 'Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024'],
-			['Could not generate event recurrence statement', [], 'Could not generate event recurrence statement'],
-			['Saturday', [], 'Saturday'],
-			['Sunday', [], 'Sunday'],
-			['First', [], 'First'],
-		]);
-
-		/** test absolute partial day event with every month interval on 1st, 8th and no conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute partial day event with every Month interval on 1st, 8th and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;UNTIL=20241231T080000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute partial day event with every 2nd Month interval on 1st, 8th and no conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;INTERVAL=2;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute partial day event with every 2nd Month interval on 1st, 8th and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;INTERVAL=2;UNTIL=20241231T080000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute entire day event with every Month interval on 1st, 8th and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Month on the 1, 8 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute entire day event with every Month interval on 1st, 8th and conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;UNTIL=20241231T080000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Month on the 1, 8 for the entire day until December 31, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute entire day event with every 2nd Month interval on 1st, 8th and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;INTERVAL=2;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Months on the 1, 8 for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute entire day event with every 2nd Month interval on 1st, 8th and conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;INTERVAL=2;UNTIL=20241231T080000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Months on the 1, 8 for the entire day until December 31, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative partial day event with every month interval on the 1st Saturday, Sunday and no conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative partial day event with every Month interval on the 1st Saturday, Sunday and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;UNTIL=20241231T080000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative partial day event with every 2nd Month interval on the 1st Saturday, Sunday and no conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative partial day event with every 2nd Month interval on the 1st Saturday, Sunday and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;UNTIL=20241231T080000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative entire day event with every Month interval on the 1st Saturday, Sunday and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Month on the First Sunday, Saturday for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative entire day event with every Month interval on the 1st Saturday, Sunday and conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;UNTIL=20241231T080000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Month on the First Sunday, Saturday for the entire day until December 31, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative entire day event with every 2nd Month interval on the 1st Saturday, Sunday and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Months on the First Sunday, Saturday for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative entire day event with every 2nd Month interval on the 1st Saturday, Sunday and conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;UNTIL=20241231T080000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Months on the First Sunday, Saturday for the entire day until December 31, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-	}
-
-	public function testGenerateWhenStringRecurringYearly(): void {
-
-		// construct l10n return maps
-		$this->l10n->method('l')->willReturnCallback(
-			function ($v1, $v2, $v3) {
-				return match (true) {
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
-					$v1 === 'date' && $v2 == (new \DateTime('20260731T040000', (new \DateTimeZone('UTC')))) && $v3 == ['width' => 'long'] => 'July 31, 2026'
-				};
-			}
-		);
-		$this->l10n->method('t')->willReturnMap([
-			['Every Year in %1$s on the %2$s for the entire day', ['July', '1st'], 'Every Year in July on the 1st for the entire day'],
-			['Every Year in %1$s on the %2$s for the entire day until %3$s', ['July', '1st', 'July 31, 2026'], 'Every Year in July on the 1st for the entire day until July 31, 2026'],
-			['Every Year in %1$s on the %2$s between %3$s - %4$s', ['July', '1st', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)'],
-			['Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s', ['July', '1st', '8:00 AM', '9:00 AM (America/Toronto)', 'July 31, 2026'], 'Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026'],
-			['Every %1$d Years in %2$s on the %3$s for the entire day', [2, 'July', '1st'], 'Every 2 Years in July on the 1st for the entire day'],
-			['Every %1$d Years in %2$s on the %3$s for the entire day until %4$s', [2, 'July', '1st', 'July 31, 2026'], 'Every 2 Years in July on the 1st for the entire day until July 31, 2026'],
-			['Every %1$d Years in %2$s on the %3$s between %4$s - %5$s', [2, 'July', '1st', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)'],
-			['Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s', [2, 'July', '1st', '8:00 AM', '9:00 AM (America/Toronto)', 'July 31, 2026'], 'Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026'],
-			['Every Year in %1$s on the %2$s for the entire day', ['July', 'First Sunday, Saturday'], 'Every Year in July on the First Sunday, Saturday for the entire day'],
-			['Every Year in %1$s on the %2$s for the entire day until %3$s', ['July', 'First Sunday, Saturday', 'July 31, 2026'], 'Every Year in July on the First Sunday, Saturday for the entire day until July 31, 2026'],
-			['Every Year in %1$s on the %2$s between %3$s - %4$s', ['July', 'First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)'],
-			['Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s', ['July', 'First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)', 'July 31, 2026'], 'Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026'],
-			['Every %1$d Years in %2$s on the %3$s for the entire day', [2, 'July', 'First Sunday, Saturday'], 'Every 2 Years in July on the First Sunday, Saturday for the entire day'],
-			['Every %1$d Years in %2$s on the %3$s for the entire day until %4$s', [2, 'July', 'First Sunday, Saturday', 'July 31, 2026'], 'Every 2 Years in July on the First Sunday, Saturday for the entire day until July 31, 2026'],
-			['Every %1$d Years in %2$s on the %3$s between %4$s - %5$s', [2, 'July', 'First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)'],
-			['Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s', [2, 'July', 'First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)', 'July 31, 2026'], 'Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026'],
-			['Could not generate event recurrence statement', [], 'Could not generate event recurrence statement'],
-			['July', [], 'July'],
-			['Saturday', [], 'Saturday'],
-			['Sunday', [], 'Sunday'],
-			['First', [], 'First'],
-		]);
-
-		/** test absolute partial day event with every year interval on July 1 and no conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute partial day event with every year interval on July 1 and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;UNTIL=20260731T040000Z');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute partial day event with every 2nd year interval on July 1 and no conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;INTERVAL=2;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute partial day event with every 2nd year interval on July 1 and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;INTERVAL=2;UNTIL=20260731T040000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute entire day event with every year interval on July 1 and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Year in July on the 1st for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute entire day event with every year interval on July 1 and conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;UNTIL=20260731T040000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Year in July on the 1st for the entire day until July 31, 2026',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute entire day event with every 2nd year interval on July 1 and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;INTERVAL=2;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Years in July on the 1st for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test absolute entire day event with every 2nd year interval on July 1 and conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;INTERVAL=2;UNTIL=20260731T040000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Years in July on the 1st for the entire day until July 31, 2026',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative partial day event with every year interval on the 1st Saturday, Sunday in July and no conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative partial day event with every year interval on the 1st Saturday, Sunday in July and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;UNTIL=20260731T040000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative partial day event with every 2nd year interval on the 1st Saturday, Sunday in July and no conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative partial day event with every 2nd year interval on the 1st Saturday, Sunday in July and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;UNTIL=20260731T040000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative entire day event with every year interval on the 1st Saturday, Sunday in July and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Year in July on the First Sunday, Saturday for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative entire day event with every year interval on the 1st Saturday, Sunday in July and conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;UNTIL=20260731T040000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every Year in July on the First Sunday, Saturday for the entire day until July 31, 2026',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative entire day event with every 2nd year interval on the 1st Saturday, Sunday in July and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Years in July on the First Sunday, Saturday for the entire day',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test relative entire day event with every 2nd year interval on the 1st Saturday, Sunday in July and conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;UNTIL=20260731T040000Z;');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'Every 2 Years in July on the First Sunday, Saturday for the entire day until July 31, 2026',
-			$this->service->generateWhenString($eventReader)
-		);
-
-	}
-
-	public function testGenerateWhenStringRecurringFixed(): void {
-
-		// construct l10n return maps
-		$this->l10n->method('l')->willReturnCallback(
-			function ($v1, $v2, $v3) {
-				return match (true) {
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
-					$v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
-					$v1 === 'date' && $v2 == (new \DateTime('20240713T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 13, 2024'
-				};
-			}
-		);
-		$this->l10n->method('t')->willReturnMap([
-			['On specific dates for the entire day until %1$s', ['July 13, 2024'], 'On specific dates for the entire day until July 13, 2024'],
-			['On specific dates between %1$s - %2$s until %3$s', ['8:00 AM', '9:00 AM (America/Toronto)', 'July 13, 2024'], 'On specific dates between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024'],
-		]);
-
-		/** test partial day event with every day interval and conclusion*/
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RDATE', '20240703T080000,20240709T080000,20240713T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'On specific dates between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-		/** test entire day event with every day interval and no conclusion*/
-		$vCalendar = clone $this->vCalendar2;
-		$vCalendar->VEVENT[0]->add('RDATE', '20240703T080000,20240709T080000,20240713T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'On specific dates for the entire day until July 13, 2024',
-			$this->service->generateWhenString($eventReader)
-		);
-
-	}
-
-	public function testGenerateOccurringStringWithRrule(): void {
-
-		// construct l10n return(s)
-		$this->l10n->method('l')->willReturnCallback(
-			function ($v1, $v2, $v3) {
-				return match (true) {
-					$v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 1, 2024',
-					$v1 === 'date' && $v2 == (new \DateTime('20240703T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 3, 2024',
-					$v1 === 'date' && $v2 == (new \DateTime('20240705T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 5, 2024'
-				};
-			}
-		);
-		$this->l10n->method('n')->willReturnMap([
-			// singular
-			[
-				'In a day on %1$s',
-				'In %n days on %1$s',
-				1,
-				['July 1, 2024'],
-				'In a day on July 1, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s',
-				'In %n days on %1$s then on %2$s',
-				1,
-				['July 1, 2024', 'July 3, 2024'],
-				'In a day on July 1, 2024 then on July 3, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s and %3$s',
-				'In %n days on %1$s then on %2$s and %3$s',
-				1,
-				['July 1, 2024', 'July 3, 2024', 'July 5, 2024'],
-				'In a day on July 1, 2024 then on July 3, 2024 and July 5, 2024'
-			],
-			// plural
-			[
-				'In a day on %1$s',
-				'In %n days on %1$s',
-				2,
-				['July 1, 2024'],
-				'In 2 days on July 1, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s',
-				'In %n days on %1$s then on %2$s',
-				2,
-				['July 1, 2024', 'July 3, 2024'],
-				'In 2 days on July 1, 2024 then on July 3, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s and %3$s',
-				'In %n days on %1$s then on %2$s and %3$s',
-				2,
-				['July 1, 2024', 'July 3, 2024', 'July 5, 2024'],
-				'In 2 days on July 1, 2024 then on July 3, 2024 and July 5, 2024'
-			],
-		]);
-
-		// construct time factory return(s)
-		$this->timeFactory->method('getDateTime')->willReturnOnConsecutiveCalls(
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-		);
-
-		/** test patrial day recurring event in 1 day with single occurrence remaining */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=1');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024',
-			$this->service->generateOccurringString($eventReader)
-		);
-
-		/** test patrial day recurring event in 1 day with two occurrences remaining */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=2');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024 then on July 3, 2024',
-			$this->service->generateOccurringString($eventReader)
-		);
-
-		/** test patrial day recurring event in 1 day with three occurrences remaining */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=3');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024 then on July 3, 2024 and July 5, 2024',
-			$this->service->generateOccurringString($eventReader)
-		);
-
-		/** test patrial day recurring event in 2 days with single occurrence remaining */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=1');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024',
-			$this->service->generateOccurringString($eventReader)
-		);
-
-		/** test patrial day recurring event in 2 days with two occurrences remaining */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=2');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024 then on July 3, 2024',
-			$this->service->generateOccurringString($eventReader)
-		);
-
-		/** test patrial day recurring event in 2 days with three occurrences remaining */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=3');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024 then on July 3, 2024 and July 5, 2024',
-			$this->service->generateOccurringString($eventReader)
-		);
-	}
-
-	public function testGenerateOccurringStringWithRdate(): void {
-
-		// construct l10n return(s)
-		$this->l10n->method('l')->willReturnCallback(
-			function ($v1, $v2, $v3) {
-				return match (true) {
-					$v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 1, 2024',
-					$v1 === 'date' && $v2 == (new \DateTime('20240703T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 3, 2024',
-					$v1 === 'date' && $v2 == (new \DateTime('20240705T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 5, 2024'
-				};
-			}
-		);
-		$this->l10n->method('n')->willReturnMap([
-			// singular
-			[
-				'In a day on %1$s',
-				'In %n days on %1$s',
-				1,
-				['July 1, 2024'],
-				'In a day on July 1, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s',
-				'In %n days on %1$s then on %2$s',
-				1,
-				['July 1, 2024', 'July 3, 2024'],
-				'In a day on July 1, 2024 then on July 3, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s and %3$s',
-				'In %n days on %1$s then on %2$s and %3$s',
-				1,
-				['July 1, 2024', 'July 3, 2024', 'July 5, 2024'],
-				'In a day on July 1, 2024 then on July 3, 2024 and July 5, 2024'
-			],
-			// plural
-			[
-				'In a day on %1$s',
-				'In %n days on %1$s',
-				2,
-				['July 1, 2024'],
-				'In 2 days on July 1, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s',
-				'In %n days on %1$s then on %2$s',
-				2,
-				['July 1, 2024', 'July 3, 2024'],
-				'In 2 days on July 1, 2024 then on July 3, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s and %3$s',
-				'In %n days on %1$s then on %2$s and %3$s',
-				2,
-				['July 1, 2024', 'July 3, 2024', 'July 5, 2024'],
-				'In 2 days on July 1, 2024 then on July 3, 2024 and July 5, 2024'
-			],
-		]);
-
-		// construct time factory return(s)
-		$this->timeFactory->method('getDateTime')->willReturnOnConsecutiveCalls(
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-		);
-
-		/** test patrial day recurring event in 1 day with single occurrence remaining */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RDATE', '20240701T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 1 day with single occurrence remaining'
-		);
-
-		/** test patrial day recurring event in 1 day with two occurrences remaining */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RDATE', '20240701T080000,20240703T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024 then on July 3, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 1 day with two occurrences remaining'
-		);
-
-		/** test patrial day recurring event in 1 day with three occurrences remaining */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RDATE', '20240701T080000,20240703T080000,20240705T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024 then on July 3, 2024 and July 5, 2024',
-			$this->service->generateOccurringString($eventReader),
-			''
-		);
-
-		/** test patrial day recurring event in 2 days with single occurrences remaining */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RDATE', '20240701T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024',
-			$this->service->generateOccurringString($eventReader),
-			''
-		);
-
-		/** test patrial day recurring event in 2 days with two occurrences remaining */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RDATE', '20240701T080000');
-		$vCalendar->VEVENT[0]->add('RDATE', '20240703T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024 then on July 3, 2024',
-			$this->service->generateOccurringString($eventReader),
-			''
-		);
-
-		/** test patrial day recurring event in 2 days with three occurrences remaining */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RDATE', '20240701T080000');
-		$vCalendar->VEVENT[0]->add('RDATE', '20240703T080000');
-		$vCalendar->VEVENT[0]->add('RDATE', '20240705T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024 then on July 3, 2024 and July 5, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 2 days with three occurrences remaining'
-		);
-	}
-
-	public function testGenerateOccurringStringWithOneExdate(): void {
-
-		// construct l10n return(s)
-		$this->l10n->method('l')->willReturnCallback(
-			function ($v1, $v2, $v3) {
-				return match (true) {
-					$v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 1, 2024',
-					$v1 === 'date' && $v2 == (new \DateTime('20240705T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 5, 2024',
-					$v1 === 'date' && $v2 == (new \DateTime('20240707T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 7, 2024'
-				};
-			}
-		);
-		$this->l10n->method('n')->willReturnMap([
-			// singular
-			[
-				'In a day on %1$s',
-				'In %n days on %1$s',
-				1,
-				['July 1, 2024'],
-				'In a day on July 1, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s',
-				'In %n days on %1$s then on %2$s',
-				1,
-				['July 1, 2024', 'July 5, 2024'],
-				'In a day on July 1, 2024 then on July 5, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s and %3$s',
-				'In %n days on %1$s then on %2$s and %3$s',
-				1,
-				['July 1, 2024', 'July 5, 2024', 'July 7, 2024'],
-				'In a day on July 1, 2024 then on July 5, 2024 and July 7, 2024'
-			],
-			// plural
-			[
-				'In a day on %1$s',
-				'In %n days on %1$s',
-				2,
-				['July 1, 2024'],
-				'In 2 days on July 1, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s',
-				'In %n days on %1$s then on %2$s',
-				2,
-				['July 1, 2024', 'July 5, 2024'],
-				'In 2 days on July 1, 2024 then on July 5, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s and %3$s',
-				'In %n days on %1$s then on %2$s and %3$s',
-				2,
-				['July 1, 2024', 'July 5, 2024', 'July 7, 2024'],
-				'In 2 days on July 1, 2024 then on July 5, 2024 and July 7, 2024'
-			],
-		]);
-
-		// construct time factory return(s)
-		$this->timeFactory->method('getDateTime')->willReturnOnConsecutiveCalls(
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-		);
-
-		/** test patrial day recurring event in 1 day with single occurrence remaining and one exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=1');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 1 day with single occurrence remaining and one exception'
-		);
-
-		/** test patrial day recurring event in 1 day with two occurrences remaining and one exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=2');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 1 day with two occurrences remaining and one exception'
-		);
-
-		/** test patrial day recurring event in 1 day with three occurrences remaining and one exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=3');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024 then on July 5, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 1 day with three occurrences remaining and one exception'
-		);
-
-		/** test patrial day recurring event in 1 day with four occurrences remaining and one exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=4');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024 then on July 5, 2024 and July 7, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 1 day with four occurrences remaining and one exception'
-		);
-
-		/** test patrial day recurring event in 2 days with single occurrences remaining and one exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=1');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 2 days with single occurrences remaining and one exception'
-		);
-
-		/** test patrial day recurring event in 2 days with two occurrences remaining and one exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=2');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 2 days with two occurrences remaining and one exception'
-		);
-
-		/** test patrial day recurring event in 2 days with three occurrences remaining and one exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=3');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024 then on July 5, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 2 days with three occurrences remaining and one exception'
-		);
-
-		/** test patrial day recurring event in 2 days with four occurrences remaining and one exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=4');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024 then on July 5, 2024 and July 7, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 2 days with four occurrences remaining and one exception'
-		);
-	}
-
-	public function testGenerateOccurringStringWithTwoExdate(): void {
-
-		// construct l10n return(s)
-		$this->l10n->method('l')->willReturnCallback(
-			function ($v1, $v2, $v3) {
-				return match (true) {
-					$v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 1, 2024',
-					$v1 === 'date' && $v2 == (new \DateTime('20240705T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 5, 2024',
-					$v1 === 'date' && $v2 == (new \DateTime('20240709T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 9, 2024'
-				};
-			}
-		);
-		$this->l10n->method('n')->willReturnMap([
-			// singular
-			[
-				'In a day on %1$s',
-				'In %n days on %1$s',
-				1,
-				['July 1, 2024'],
-				'In a day on July 1, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s',
-				'In %n days on %1$s then on %2$s',
-				1,
-				['July 1, 2024', 'July 5, 2024'],
-				'In a day on July 1, 2024 then on July 5, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s and %3$s',
-				'In %n days on %1$s then on %2$s and %3$s',
-				1,
-				['July 1, 2024', 'July 5, 2024', 'July 9, 2024'],
-				'In a day on July 1, 2024 then on July 5, 2024 and July 9, 2024'
-			],
-			// plural
-			[
-				'In a day on %1$s',
-				'In %n days on %1$s',
-				2,
-				['July 1, 2024'],
-				'In 2 days on July 1, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s',
-				'In %n days on %1$s then on %2$s',
-				2,
-				['July 1, 2024', 'July 5, 2024'],
-				'In 2 days on July 1, 2024 then on July 5, 2024'
-			],
-			[
-				'In a day on %1$s then on %2$s and %3$s',
-				'In %n days on %1$s then on %2$s and %3$s',
-				2,
-				['July 1, 2024', 'July 5, 2024', 'July 9, 2024'],
-				'In 2 days on July 1, 2024 then on July 5, 2024 and July 9, 2024'
-			],
-		]);
-
-		// construct time factory return(s)
-		$this->timeFactory->method('getDateTime')->willReturnOnConsecutiveCalls(
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-			(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
-		);
-
-		/** test patrial day recurring event in 1 day with single occurrence remaining and two exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=1');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 1 day with single occurrence remaining and two exception'
-		);
-
-		/** test patrial day recurring event in 1 day with two occurrences remaining and two exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=2');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 1 day with two occurrences remaining and two exception'
-		);
-
-		/** test patrial day recurring event in 1 day with three occurrences remaining and two exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=3');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024 then on July 5, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 1 day with three occurrences remaining and two exception'
-		);
-
-		/** test patrial day recurring event in 1 day with four occurrences remaining and two exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=5');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In a day on July 1, 2024 then on July 5, 2024 and July 9, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 1 day with four occurrences remaining and two exception'
-		);
-
-		/** test patrial day recurring event in 2 days with single occurrences remaining and two exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=1');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 2 days with single occurrences remaining and two exception'
-		);
-
-		/** test patrial day recurring event in 2 days with two occurrences remaining and two exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=2');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 2 days with two occurrences remaining and two exception'
-		);
-
-		/** test patrial day recurring event in 2 days with three occurrences remaining and two exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=3');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024 then on July 5, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 2 days with three occurrences remaining and two exception'
-		);
-
-		/** test patrial day recurring event in 2 days with five occurrences remaining and two exception */
-		$vCalendar = clone $this->vCalendar1a;
-		$vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=5');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
-		$vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
-		// construct event reader
-		$eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
-		// test output
-		$this->assertEquals(
-			'In 2 days on July 1, 2024 then on July 5, 2024 and July 9, 2024',
-			$this->service->generateOccurringString($eventReader),
-			'test patrial day recurring event in 2 days with five occurrences remaining and two exception'
-		);
-	}
+    private URLGenerator&MockObject $urlGenerator;
+    private IConfig&MockObject $config;
+    private IDBConnection&MockObject $db;
+    private ISecureRandom&MockObject $random;
+    private IFactory&MockObject $l10nFactory;
+    private IL10N&MockObject $l10n;
+    private ITimeFactory&MockObject $timeFactory;
+    private IMipService $service;
+
+
+    private VCalendar $vCalendar1a;
+    private VCalendar $vCalendar1b;
+    private VCalendar $vCalendar2;
+    private VCalendar $vCalendar3;
+    /** @var DateTime DateTime object that will be returned by DateTime() or DateTime('now') */
+    public static $datetimeNow;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->urlGenerator = $this->createMock(URLGenerator::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->db = $this->createMock(IDBConnection::class);
+        $this->random = $this->createMock(ISecureRandom::class);
+        $this->l10nFactory = $this->createMock(IFactory::class);
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->l10nFactory->expects(self::once())
+            ->method('findGenericLanguage')
+            ->willReturn('en');
+        $this->l10nFactory->expects(self::once())
+            ->method('get')
+            ->with('dav', 'en')
+            ->willReturn($this->l10n);
+        $this->service = new IMipService(
+            $this->urlGenerator,
+            $this->config,
+            $this->db,
+            $this->random,
+            $this->l10nFactory,
+            $this->timeFactory
+        );
+
+        // construct calendar with a 1 hour event and same start/end time zones
+        $this->vCalendar1a = new VCalendar();
+        $vEvent = $this->vCalendar1a->add('VEVENT', []);
+        $vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
+        $vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('SUMMARY', 'Testing Event');
+        $vEvent->add('ORGANIZER', 'mailto:organizer@testing.com', ['CN' => 'Organizer']);
+        $vEvent->add('ATTENDEE', 'mailto:attendee1@testing.com', [
+            'CN' => 'Attendee One',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+
+        // construct calendar with a 1 hour event and different start/end time zones
+        $this->vCalendar1b = new VCalendar();
+        $vEvent = $this->vCalendar1b->add('VEVENT', []);
+        $vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
+        $vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Vancouver']);
+        $vEvent->add('SUMMARY', 'Testing Event');
+        $vEvent->add('ORGANIZER', 'mailto:organizer@testing.com', ['CN' => 'Organizer']);
+        $vEvent->add('ATTENDEE', 'mailto:attendee1@testing.com', [
+            'CN' => 'Attendee One',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+
+        // construct calendar with a full day event
+        $this->vCalendar2 = new VCalendar();
+        // time zone component
+        $vTimeZone = $this->vCalendar2->add('VTIMEZONE');
+        $vTimeZone->add('TZID', 'America/Toronto');
+        // event component
+        $vEvent = $this->vCalendar2->add('VEVENT', []);
+        $vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
+        $vEvent->add('DTSTART', '20240701');
+        $vEvent->add('DTEND', '20240702');
+        $vEvent->add('SUMMARY', 'Testing Event');
+        $vEvent->add('ORGANIZER', 'mailto:organizer@testing.com', ['CN' => 'Organizer']);
+        $vEvent->add('ATTENDEE', 'mailto:attendee1@testing.com', [
+            'CN' => 'Attendee One',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+
+        // construct calendar with a multi day event
+        $this->vCalendar3 = new VCalendar();
+        // time zone component
+        $vTimeZone = $this->vCalendar3->add('VTIMEZONE');
+        $vTimeZone->add('TZID', 'America/Toronto');
+        // event component
+        $vEvent = $this->vCalendar3->add('VEVENT', []);
+        $vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
+        $vEvent->add('DTSTART', '20240701');
+        $vEvent->add('DTEND', '20240706');
+        $vEvent->add('SUMMARY', 'Testing Event');
+        $vEvent->add('ORGANIZER', 'mailto:organizer@testing.com', ['CN' => 'Organizer']);
+        $vEvent->add('ATTENDEE', 'mailto:attendee1@testing.com', [
+            'CN' => 'Attendee One',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+    }
+
+    public function testGetFrom(): void {
+        $senderName = 'Detective McQueen';
+        $default = 'Twin Lakes Police Department - Darkside Division';
+        $expected = 'Detective McQueen via Twin Lakes Police Department - Darkside Division';
+
+        $this->l10n->expects(self::once())
+            ->method('t')
+            ->willReturn($expected);
+
+        $actual = $this->service->getFrom($senderName, $default);
+        $this->assertEquals($expected, $actual);
+    }
+
+    public function testBuildBodyDataCreated(): void {
+
+        // construct l10n return(s)
+        $this->l10n->method('l')->willReturnCallback(
+            function ($v1, $v2, $v3) {
+                return match (true) {
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'full'] => 'July 1, 2024'
+                };
+            }
+        );
+        $this->l10n->method('n')->willReturnMap([
+            [
+                'In a day on %1$s between %2$s - %3$s',
+                'In %n days on %1$s between %2$s - %3$s',
+                1,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ]
+        ]);
+        // construct time factory return(s)
+        $this->timeFactory->method('getDateTime')->willReturnCallback(
+            function ($v1, $v2) {
+                return match (true) {
+                    $v1 == 'now' && $v2 == null => (new \DateTime('20240630T000000'))
+                };
+            }
+        );
+        /** test singleton partial day event*/
+        $vCalendar = clone $this->vCalendar1a;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // define expected output
+        $expected = [
+            'meeting_when' => $this->service->generateWhenString($eventReader),
+            'meeting_description' => '',
+            'meeting_title' => 'Testing Event',
+            'meeting_location' => '',
+            'meeting_url' => '',
+            'meeting_url_html' => '',
+        ];
+        // generate actual output
+        $actual = $this->service->buildBodyData($vCalendar->VEVENT[0], null);
+        // test output
+        $this->assertEquals($expected, $actual);
+    }
+
+    public function testBuildBodyDataUpdate(): void {
+
+        // construct l10n return(s)
+        $this->l10n->method('l')->willReturnCallback(
+            function ($v1, $v2, $v3) {
+                return match (true) {
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'full'] => 'July 1, 2024'
+                };
+            }
+        );
+        $this->l10n->method('n')->willReturnMap([
+            [
+                'In a day on %1$s between %2$s - %3$s',
+                'In %n days on %1$s between %2$s - %3$s',
+                1,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ]
+        ]);
+        // construct time factory return(s)
+        $this->timeFactory->method('getDateTime')->willReturnCallback(
+            function ($v1, $v2) {
+                return match (true) {
+                    $v1 == 'now' && $v2 == null => (new \DateTime('20240630T000000'))
+                };
+            }
+        );
+        /** test singleton partial day event*/
+        $vCalendarNew = clone $this->vCalendar1a;
+        $vCalendarOld = clone $this->vCalendar1a;
+        // construct event reader
+        $eventReaderNew = new EventReader($vCalendarNew, $vCalendarNew->VEVENT[0]->UID->getValue());
+        // alter old event label/title
+        $vCalendarOld->VEVENT[0]->SUMMARY->setValue('Testing Singleton Event');
+        // define expected output
+        $expected = [
+            'meeting_when' => $this->service->generateWhenString($eventReaderNew),
+            'meeting_description' => '',
+            'meeting_title' => 'Testing Event',
+            'meeting_location' => '',
+            'meeting_url' => '',
+            'meeting_url_html' => '',
+            'meeting_when_html' => $this->service->generateWhenString($eventReaderNew),
+            'meeting_title_html' => sprintf("<span style='text-decoration: line-through'>%s</span><br />%s", 'Testing Singleton Event', 'Testing Event'),
+            'meeting_description_html' => '',
+            'meeting_location_html' => ''
+        ];
+        // generate actual output
+        $actual = $this->service->buildBodyData($vCalendarNew->VEVENT[0], $vCalendarOld->VEVENT[0]);
+        // test output
+        $this->assertEquals($expected, $actual);
+    }
+
+    public function testGetLastOccurrenceRRULE(): void {
+        $vCalendar = new VCalendar();
+        $vCalendar->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
+        ]);
+
+        $occurrence = $this->service->getLastOccurrence($vCalendar);
+        $this->assertEquals(1454284800, $occurrence);
+    }
+
+    public function testGetLastOccurrenceEndDate(): void {
+        $vCalendar = new VCalendar();
+        $vCalendar->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'DTEND' => new \DateTime('2017-01-01 00:00:00'),
+        ]);
+
+        $occurrence = $this->service->getLastOccurrence($vCalendar);
+        $this->assertEquals(1483228800, $occurrence);
+    }
+
+    public function testGetLastOccurrenceDuration(): void {
+        $vCalendar = new VCalendar();
+        $vCalendar->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'DURATION' => 'P12W',
+        ]);
+
+        $occurrence = $this->service->getLastOccurrence($vCalendar);
+        $this->assertEquals(1458864000, $occurrence);
+    }
+
+    public function testGetLastOccurrenceAllDay(): void {
+        $vCalendar = new VCalendar();
+        $vEvent = $vCalendar->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+        ]);
+
+        // rewrite from DateTime to Date
+        $vEvent->DTSTART['VALUE'] = 'DATE';
+
+        $occurrence = $this->service->getLastOccurrence($vCalendar);
+        $this->assertEquals(1451692800, $occurrence);
+    }
+
+    public function testGetLastOccurrenceFallback(): void {
+        $vCalendar = new VCalendar();
+        $vCalendar->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+        ]);
+
+        $occurrence = $this->service->getLastOccurrence($vCalendar);
+        $this->assertEquals(1451606400, $occurrence);
+    }
+
+    public function testGenerateWhenStringSingular(): void {
+
+        // construct l10n return(s)
+        $this->l10n->method('l')->willReturnCallback(
+            function ($v1, $v2, $v3) {
+                return match (true) {
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'full'] => 'July 1, 2024',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240701T000000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'full'] => 'July 1, 2024'
+                };
+            }
+        );
+        $this->l10n->method('t')->willReturnMap([
+            [
+                'In the past on %1$s for the entire day',
+                ['July 1, 2024'],
+                'In the past on July 1, 2024 for the entire day'
+            ],
+            [
+                'In the past on %1$s between %2$s - %3$s',
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In the past on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+        ]);
+        $this->l10n->method('n')->willReturnMap([
+            // singular entire day
+            [
+                'In a minute on %1$s for the entire day',
+                'In %n minutes on %1$s for the entire day',
+                1,
+                ['July 1, 2024'],
+                'In a minute on July 1, 2024 for the entire day'
+            ],
+            [
+                'In a hour on %1$s for the entire day',
+                'In %n hours on %1$s for the entire day',
+                1,
+                ['July 1, 2024'],
+                'In a hour on July 1, 2024 for the entire day'
+            ],
+            [
+                'In a day on %1$s for the entire day',
+                'In %n days on %1$s for the entire day',
+                1,
+                ['July 1, 2024'],
+                'In a day on July 1, 2024 for the entire day'
+            ],
+            [
+                'In a week on %1$s for the entire day',
+                'In %n weeks on %1$s for the entire day',
+                1,
+                ['July 1, 2024'],
+                'In a week on July 1, 2024 for the entire day'
+            ],
+            [
+                'In a month on %1$s for the entire day',
+                'In %n months on %1$s for the entire day',
+                1,
+                ['July 1, 2024'],
+                'In a month on July 1, 2024 for the entire day'
+            ],
+            [
+                'In a year on %1$s for the entire day',
+                'In %n years on %1$s for the entire day',
+                1,
+                ['July 1, 2024'],
+                'In a year on July 1, 2024 for the entire day'
+            ],
+            // plural entire day
+            [
+                'In a minute on %1$s for the entire day',
+                'In %n minutes on %1$s for the entire day',
+                2,
+                ['July 1, 2024'],
+                'In 2 minutes on July 1, 2024 for the entire day'
+            ],
+            [
+                'In a hour on %1$s for the entire day',
+                'In %n hours on %1$s for the entire day',
+                2,
+                ['July 1, 2024'],
+                'In 2 hours on July 1, 2024 for the entire day'
+            ],
+            [
+                'In a day on %1$s for the entire day',
+                'In %n days on %1$s for the entire day',
+                2,
+                ['July 1, 2024'],
+                'In 2 days on July 1, 2024 for the entire day'
+            ],
+            [
+                'In a week on %1$s for the entire day',
+                'In %n weeks on %1$s for the entire day',
+                2,
+                ['July 1, 2024'],
+                'In 2 weeks on July 1, 2024 for the entire day'
+            ],
+            [
+                'In a month on %1$s for the entire day',
+                'In %n months on %1$s for the entire day',
+                2,
+                ['July 1, 2024'],
+                'In 2 months on July 1, 2024 for the entire day'
+            ],
+            [
+                'In a year on %1$s for the entire day',
+                'In %n years on %1$s for the entire day',
+                2,
+                ['July 1, 2024'],
+                'In 2 years on July 1, 2024 for the entire day'
+            ],
+            // singular partial day
+            [
+                'In a minute on %1$s between %2$s - %3$s',
+                'In %n minutes on %1$s between %2$s - %3$s',
+                1,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In a minute on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+            [
+                'In a hour on %1$s between %2$s - %3$s',
+                'In %n hours on %1$s between %2$s - %3$s',
+                1,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In a hour on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+            [
+                'In a day on %1$s between %2$s - %3$s',
+                'In %n days on %1$s between %2$s - %3$s',
+                1,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+            [
+                'In a week on %1$s between %2$s - %3$s',
+                'In %n weeks on %1$s between %2$s - %3$s',
+                1,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In a week on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+            [
+                'In a month on %1$s between %2$s - %3$s',
+                'In %n months on %1$s between %2$s - %3$s',
+                1,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In a month on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+            [
+                'In a year on %1$s between %2$s - %3$s',
+                'In %n years on %1$s between %2$s - %3$s',
+                1,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In a year on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+            // plural partial day
+            [
+                'In a minute on %1$s between %2$s - %3$s',
+                'In %n minutes on %1$s between %2$s - %3$s',
+                2,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In 2 minutes on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+            [
+                'In a hour on %1$s between %2$s - %3$s',
+                'In %n hours on %1$s between %2$s - %3$s',
+                2,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In 2 hours on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+            [
+                'In a day on %1$s between %2$s - %3$s',
+                'In %n days on %1$s between %2$s - %3$s',
+                2,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In 2 days on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+            [
+                'In a week on %1$s between %2$s - %3$s',
+                'In %n weeks on %1$s between %2$s - %3$s',
+                2,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In 2 weeks on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+            [
+                'In a month on %1$s between %2$s - %3$s',
+                'In %n months on %1$s between %2$s - %3$s',
+                2,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In 2 months on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+            [
+                'In a year on %1$s between %2$s - %3$s',
+                'In %n years on %1$s between %2$s - %3$s',
+                2,
+                ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+                'In 2 years on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+            ],
+        ]);
+
+        // construct time factory return(s)
+        $this->timeFactory->method('getDateTime')->willReturnOnConsecutiveCalls(
+            // past interval test dates
+            (new \DateTime('20240702T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240703T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240702T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240703T170000', (new \DateTimeZone('America/Toronto')))),
+            // minute interval test dates
+            (new \DateTime('20240701T075900', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240630T235900', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240701T075800', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240630T235800', (new \DateTimeZone('America/Toronto')))),
+            // hour interval test dates
+            (new \DateTime('20240701T070000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240630T230000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240701T060000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240630T220000', (new \DateTimeZone('America/Toronto')))),
+            // day interval test dates
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            // week interval test dates
+            (new \DateTime('20240621T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240621T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240614T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240614T170000', (new \DateTimeZone('America/Toronto')))),
+            // month interval test dates
+            (new \DateTime('20240530T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240530T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240430T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240430T170000', (new \DateTimeZone('America/Toronto')))),
+            // year interval test dates
+            (new \DateTime('20230630T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20230630T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20220630T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20220630T170000', (new \DateTimeZone('America/Toronto'))))
+        );
+
+        /** test partial day event in 1 day in the past*/
+        $vCalendar = clone $this->vCalendar1a;
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        $this->assertEquals(
+            'In the past on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 1 day in the past*/
+        $vCalendar = clone $this->vCalendar2;
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        $this->assertEquals(
+            'In the past on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test partial day event in 2 days in the past*/
+        $vCalendar = clone $this->vCalendar1a;
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        $this->assertEquals(
+            'In the past on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 2 days in the past*/
+        $vCalendar = clone $this->vCalendar2;
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        $this->assertEquals(
+            'In the past on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test partial day event in 1 minute*/
+        $vCalendar = clone $this->vCalendar1a;
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        $this->assertEquals(
+            'In a minute on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 1 minute*/
+        $vCalendar = clone $this->vCalendar2;
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        $this->assertEquals(
+            'In a minute on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test partial day event in 2 minutes*/
+        $vCalendar = clone $this->vCalendar1a;
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        $this->assertEquals(
+            'In 2 minutes on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 2 minutes*/
+        $vCalendar = clone $this->vCalendar2;
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        $this->assertEquals(
+            'In 2 minutes on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test partial day event in 1 hour*/
+        $vCalendar = clone $this->vCalendar1a;
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        $this->assertEquals(
+            'In a hour on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 1 hour*/
+        $vCalendar = clone $this->vCalendar2;
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        $this->assertEquals(
+            'In a hour on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test partial day event in 2 hours*/
+        $vCalendar = clone $this->vCalendar1a;
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        $this->assertEquals(
+            'In 2 hours on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 2 hours*/
+        $vCalendar = clone $this->vCalendar2;
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        $this->assertEquals(
+            'In 2 hours on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test patrial day event in 1 day*/
+        $vCalendar = clone $this->vCalendar1a;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 1 day*/
+        $vCalendar = clone $this->vCalendar2;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test patrial day event in 2 days*/
+        $vCalendar = clone $this->vCalendar1a;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 2 days*/
+        $vCalendar = clone $this->vCalendar2;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test patrial day event in 1 week*/
+        $vCalendar = clone $this->vCalendar1a;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a week on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 1 week*/
+        $vCalendar = clone $this->vCalendar2;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a week on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test patrial day event in 2 weeks*/
+        $vCalendar = clone $this->vCalendar1a;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 weeks on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 2 weeks*/
+        $vCalendar = clone $this->vCalendar2;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 weeks on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test patrial day event in 1 month*/
+        $vCalendar = clone $this->vCalendar1a;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a month on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 1 month*/
+        $vCalendar = clone $this->vCalendar2;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a month on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test patrial day event in 2 months*/
+        $vCalendar = clone $this->vCalendar1a;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 months on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 2 months*/
+        $vCalendar = clone $this->vCalendar2;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 months on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test patrial day event in 1 year*/
+        $vCalendar = clone $this->vCalendar1a;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a year on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 1 year*/
+        $vCalendar = clone $this->vCalendar2;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a year on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test patrial day event in 2 years*/
+        $vCalendar = clone $this->vCalendar1a;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 years on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event in 2 years*/
+        $vCalendar = clone $this->vCalendar2;
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 years on July 1, 2024 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+    }
+
+    public function testGenerateWhenStringRecurringDaily(): void {
+
+        // construct l10n return maps
+        $this->l10n->method('l')->willReturnCallback(
+            function ($v1, $v2, $v3) {
+                return match (true) {
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240713T080000', (new \DateTimeZone('UTC')))) && $v3 == ['width' => 'long'] => 'July 13, 2024'
+                };
+            }
+        );
+        $this->l10n->method('t')->willReturnMap([
+            ['Every Day for the entire day', [], 'Every Day for the entire day'],
+            ['Every Day for the entire day until %1$s', ['July 13, 2024'], 'Every Day for the entire day until July 13, 2024'],
+            ['Every Day between %1$s - %2$s', ['8:00 AM', '9:00 AM (America/Toronto)'], 'Every Day between 8:00 AM - 9:00 AM (America/Toronto)'],
+            ['Every Day between %1$s - %2$s until %3$s', ['8:00 AM', '9:00 AM (America/Toronto)', 'July 13, 2024'], 'Every Day between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024'],
+            ['Every %1$d Days for the entire day', [3], 'Every 3 Days for the entire day'],
+            ['Every %1$d Days for the entire day until %2$s', [3, 'July 13, 2024'], 'Every 3 Days for the entire day until July 13, 2024'],
+            ['Every %1$d Days between %2$s - %3$s', [3, '8:00 AM', '9:00 AM (America/Toronto)'], 'Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto)'],
+            ['Every %1$d Days between %2$s - %3$s until %4$s', [3, '8:00 AM', '9:00 AM (America/Toronto)', 'July 13, 2024'], 'Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024'],
+            ['Could not generate event recurrence statement', [], 'Could not generate event recurrence statement'],
+        ]);
+
+        /** test partial day event with every day interval and no conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=1;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Day between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test partial day event with every day interval and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=1;UNTIL=20240713T080000Z');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Day between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test partial day event every 3rd day interval and no conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=3;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test partial day event with every 3rd day interval and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=3;UNTIL=20240713T080000Z');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event with every day interval and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=1;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Day for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event with every day interval and conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=1;UNTIL=20240713T080000Z');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Day for the entire day until July 13, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event with every 3rd day interval and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=3;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 3 Days for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event with every 3rd day interval and conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=3;UNTIL=20240713T080000Z');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 3 Days for the entire day until July 13, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+    }
+
+    public function testGenerateWhenStringRecurringWeekly(): void {
+
+        // construct l10n return maps
+        $this->l10n->method('l')->willReturnCallback(
+            function ($v1, $v2, $v3) {
+                return match (true) {
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240722T080000', (new \DateTimeZone('UTC')))) && $v3 == ['width' => 'long'] => 'July 13, 2024'
+                };
+            }
+        );
+        $this->l10n->method('t')->willReturnMap([
+            ['Every Week on %1$s for the entire day', ['Monday, Wednesday, Friday'], 'Every Week on Monday, Wednesday, Friday for the entire day'],
+            ['Every Week on %1$s for the entire day until %2$s', ['Monday, Wednesday, Friday', 'July 13, 2024'], 'Every Week on Monday, Wednesday, Friday for the entire day until July 13, 2024'],
+            ['Every Week on %1$s between %2$s - %3$s', ['Monday, Wednesday, Friday', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)'],
+            ['Every Week on %1$s between %2$s - %3$s until %4$s', ['Monday, Wednesday, Friday', '8:00 AM', '9:00 AM (America/Toronto)', 'July 13, 2024'], 'Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024'],
+            ['Every %1$d Weeks on %2$s for the entire day', [2, 'Monday, Wednesday, Friday'], 'Every 2 Weeks on Monday, Wednesday, Friday for the entire day'],
+            ['Every %1$d Weeks on %2$s for the entire day until %3$s', [2, 'Monday, Wednesday, Friday', 'July 13, 2024'], 'Every 2 Weeks on Monday, Wednesday, Friday for the entire day until July 13, 2024'],
+            ['Every %1$d Weeks on %2$s between %3$s - %4$s', [2, 'Monday, Wednesday, Friday', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)'],
+            ['Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s', [2, 'Monday, Wednesday, Friday', '8:00 AM', '9:00 AM (America/Toronto)', 'July 13, 2024'], 'Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024'],
+            ['Could not generate event recurrence statement', [], 'Could not generate event recurrence statement'],
+            ['Monday', [], 'Monday'],
+            ['Wednesday', [], 'Wednesday'],
+            ['Friday', [], 'Friday'],
+        ]);
+
+        /** test partial day event with every week interval on Mon, Wed, Fri and no conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test partial day event with every week interval on Mon, Wed, Fri and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;UNTIL=20240722T080000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test partial day event with every 2nd week interval on Mon, Wed, Fri and no conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;INTERVAL=2;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test partial day event with every 2nd week interval on Mon, Wed, Fri and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;INTERVAL=2;UNTIL=20240722T080000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event with every week interval on Mon, Wed, Fri and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Week on Monday, Wednesday, Friday for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event with every week interval on Mon, Wed, Fri and conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;UNTIL=20240722T080000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Week on Monday, Wednesday, Friday for the entire day until July 13, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event with every 2nd week interval on Mon, Wed, Fri and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;INTERVAL=2;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Weeks on Monday, Wednesday, Friday for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event with every 2nd week interval on Mon, Wed, Fri and conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=WEEKLY;BYDAY=MO,WE,FR;INTERVAL=2;UNTIL=20240722T080000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Weeks on Monday, Wednesday, Friday for the entire day until July 13, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+    }
+
+    public function testGenerateWhenStringRecurringMonthly(): void {
+
+        // construct l10n return maps
+        $this->l10n->method('l')->willReturnCallback(
+            function ($v1, $v2, $v3) {
+                return match (true) {
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
+                    $v1 === 'date' && $v2 == (new \DateTime('20241231T080000', (new \DateTimeZone('UTC')))) && $v3 == ['width' => 'long'] => 'December 31, 2024'
+                };
+            }
+        );
+        $this->l10n->method('t')->willReturnMap([
+            ['Every Month on the %1$s for the entire day', ['1, 8'], 'Every Month on the 1, 8 for the entire day'],
+            ['Every Month on the %1$s for the entire day until %2$s', ['1, 8', 'December 31, 2024'], 'Every Month on the 1, 8 for the entire day until December 31, 2024'],
+            ['Every Month on the %1$s between %2$s - %3$s', ['1, 8', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)'],
+            ['Every Month on the %1$s between %2$s - %3$s until %4$s', ['1, 8', '8:00 AM', '9:00 AM (America/Toronto)', 'December 31, 2024'], 'Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024'],
+            ['Every %1$d Months on the %2$s for the entire day', [2, '1, 8'], 'Every 2 Months on the 1, 8 for the entire day'],
+            ['Every %1$d Months on the %2$s for the entire day until %3$s', [2, '1, 8', 'December 31, 2024'], 'Every 2 Months on the 1, 8 for the entire day until December 31, 2024'],
+            ['Every %1$d Months on the %2$s between %3$s - %4$s', [2, '1, 8', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)'],
+            ['Every %1$d Months on the %2$s between %3$s - %4$s until %5$s', [2, '1, 8', '8:00 AM', '9:00 AM (America/Toronto)', 'December 31, 2024'], 'Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024'],
+            ['Every Month on the %1$s for the entire day', ['First Sunday, Saturday'], 'Every Month on the First Sunday, Saturday for the entire day'],
+            ['Every Month on the %1$s for the entire day until %2$s', ['First Sunday, Saturday', 'December 31, 2024'], 'Every Month on the First Sunday, Saturday for the entire day until December 31, 2024'],
+            ['Every Month on the %1$s between %2$s - %3$s', ['First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)'],
+            ['Every Month on the %1$s between %2$s - %3$s until %4$s', ['First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)', 'December 31, 2024'], 'Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024'],
+            ['Every %1$d Months on the %2$s for the entire day', [2, 'First Sunday, Saturday'], 'Every 2 Months on the First Sunday, Saturday for the entire day'],
+            ['Every %1$d Months on the %2$s for the entire day until %3$s', [2, 'First Sunday, Saturday', 'December 31, 2024'], 'Every 2 Months on the First Sunday, Saturday for the entire day until December 31, 2024'],
+            ['Every %1$d Months on the %2$s between %3$s - %4$s', [2, 'First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)'],
+            ['Every %1$d Months on the %2$s between %3$s - %4$s until %5$s', [2, 'First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)', 'December 31, 2024'], 'Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024'],
+            ['Could not generate event recurrence statement', [], 'Could not generate event recurrence statement'],
+            ['Saturday', [], 'Saturday'],
+            ['Sunday', [], 'Sunday'],
+            ['First', [], 'First'],
+        ]);
+
+        /** test absolute partial day event with every month interval on 1st, 8th and no conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute partial day event with every Month interval on 1st, 8th and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;UNTIL=20241231T080000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute partial day event with every 2nd Month interval on 1st, 8th and no conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;INTERVAL=2;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute partial day event with every 2nd Month interval on 1st, 8th and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;INTERVAL=2;UNTIL=20241231T080000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute entire day event with every Month interval on 1st, 8th and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Month on the 1, 8 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute entire day event with every Month interval on 1st, 8th and conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;UNTIL=20241231T080000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Month on the 1, 8 for the entire day until December 31, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute entire day event with every 2nd Month interval on 1st, 8th and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;INTERVAL=2;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Months on the 1, 8 for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute entire day event with every 2nd Month interval on 1st, 8th and conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYMONTHDAY=1,8;INTERVAL=2;UNTIL=20241231T080000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Months on the 1, 8 for the entire day until December 31, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative partial day event with every month interval on the 1st Saturday, Sunday and no conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative partial day event with every Month interval on the 1st Saturday, Sunday and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;UNTIL=20241231T080000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative partial day event with every 2nd Month interval on the 1st Saturday, Sunday and no conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative partial day event with every 2nd Month interval on the 1st Saturday, Sunday and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;UNTIL=20241231T080000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative entire day event with every Month interval on the 1st Saturday, Sunday and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Month on the First Sunday, Saturday for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative entire day event with every Month interval on the 1st Saturday, Sunday and conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;UNTIL=20241231T080000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Month on the First Sunday, Saturday for the entire day until December 31, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative entire day event with every 2nd Month interval on the 1st Saturday, Sunday and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Months on the First Sunday, Saturday for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative entire day event with every 2nd Month interval on the 1st Saturday, Sunday and conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=MONTHLY;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;UNTIL=20241231T080000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Months on the First Sunday, Saturday for the entire day until December 31, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+    }
+
+    public function testGenerateWhenStringRecurringYearly(): void {
+
+        // construct l10n return maps
+        $this->l10n->method('l')->willReturnCallback(
+            function ($v1, $v2, $v3) {
+                return match (true) {
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
+                    $v1 === 'date' && $v2 == (new \DateTime('20260731T040000', (new \DateTimeZone('UTC')))) && $v3 == ['width' => 'long'] => 'July 31, 2026'
+                };
+            }
+        );
+        $this->l10n->method('t')->willReturnMap([
+            ['Every Year in %1$s on the %2$s for the entire day', ['July', '1st'], 'Every Year in July on the 1st for the entire day'],
+            ['Every Year in %1$s on the %2$s for the entire day until %3$s', ['July', '1st', 'July 31, 2026'], 'Every Year in July on the 1st for the entire day until July 31, 2026'],
+            ['Every Year in %1$s on the %2$s between %3$s - %4$s', ['July', '1st', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)'],
+            ['Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s', ['July', '1st', '8:00 AM', '9:00 AM (America/Toronto)', 'July 31, 2026'], 'Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026'],
+            ['Every %1$d Years in %2$s on the %3$s for the entire day', [2, 'July', '1st'], 'Every 2 Years in July on the 1st for the entire day'],
+            ['Every %1$d Years in %2$s on the %3$s for the entire day until %4$s', [2, 'July', '1st', 'July 31, 2026'], 'Every 2 Years in July on the 1st for the entire day until July 31, 2026'],
+            ['Every %1$d Years in %2$s on the %3$s between %4$s - %5$s', [2, 'July', '1st', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)'],
+            ['Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s', [2, 'July', '1st', '8:00 AM', '9:00 AM (America/Toronto)', 'July 31, 2026'], 'Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026'],
+            ['Every Year in %1$s on the %2$s for the entire day', ['July', 'First Sunday, Saturday'], 'Every Year in July on the First Sunday, Saturday for the entire day'],
+            ['Every Year in %1$s on the %2$s for the entire day until %3$s', ['July', 'First Sunday, Saturday', 'July 31, 2026'], 'Every Year in July on the First Sunday, Saturday for the entire day until July 31, 2026'],
+            ['Every Year in %1$s on the %2$s between %3$s - %4$s', ['July', 'First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)'],
+            ['Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s', ['July', 'First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)', 'July 31, 2026'], 'Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026'],
+            ['Every %1$d Years in %2$s on the %3$s for the entire day', [2, 'July', 'First Sunday, Saturday'], 'Every 2 Years in July on the First Sunday, Saturday for the entire day'],
+            ['Every %1$d Years in %2$s on the %3$s for the entire day until %4$s', [2, 'July', 'First Sunday, Saturday', 'July 31, 2026'], 'Every 2 Years in July on the First Sunday, Saturday for the entire day until July 31, 2026'],
+            ['Every %1$d Years in %2$s on the %3$s between %4$s - %5$s', [2, 'July', 'First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)'], 'Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)'],
+            ['Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s', [2, 'July', 'First Sunday, Saturday', '8:00 AM', '9:00 AM (America/Toronto)', 'July 31, 2026'], 'Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026'],
+            ['Could not generate event recurrence statement', [], 'Could not generate event recurrence statement'],
+            ['July', [], 'July'],
+            ['Saturday', [], 'Saturday'],
+            ['Sunday', [], 'Sunday'],
+            ['First', [], 'First'],
+        ]);
+
+        /** test absolute partial day event with every year interval on July 1 and no conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute partial day event with every year interval on July 1 and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;UNTIL=20260731T040000Z');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute partial day event with every 2nd year interval on July 1 and no conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;INTERVAL=2;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute partial day event with every 2nd year interval on July 1 and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;INTERVAL=2;UNTIL=20260731T040000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute entire day event with every year interval on July 1 and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Year in July on the 1st for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute entire day event with every year interval on July 1 and conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;UNTIL=20260731T040000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Year in July on the 1st for the entire day until July 31, 2026',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute entire day event with every 2nd year interval on July 1 and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;INTERVAL=2;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Years in July on the 1st for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test absolute entire day event with every 2nd year interval on July 1 and conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;INTERVAL=2;UNTIL=20260731T040000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Years in July on the 1st for the entire day until July 31, 2026',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative partial day event with every year interval on the 1st Saturday, Sunday in July and no conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative partial day event with every year interval on the 1st Saturday, Sunday in July and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;UNTIL=20260731T040000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative partial day event with every 2nd year interval on the 1st Saturday, Sunday in July and no conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative partial day event with every 2nd year interval on the 1st Saturday, Sunday in July and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;UNTIL=20260731T040000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative entire day event with every year interval on the 1st Saturday, Sunday in July and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Year in July on the First Sunday, Saturday for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative entire day event with every year interval on the 1st Saturday, Sunday in July and conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;UNTIL=20260731T040000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every Year in July on the First Sunday, Saturday for the entire day until July 31, 2026',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative entire day event with every 2nd year interval on the 1st Saturday, Sunday in July and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Years in July on the First Sunday, Saturday for the entire day',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test relative entire day event with every 2nd year interval on the 1st Saturday, Sunday in July and conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=YEARLY;BYMONTH=7;BYDAY=SU,SA;BYSETPOS=1;INTERVAL=2;UNTIL=20260731T040000Z;');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'Every 2 Years in July on the First Sunday, Saturday for the entire day until July 31, 2026',
+            $this->service->generateWhenString($eventReader)
+        );
+
+    }
+
+    public function testGenerateWhenStringRecurringFixed(): void {
+
+        // construct l10n return maps
+        $this->l10n->method('l')->willReturnCallback(
+            function ($v1, $v2, $v3) {
+                return match (true) {
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '8:00 AM',
+                    $v1 === 'time' && $v2 == (new \DateTime('20240701T090000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'short'] => '9:00 AM',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240713T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 13, 2024'
+                };
+            }
+        );
+        $this->l10n->method('t')->willReturnMap([
+            ['On specific dates for the entire day until %1$s', ['July 13, 2024'], 'On specific dates for the entire day until July 13, 2024'],
+            ['On specific dates between %1$s - %2$s until %3$s', ['8:00 AM', '9:00 AM (America/Toronto)', 'July 13, 2024'], 'On specific dates between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024'],
+        ]);
+
+        /** test partial day event with every day interval and conclusion*/
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RDATE', '20240703T080000,20240709T080000,20240713T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'On specific dates between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+        /** test entire day event with every day interval and no conclusion*/
+        $vCalendar = clone $this->vCalendar2;
+        $vCalendar->VEVENT[0]->add('RDATE', '20240703T080000,20240709T080000,20240713T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'On specific dates for the entire day until July 13, 2024',
+            $this->service->generateWhenString($eventReader)
+        );
+
+    }
+
+    public function testGenerateOccurringStringWithRrule(): void {
+
+        // construct l10n return(s)
+        $this->l10n->method('l')->willReturnCallback(
+            function ($v1, $v2, $v3) {
+                return match (true) {
+                    $v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 1, 2024',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240703T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 3, 2024',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240705T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 5, 2024'
+                };
+            }
+        );
+        $this->l10n->method('n')->willReturnMap([
+            // singular
+            [
+                'In a day on %1$s',
+                'In %n days on %1$s',
+                1,
+                ['July 1, 2024'],
+                'In a day on July 1, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s',
+                'In %n days on %1$s then on %2$s',
+                1,
+                ['July 1, 2024', 'July 3, 2024'],
+                'In a day on July 1, 2024 then on July 3, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s and %3$s',
+                'In %n days on %1$s then on %2$s and %3$s',
+                1,
+                ['July 1, 2024', 'July 3, 2024', 'July 5, 2024'],
+                'In a day on July 1, 2024 then on July 3, 2024 and July 5, 2024'
+            ],
+            // plural
+            [
+                'In a day on %1$s',
+                'In %n days on %1$s',
+                2,
+                ['July 1, 2024'],
+                'In 2 days on July 1, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s',
+                'In %n days on %1$s then on %2$s',
+                2,
+                ['July 1, 2024', 'July 3, 2024'],
+                'In 2 days on July 1, 2024 then on July 3, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s and %3$s',
+                'In %n days on %1$s then on %2$s and %3$s',
+                2,
+                ['July 1, 2024', 'July 3, 2024', 'July 5, 2024'],
+                'In 2 days on July 1, 2024 then on July 3, 2024 and July 5, 2024'
+            ],
+        ]);
+
+        // construct time factory return(s)
+        $this->timeFactory->method('getDateTime')->willReturnOnConsecutiveCalls(
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+        );
+
+        /** test patrial day recurring event in 1 day with single occurrence remaining */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=1');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024',
+            $this->service->generateOccurringString($eventReader)
+        );
+
+        /** test patrial day recurring event in 1 day with two occurrences remaining */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=2');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024 then on July 3, 2024',
+            $this->service->generateOccurringString($eventReader)
+        );
+
+        /** test patrial day recurring event in 1 day with three occurrences remaining */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=3');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024 then on July 3, 2024 and July 5, 2024',
+            $this->service->generateOccurringString($eventReader)
+        );
+
+        /** test patrial day recurring event in 2 days with single occurrence remaining */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=1');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024',
+            $this->service->generateOccurringString($eventReader)
+        );
+
+        /** test patrial day recurring event in 2 days with two occurrences remaining */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=2');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024 then on July 3, 2024',
+            $this->service->generateOccurringString($eventReader)
+        );
+
+        /** test patrial day recurring event in 2 days with three occurrences remaining */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=3');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024 then on July 3, 2024 and July 5, 2024',
+            $this->service->generateOccurringString($eventReader)
+        );
+    }
+
+    public function testGenerateOccurringStringWithRdate(): void {
+
+        // construct l10n return(s)
+        $this->l10n->method('l')->willReturnCallback(
+            function ($v1, $v2, $v3) {
+                return match (true) {
+                    $v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 1, 2024',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240703T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 3, 2024',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240705T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 5, 2024'
+                };
+            }
+        );
+        $this->l10n->method('n')->willReturnMap([
+            // singular
+            [
+                'In a day on %1$s',
+                'In %n days on %1$s',
+                1,
+                ['July 1, 2024'],
+                'In a day on July 1, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s',
+                'In %n days on %1$s then on %2$s',
+                1,
+                ['July 1, 2024', 'July 3, 2024'],
+                'In a day on July 1, 2024 then on July 3, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s and %3$s',
+                'In %n days on %1$s then on %2$s and %3$s',
+                1,
+                ['July 1, 2024', 'July 3, 2024', 'July 5, 2024'],
+                'In a day on July 1, 2024 then on July 3, 2024 and July 5, 2024'
+            ],
+            // plural
+            [
+                'In a day on %1$s',
+                'In %n days on %1$s',
+                2,
+                ['July 1, 2024'],
+                'In 2 days on July 1, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s',
+                'In %n days on %1$s then on %2$s',
+                2,
+                ['July 1, 2024', 'July 3, 2024'],
+                'In 2 days on July 1, 2024 then on July 3, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s and %3$s',
+                'In %n days on %1$s then on %2$s and %3$s',
+                2,
+                ['July 1, 2024', 'July 3, 2024', 'July 5, 2024'],
+                'In 2 days on July 1, 2024 then on July 3, 2024 and July 5, 2024'
+            ],
+        ]);
+
+        // construct time factory return(s)
+        $this->timeFactory->method('getDateTime')->willReturnOnConsecutiveCalls(
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+        );
+
+        /** test patrial day recurring event in 1 day with single occurrence remaining */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RDATE', '20240701T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 1 day with single occurrence remaining'
+        );
+
+        /** test patrial day recurring event in 1 day with two occurrences remaining */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RDATE', '20240701T080000,20240703T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024 then on July 3, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 1 day with two occurrences remaining'
+        );
+
+        /** test patrial day recurring event in 1 day with three occurrences remaining */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RDATE', '20240701T080000,20240703T080000,20240705T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024 then on July 3, 2024 and July 5, 2024',
+            $this->service->generateOccurringString($eventReader),
+            ''
+        );
+
+        /** test patrial day recurring event in 2 days with single occurrences remaining */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RDATE', '20240701T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024',
+            $this->service->generateOccurringString($eventReader),
+            ''
+        );
+
+        /** test patrial day recurring event in 2 days with two occurrences remaining */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RDATE', '20240701T080000');
+        $vCalendar->VEVENT[0]->add('RDATE', '20240703T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024 then on July 3, 2024',
+            $this->service->generateOccurringString($eventReader),
+            ''
+        );
+
+        /** test patrial day recurring event in 2 days with three occurrences remaining */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RDATE', '20240701T080000');
+        $vCalendar->VEVENT[0]->add('RDATE', '20240703T080000');
+        $vCalendar->VEVENT[0]->add('RDATE', '20240705T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024 then on July 3, 2024 and July 5, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 2 days with three occurrences remaining'
+        );
+    }
+
+    public function testGenerateOccurringStringWithOneExdate(): void {
+
+        // construct l10n return(s)
+        $this->l10n->method('l')->willReturnCallback(
+            function ($v1, $v2, $v3) {
+                return match (true) {
+                    $v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 1, 2024',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240705T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 5, 2024',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240707T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 7, 2024'
+                };
+            }
+        );
+        $this->l10n->method('n')->willReturnMap([
+            // singular
+            [
+                'In a day on %1$s',
+                'In %n days on %1$s',
+                1,
+                ['July 1, 2024'],
+                'In a day on July 1, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s',
+                'In %n days on %1$s then on %2$s',
+                1,
+                ['July 1, 2024', 'July 5, 2024'],
+                'In a day on July 1, 2024 then on July 5, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s and %3$s',
+                'In %n days on %1$s then on %2$s and %3$s',
+                1,
+                ['July 1, 2024', 'July 5, 2024', 'July 7, 2024'],
+                'In a day on July 1, 2024 then on July 5, 2024 and July 7, 2024'
+            ],
+            // plural
+            [
+                'In a day on %1$s',
+                'In %n days on %1$s',
+                2,
+                ['July 1, 2024'],
+                'In 2 days on July 1, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s',
+                'In %n days on %1$s then on %2$s',
+                2,
+                ['July 1, 2024', 'July 5, 2024'],
+                'In 2 days on July 1, 2024 then on July 5, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s and %3$s',
+                'In %n days on %1$s then on %2$s and %3$s',
+                2,
+                ['July 1, 2024', 'July 5, 2024', 'July 7, 2024'],
+                'In 2 days on July 1, 2024 then on July 5, 2024 and July 7, 2024'
+            ],
+        ]);
+
+        // construct time factory return(s)
+        $this->timeFactory->method('getDateTime')->willReturnOnConsecutiveCalls(
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+        );
+
+        /** test patrial day recurring event in 1 day with single occurrence remaining and one exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=1');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 1 day with single occurrence remaining and one exception'
+        );
+
+        /** test patrial day recurring event in 1 day with two occurrences remaining and one exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=2');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 1 day with two occurrences remaining and one exception'
+        );
+
+        /** test patrial day recurring event in 1 day with three occurrences remaining and one exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=3');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024 then on July 5, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 1 day with three occurrences remaining and one exception'
+        );
+
+        /** test patrial day recurring event in 1 day with four occurrences remaining and one exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=4');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024 then on July 5, 2024 and July 7, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 1 day with four occurrences remaining and one exception'
+        );
+
+        /** test patrial day recurring event in 2 days with single occurrences remaining and one exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=1');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 2 days with single occurrences remaining and one exception'
+        );
+
+        /** test patrial day recurring event in 2 days with two occurrences remaining and one exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=2');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 2 days with two occurrences remaining and one exception'
+        );
+
+        /** test patrial day recurring event in 2 days with three occurrences remaining and one exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=3');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024 then on July 5, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 2 days with three occurrences remaining and one exception'
+        );
+
+        /** test patrial day recurring event in 2 days with four occurrences remaining and one exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=4');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024 then on July 5, 2024 and July 7, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 2 days with four occurrences remaining and one exception'
+        );
+    }
+
+    public function testGenerateOccurringStringWithTwoExdate(): void {
+
+        // construct l10n return(s)
+        $this->l10n->method('l')->willReturnCallback(
+            function ($v1, $v2, $v3) {
+                return match (true) {
+                    $v1 === 'date' && $v2 == (new \DateTime('20240701T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 1, 2024',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240705T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 5, 2024',
+                    $v1 === 'date' && $v2 == (new \DateTime('20240709T080000', (new \DateTimeZone('America/Toronto')))) && $v3 == ['width' => 'long'] => 'July 9, 2024'
+                };
+            }
+        );
+        $this->l10n->method('n')->willReturnMap([
+            // singular
+            [
+                'In a day on %1$s',
+                'In %n days on %1$s',
+                1,
+                ['July 1, 2024'],
+                'In a day on July 1, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s',
+                'In %n days on %1$s then on %2$s',
+                1,
+                ['July 1, 2024', 'July 5, 2024'],
+                'In a day on July 1, 2024 then on July 5, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s and %3$s',
+                'In %n days on %1$s then on %2$s and %3$s',
+                1,
+                ['July 1, 2024', 'July 5, 2024', 'July 9, 2024'],
+                'In a day on July 1, 2024 then on July 5, 2024 and July 9, 2024'
+            ],
+            // plural
+            [
+                'In a day on %1$s',
+                'In %n days on %1$s',
+                2,
+                ['July 1, 2024'],
+                'In 2 days on July 1, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s',
+                'In %n days on %1$s then on %2$s',
+                2,
+                ['July 1, 2024', 'July 5, 2024'],
+                'In 2 days on July 1, 2024 then on July 5, 2024'
+            ],
+            [
+                'In a day on %1$s then on %2$s and %3$s',
+                'In %n days on %1$s then on %2$s and %3$s',
+                2,
+                ['July 1, 2024', 'July 5, 2024', 'July 9, 2024'],
+                'In 2 days on July 1, 2024 then on July 5, 2024 and July 9, 2024'
+            ],
+        ]);
+
+        // construct time factory return(s)
+        $this->timeFactory->method('getDateTime')->willReturnOnConsecutiveCalls(
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+            (new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+        );
+
+        /** test patrial day recurring event in 1 day with single occurrence remaining and two exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=1');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 1 day with single occurrence remaining and two exception'
+        );
+
+        /** test patrial day recurring event in 1 day with two occurrences remaining and two exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=2');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 1 day with two occurrences remaining and two exception'
+        );
+
+        /** test patrial day recurring event in 1 day with three occurrences remaining and two exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=3');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024 then on July 5, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 1 day with three occurrences remaining and two exception'
+        );
+
+        /** test patrial day recurring event in 1 day with four occurrences remaining and two exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=5');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In a day on July 1, 2024 then on July 5, 2024 and July 9, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 1 day with four occurrences remaining and two exception'
+        );
+
+        /** test patrial day recurring event in 2 days with single occurrences remaining and two exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=1');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 2 days with single occurrences remaining and two exception'
+        );
+
+        /** test patrial day recurring event in 2 days with two occurrences remaining and two exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=2');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 2 days with two occurrences remaining and two exception'
+        );
+
+        /** test patrial day recurring event in 2 days with three occurrences remaining and two exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=3');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024 then on July 5, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 2 days with three occurrences remaining and two exception'
+        );
+
+        /** test patrial day recurring event in 2 days with five occurrences remaining and two exception */
+        $vCalendar = clone $this->vCalendar1a;
+        $vCalendar->VEVENT[0]->add('RRULE', 'FREQ=DAILY;INTERVAL=2;COUNT=5');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240703T080000');
+        $vCalendar->VEVENT[0]->add('EXDATE', '20240707T080000');
+        // construct event reader
+        $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+        // test output
+        $this->assertEquals(
+            'In 2 days on July 1, 2024 then on July 5, 2024 and July 9, 2024',
+            $this->service->generateOccurringString($eventReader),
+            'test patrial day recurring event in 2 days with five occurrences remaining and two exception'
+        );
+    }
 
 }

apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php

Indentation +733 added lines, -733 removed lines

@@ -36,737 +36,737 @@
 use Test\TestCase;
 
 class PluginTest extends TestCase {
-	private Plugin $plugin;
-	private Server&MockObject $server;
-	private IConfig&MockObject $config;
-	private LoggerInterface&MockObject $logger;
-	private DefaultCalendarValidator $calendarValidator;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->calendarValidator = new DefaultCalendarValidator();
-
-		$this->server = $this->createMock(Server::class);
-		$this->server->httpResponse = $this->createMock(ResponseInterface::class);
-		$this->server->xml = new Service();
-
-		$this->plugin = new Plugin($this->config, $this->logger, $this->calendarValidator);
-		$this->plugin->initialize($this->server);
-	}
-
-	public function testInitialize(): void {
-		$calls = [
-			// Sabre\CalDAV\Schedule\Plugin events
-			['method:POST', [$this->plugin, 'httpPost'], 100],
-			['propFind', [$this->plugin, 'propFind'], 100],
-			['propPatch', [$this->plugin, 'propPatch'], 100],
-			['calendarObjectChange', [$this->plugin, 'calendarObjectChange'], 100],
-			['beforeUnbind', [$this->plugin, 'beforeUnbind'], 100],
-			['schedule', [$this->plugin, 'scheduleLocalDelivery'], 100],
-			['getSupportedPrivilegeSet', [$this->plugin, 'getSupportedPrivilegeSet'], 100],
-			// OCA\DAV\CalDAV\Schedule\Plugin events
-			['propFind', [$this->plugin, 'propFindDefaultCalendarUrl'], 90],
-			['afterWriteContent', [$this->plugin, 'dispatchSchedulingResponses'], 100],
-			['afterCreateFile', [$this->plugin, 'dispatchSchedulingResponses'], 100],
-		];
-		$this->server->expects($this->exactly(count($calls)))
-			->method('on')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		$this->plugin->initialize($this->server);
-	}
-
-	public function testGetAddressesForPrincipal(): void {
-		$href = $this->createMock(Href::class);
-		$href
-			->expects($this->once())
-			->method('getHrefs')
-			->willReturn(['lukas@nextcloud.com', 'rullzer@nextcloud.com']);
-		$this->server
-			->expects($this->once())
-			->method('getProperties')
-			->with(
-				'MyPrincipal',
-				[
-					'{urn:ietf:params:xml:ns:caldav}calendar-user-address-set',
-				]
-			)
-			->willReturn([
-				'{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => $href
-			]);
-
-		$result = $this->invokePrivate($this->plugin, 'getAddressesForPrincipal', ['MyPrincipal']);
-		$this->assertSame(['lukas@nextcloud.com', 'rullzer@nextcloud.com'], $result);
-	}
-
-	public function testGetAddressesForPrincipalEmpty(): void {
-		$this->server
-			->expects($this->once())
-			->method('getProperties')
-			->with(
-				'MyPrincipal',
-				[
-					'{urn:ietf:params:xml:ns:caldav}calendar-user-address-set',
-				]
-			)
-			->willReturn(null);
-
-		$result = $this->invokePrivate($this->plugin, 'getAddressesForPrincipal', ['MyPrincipal']);
-		$this->assertSame([], $result);
-	}
-
-	public function testStripOffMailTo(): void {
-		$this->assertEquals('test@example.com', $this->invokePrivate($this->plugin, 'stripOffMailTo', ['test@example.com']));
-		$this->assertEquals('test@example.com', $this->invokePrivate($this->plugin, 'stripOffMailTo', ['mailto:test@example.com']));
-	}
-
-	public function testGetAttendeeRSVP(): void {
-		$property1 = $this->createMock(CalAddress::class);
-		$parameter1 = $this->createMock(Parameter::class);
-		$property1->expects($this->once())
-			->method('offsetGet')
-			->with('RSVP')
-			->willReturn($parameter1);
-		$parameter1->expects($this->once())
-			->method('getValue')
-			->with()
-			->willReturn('TRUE');
-
-		$property2 = $this->createMock(CalAddress::class);
-		$parameter2 = $this->createMock(Parameter::class);
-		$property2->expects($this->once())
-			->method('offsetGet')
-			->with('RSVP')
-			->willReturn($parameter2);
-		$parameter2->expects($this->once())
-			->method('getValue')
-			->with()
-			->willReturn('FALSE');
-
-		$property3 = $this->createMock(CalAddress::class);
-		$property3->expects($this->once())
-			->method('offsetGet')
-			->with('RSVP')
-			->willReturn(null);
-
-		$this->assertTrue($this->invokePrivate($this->plugin, 'getAttendeeRSVP', [$property1]));
-		$this->assertFalse($this->invokePrivate($this->plugin, 'getAttendeeRSVP', [$property2]));
-		$this->assertFalse($this->invokePrivate($this->plugin, 'getAttendeeRSVP', [$property3]));
-	}
-
-	public static function propFindDefaultCalendarUrlProvider(): array {
-		return [
-			[
-				'principals/users/myuser',
-				'calendars/myuser',
-				false,
-				CalDavBackend::PERSONAL_CALENDAR_URI,
-				CalDavBackend::PERSONAL_CALENDAR_NAME,
-				true
-			],
-			[
-				'principals/users/myuser',
-				'calendars/myuser',
-				false,
-				CalDavBackend::PERSONAL_CALENDAR_URI,
-				CalDavBackend::PERSONAL_CALENDAR_NAME,
-				true,
-				true
-			],
-			[
-				'principals/users/myuser',
-				'calendars/myuser',
-				false,
-				CalDavBackend::PERSONAL_CALENDAR_URI,
-				CalDavBackend::PERSONAL_CALENDAR_NAME,
-				false,
-				false,
-				true
-			],
-			[
-				'principals/users/myuser',
-				'calendars/myuser',
-				false,
-				CalDavBackend::PERSONAL_CALENDAR_URI,
-				CalDavBackend::PERSONAL_CALENDAR_NAME,
-				false
-			],
-			[
-				'principals/users/myuser',
-				null,
-				false,
-				CalDavBackend::PERSONAL_CALENDAR_URI,
-				CalDavBackend::PERSONAL_CALENDAR_NAME,
-				true
-			],
-			[
-				'principals/users/myuser',
-				'calendars/myuser',
-				false,
-				CalDavBackend::PERSONAL_CALENDAR_URI,
-				CalDavBackend::PERSONAL_CALENDAR_NAME,
-				true,
-				false,
-				false,
-				false,
-			],
-			[
-				'principals/users/myuser',
-				'calendars/myuser',
-				false,
-				'my_other_calendar',
-				'My Other Calendar',
-				true
-			],
-			[
-				'principals/calendar-resources',
-				'system-calendars/calendar-resources/myuser',
-				true,
-				CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI,
-				CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME,
-				true
-			],
-			[
-				'principals/calendar-resources',
-				'system-calendars/calendar-resources/myuser',
-				true,
-				CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI,
-				CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME,
-				false
-			],
-			[
-				'principals/something-else',
-				'calendars/whatever',
-				false,
-				CalDavBackend::PERSONAL_CALENDAR_URI,
-				CalDavBackend::PERSONAL_CALENDAR_NAME,
-				true
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider propFindDefaultCalendarUrlProvider
-	 */
-	public function testPropFindDefaultCalendarUrl(string $principalUri, ?string $calendarHome, bool $isResource, string $calendarUri, string $displayName, bool $exists, bool $deleted = false, bool $hasExistingCalendars = false, bool $propertiesForPath = true): void {
-		$propFind = new PropFind(
-			$principalUri,
-			[
-				Plugin::SCHEDULE_DEFAULT_CALENDAR_URL
-			],
-			0
-		);
-		/** @var IPrincipal&MockObject $node */
-		$node = $this->getMockBuilder(IPrincipal::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$node->expects($this->once())
-			->method('getPrincipalUrl')
-			->with()
-			->willReturn($principalUri);
-
-		$calDAVPlugin = $this->getMockBuilder(CalDAVPlugin::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$calDAVPlugin->expects($this->once())
-			->method('getCalendarHomeForPrincipal')
-			->willReturn($calendarHome);
-
-		$this->server->expects($this->once())
-			->method('getPlugin')
-			->with('caldav')
-			->willReturn($calDAVPlugin);
-		if (!$calendarHome) {
-			$this->plugin->propFindDefaultCalendarUrl($propFind, $node);
-
-			$this->assertNull($propFind->get(Plugin::SCHEDULE_DEFAULT_CALENDAR_URL));
-			return;
-		}
-		if ($principalUri === 'principals/something-else') {
-			$this->plugin->propFindDefaultCalendarUrl($propFind, $node);
-
-			$this->assertNull($propFind->get(Plugin::SCHEDULE_DEFAULT_CALENDAR_URL));
-			return;
-		}
-
-		if (!$isResource) {
-			$this->config->expects($this->once())
-				->method('getUserValue')
-				->with('myuser', 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI)
-				->willReturn($calendarUri);
-		}
-
-		$calendarHomeObject = $this->createMock(CalendarHome::class);
-		$calendarHomeObject->expects($this->once())
-			->method('childExists')
-			->with($calendarUri)
-			->willReturn($exists);
-
-		if ($exists) {
-			$calendar = $this->createMock(Calendar::class);
-			$calendar->expects($this->once())->method('isDeleted')->willReturn($deleted);
-			$calendarHomeObject->expects($deleted && !$hasExistingCalendars ? $this->exactly(2) : $this->once())->method('getChild')->with($calendarUri)->willReturn($calendar);
-		}
-
-		$calendarBackend = $this->createMock(CalDavBackend::class);
-		$calendarUri = $hasExistingCalendars ? 'custom' : $calendarUri;
-		$displayName = $hasExistingCalendars ? 'Custom Calendar' : $displayName;
-
-		$existingCalendars = $hasExistingCalendars ? [
-			new Calendar(
-				$calendarBackend,
-				['uri' => 'deleted', '{DAV:}displayname' => 'A deleted calendar', TrashbinPlugin::PROPERTY_DELETED_AT => 42],
-				$this->createMock(IL10N::class),
-				$this->config,
-				$this->createMock(LoggerInterface::class)
-			),
-			new Calendar(
-				$calendarBackend,
-				['uri' => $calendarUri, '{DAV:}displayname' => $displayName],
-				$this->createMock(IL10N::class),
-				$this->config,
-				$this->createMock(LoggerInterface::class)
-			)
-		] : [];
-
-		if (!$exists || $deleted) {
-			if (!$hasExistingCalendars) {
-				$calendarBackend->expects($this->once())
-					->method('createCalendar')
-					->with($principalUri, $calendarUri, [
-						'{DAV:}displayname' => $displayName,
-					]);
-
-				$calendarHomeObject->expects($this->exactly($deleted ? 2 : 1))
-					->method('getCalDAVBackend')
-					->with()
-					->willReturn($calendarBackend);
-			}
-
-			if (!$isResource) {
-				$calendarHomeObject->expects($this->once())
-					->method('getChildren')
-					->with()
-					->willReturn($existingCalendars);
-			}
-		}
-
-		/** @var Tree&MockObject $tree */
-		$tree = $this->createMock(Tree::class);
-		$tree->expects($this->once())
-			->method('getNodeForPath')
-			->with($calendarHome)
-			->willReturn($calendarHomeObject);
-		$this->server->tree = $tree;
-
-		$properties = $propertiesForPath ? [
-			['href' => '/remote.php/dav/' . $calendarHome . '/' . $calendarUri]
-		] : [];
-
-		$this->server->expects($this->once())
-			->method('getPropertiesForPath')
-			->with($calendarHome . '/' . $calendarUri, [], 1)
-			->willReturn($properties);
-
-		$this->plugin->propFindDefaultCalendarUrl($propFind, $node);
-
-		if (!$propertiesForPath) {
-			$this->assertNull($propFind->get(Plugin::SCHEDULE_DEFAULT_CALENDAR_URL));
-			return;
-		}
-
-		/** @var LocalHref $result */
-		$result = $propFind->get(Plugin::SCHEDULE_DEFAULT_CALENDAR_URL);
-		$this->assertEquals('/remote.php/dav/' . $calendarHome . '/' . $calendarUri, $result->getHref());
-	}
-
-	/**
-	 * Test Calendar Event Creation for Personal Calendar
-	 *
-	 * Should generate 2 messages for attendees User 2 and User External
-	 */
-	public function testCalendarObjectChangePersonalCalendarCreate(): void {
-
-		// define place holders
-		/** @var Message[] $iTipMessages */
-		$iTipMessages = [];
-		// construct calendar node
-		$calendarNode = new Calendar(
-			$this->createMock(BackendInterface::class),
-			[
-				'uri' => 'personal',
-				'principaluri' => 'principals/users/user1',
-				'{DAV:}displayname' => 'Calendar Shared By User1',
-			],
-			$this->createMock(IL10N::class),
-			$this->config,
-			$this->logger
-		);
-		// construct server request object
-		$request = new Request(
-			'PUT',
-			'/remote.php/dav/calendars/user1/personal/B0DC78AE-6DD7-47E3-80BE-89F23E6D5383.ics'
-		);
-		$request->setBaseUrl('/remote.php/dav/');
-		// construct server response object
-		$response = new Response();
-		// construct server tree object
-		$tree = $this->createMock(Tree::class);
-		$tree->expects($this->once())
-			->method('getNodeForPath')
-			->with('calendars/user1/personal')
-			->willReturn($calendarNode);
-		// construct server properties and returns
-		$this->server->httpRequest = $request;
-		$this->server->tree = $tree;
-		$this->server->expects($this->exactly(1))->method('getProperties')
-			->willReturnMap([
-				[
-					'principals/users/user1',
-					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'],
-					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => new LocalHref(
-						['mailto:user1@testing.local','/remote.php/dav/principals/users/user1/']
-					)]
-				]
-			]);
-		$this->server->expects($this->exactly(2))->method('emit')->willReturnCallback(
-			function (string $eventName, array $arguments = [], ?callable $continueCallBack = null) use (&$iTipMessages) {
-				$this->assertEquals('schedule', $eventName);
-				$this->assertCount(1, $arguments);
-				$iTipMessages[] = $arguments[0];
-				return true;
-			}
-		);
-		// construct calendar with a 1 hour event and same start/end time zones
-		$vCalendar = new VCalendar();
-		$vEvent = $vCalendar->add('VEVENT', []);
-		$vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
-		$vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('SUMMARY', 'Test Recurring Event');
-		$vEvent->add('ORGANIZER', 'mailto:user1@testing.local', ['CN' => 'User One']);
-		$vEvent->add('ATTENDEE', 'mailto:user2@testing.local', [
-			'CN' => 'User Two',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-		$vEvent->add('ATTENDEE', 'mailto:user@external.local', [
-			'CN' => 'User External',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-		// define flags
-		$newFlag = true;
-		$modifiedFlag = false;
-		// execute method
-		$this->plugin->calendarObjectChange(
-			$request,
-			$response,
-			$vCalendar,
-			'calendars/user1/personal',
-			$modifiedFlag,
-			$newFlag
-		);
-		// test for correct iTip message count
-		$this->assertCount(2, $iTipMessages);
-		// test for Sharer Attendee
-		$this->assertEquals('mailto:user1@testing.local', $iTipMessages[0]->sender);
-		$this->assertEquals('mailto:user2@testing.local', $iTipMessages[0]->recipient);
-		$this->assertTrue($iTipMessages[0]->significantChange);
-		// test for External Attendee
-		$this->assertEquals('mailto:user1@testing.local', $iTipMessages[1]->sender);
-		$this->assertEquals('mailto:user@external.local', $iTipMessages[1]->recipient);
-		$this->assertTrue($iTipMessages[1]->significantChange);
-
-	}
-
-	/**
-	 * Test Calendar Event Creation for Shared Calendar as Sharer/Owner
-	 *
-	 * Should generate 3 messages for attendees User 2 (Sharee), User 3 (Non-Sharee) and User External
-	 */
-	public function testCalendarObjectChangeSharedCalendarSharerCreate(): void {
-
-		// define place holders
-		/** @var Message[] $iTipMessages */
-		$iTipMessages = [];
-		// construct calendar node
-		$calendarNode = new Calendar(
-			$this->createMock(BackendInterface::class),
-			[
-				'uri' => 'calendar_shared_by_user1',
-				'principaluri' => 'principals/users/user1',
-				'{DAV:}displayname' => 'Calendar Shared By User1',
-				'{http://owncloud.org/ns}owner-principal' => 'principals/users/user1'
-			],
-			$this->createMock(IL10N::class),
-			$this->config,
-			$this->logger
-		);
-		// construct server request object
-		$request = new Request(
-			'PUT',
-			'/remote.php/dav/calendars/user1/calendar_shared_by_user1/B0DC78AE-6DD7-47E3-80BE-89F23E6D5383.ics'
-		);
-		$request->setBaseUrl('/remote.php/dav/');
-		// construct server response object
-		$response = new Response();
-		// construct server tree object
-		$tree = $this->createMock(Tree::class);
-		$tree->expects($this->once())
-			->method('getNodeForPath')
-			->with('calendars/user1/calendar_shared_by_user1')
-			->willReturn($calendarNode);
-		// construct server properties and returns
-		$this->server->httpRequest = $request;
-		$this->server->tree = $tree;
-		$this->server->expects($this->exactly(1))->method('getProperties')
-			->willReturnMap([
-				[
-					'principals/users/user1',
-					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'],
-					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => new LocalHref(
-						['mailto:user1@testing.local','/remote.php/dav/principals/users/user1/']
-					)]
-				]
-			]);
-		$this->server->expects($this->exactly(3))->method('emit')->willReturnCallback(
-			function (string $eventName, array $arguments = [], ?callable $continueCallBack = null) use (&$iTipMessages) {
-				$this->assertEquals('schedule', $eventName);
-				$this->assertCount(1, $arguments);
-				$iTipMessages[] = $arguments[0];
-				return true;
-			}
-		);
-		// construct calendar with a 1 hour event and same start/end time zones
-		$vCalendar = new VCalendar();
-		$vEvent = $vCalendar->add('VEVENT', []);
-		$vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
-		$vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('SUMMARY', 'Test Recurring Event');
-		$vEvent->add('ORGANIZER', 'mailto:user1@testing.local', ['CN' => 'User One']);
-		$vEvent->add('ATTENDEE', 'mailto:user2@testing.local', [
-			'CN' => 'User Two',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-		$vEvent->add('ATTENDEE', 'mailto:user3@testing.local', [
-			'CN' => 'User Three',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-		$vEvent->add('ATTENDEE', 'mailto:user@external.local', [
-			'CN' => 'User External',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-		// define flags
-		$newFlag = true;
-		$modifiedFlag = false;
-		// execute method
-		$this->plugin->calendarObjectChange(
-			$request,
-			$response,
-			$vCalendar,
-			'calendars/user1/calendar_shared_by_user1',
-			$modifiedFlag,
-			$newFlag
-		);
-		// test for correct iTip message count
-		$this->assertCount(3, $iTipMessages);
-		// test for Sharer Attendee
-		$this->assertEquals('mailto:user1@testing.local', $iTipMessages[0]->sender);
-		$this->assertEquals('mailto:user2@testing.local', $iTipMessages[0]->recipient);
-		$this->assertTrue($iTipMessages[0]->significantChange);
-		// test for Non Shee Attendee
-		$this->assertEquals('mailto:user1@testing.local', $iTipMessages[1]->sender);
-		$this->assertEquals('mailto:user3@testing.local', $iTipMessages[1]->recipient);
-		$this->assertTrue($iTipMessages[1]->significantChange);
-		// test for External Attendee
-		$this->assertEquals('mailto:user1@testing.local', $iTipMessages[2]->sender);
-		$this->assertEquals('mailto:user@external.local', $iTipMessages[2]->recipient);
-		$this->assertTrue($iTipMessages[2]->significantChange);
-
-	}
-
-	/**
-	 * Test Calendar Event Creation for Shared Calendar as Shree
-	 *
-	 * Should generate 3 messages for attendees User 1 (Sharer/Owner), User 3 (Non-Sharee) and User External
-	 */
-	public function testCalendarObjectChangeSharedCalendarShreeCreate(): void {
-
-		// define place holders
-		/** @var Message[] $iTipMessages */
-		$iTipMessages = [];
-		// construct calendar node
-		$calendarNode = new Calendar(
-			$this->createMock(BackendInterface::class),
-			[
-				'uri' => 'calendar_shared_by_user1',
-				'principaluri' => 'principals/users/user2',
-				'{DAV:}displayname' => 'Calendar Shared By User1',
-				'{http://owncloud.org/ns}owner-principal' => 'principals/users/user1'
-			],
-			$this->createMock(IL10N::class),
-			$this->config,
-			$this->logger
-		);
-		// construct server request object
-		$request = new Request(
-			'PUT',
-			'/remote.php/dav/calendars/user2/calendar_shared_by_user1/B0DC78AE-6DD7-47E3-80BE-89F23E6D5383.ics'
-		);
-		$request->setBaseUrl('/remote.php/dav/');
-		// construct server response object
-		$response = new Response();
-		// construct server tree object
-		$tree = $this->createMock(Tree::class);
-		$tree->expects($this->once())
-			->method('getNodeForPath')
-			->with('calendars/user2/calendar_shared_by_user1')
-			->willReturn($calendarNode);
-		// construct server properties and returns
-		$this->server->httpRequest = $request;
-		$this->server->tree = $tree;
-		$this->server->expects($this->exactly(2))->method('getProperties')
-			->willReturnMap([
-				[
-					'principals/users/user1',
-					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'],
-					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => new LocalHref(
-						['mailto:user1@testing.local','/remote.php/dav/principals/users/user1/']
-					)]
-				],
-				[
-					'principals/users/user2',
-					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'],
-					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => new LocalHref(
-						['mailto:user2@testing.local','/remote.php/dav/principals/users/user2/']
-					)]
-				]
-			]);
-		$this->server->expects($this->exactly(3))->method('emit')->willReturnCallback(
-			function (string $eventName, array $arguments = [], ?callable $continueCallBack = null) use (&$iTipMessages) {
-				$this->assertEquals('schedule', $eventName);
-				$this->assertCount(1, $arguments);
-				$iTipMessages[] = $arguments[0];
-				return true;
-			}
-		);
-		// construct calendar with a 1 hour event and same start/end time zones
-		$vCalendar = new VCalendar();
-		$vEvent = $vCalendar->add('VEVENT', []);
-		$vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
-		$vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('SUMMARY', 'Test Recurring Event');
-		$vEvent->add('ORGANIZER', 'mailto:user2@testing.local', ['CN' => 'User Two']);
-		$vEvent->add('ATTENDEE', 'mailto:user1@testing.local', [
-			'CN' => 'User One',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-		$vEvent->add('ATTENDEE', 'mailto:user3@testing.local', [
-			'CN' => 'User Three',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-		$vEvent->add('ATTENDEE', 'mailto:user@external.local', [
-			'CN' => 'User External',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-		// define flags
-		$newFlag = true;
-		$modifiedFlag = false;
-		// execute method
-		$this->plugin->calendarObjectChange(
-			$request,
-			$response,
-			$vCalendar,
-			'calendars/user2/calendar_shared_by_user1',
-			$modifiedFlag,
-			$newFlag
-		);
-		// test for correct iTip message count
-		$this->assertCount(3, $iTipMessages);
-		// test for Sharer Attendee
-		$this->assertEquals('mailto:user2@testing.local', $iTipMessages[0]->sender);
-		$this->assertEquals('mailto:user1@testing.local', $iTipMessages[0]->recipient);
-		$this->assertTrue($iTipMessages[0]->significantChange);
-		// test for Non Shee Attendee
-		$this->assertEquals('mailto:user2@testing.local', $iTipMessages[1]->sender);
-		$this->assertEquals('mailto:user3@testing.local', $iTipMessages[1]->recipient);
-		$this->assertTrue($iTipMessages[1]->significantChange);
-		// test for External Attendee
-		$this->assertEquals('mailto:user2@testing.local', $iTipMessages[2]->sender);
-		$this->assertEquals('mailto:user@external.local', $iTipMessages[2]->recipient);
-		$this->assertTrue($iTipMessages[2]->significantChange);
-
-	}
-
-	/**
-	 * Test Calendar Event Creation with iTip and iMip disabled
-	 *
-	 * Should generate 2 messages for attendees User 2 and User External
-	 */
-	public function testCalendarObjectChangeWithSchedulingDisabled(): void {
-		// construct server request
-		$request = new Request(
-			'PUT',
-			'/remote.php/dav/calendars/user1/personal/B0DC78AE-6DD7-47E3-80BE-89F23E6D5383.ics',
-			['x-nc-scheduling' => 'false']
-		);
-		$request->setBaseUrl('/remote.php/dav/');
-		// construct server response
-		$response = new Response();
-		// construct server tree
-		$tree = $this->createMock(Tree::class);
-		$tree->expects($this->never())
-			->method('getNodeForPath');
-		// construct server properties and returns
-		$this->server->httpRequest = $request;
-		$this->server->tree = $tree;
-		// construct empty calendar event
-		$vCalendar = new VCalendar();
-		$vEvent = $vCalendar->add('VEVENT', []);
-		// define flags
-		$newFlag = true;
-		$modifiedFlag = false;
-		// execute method
-		$this->plugin->calendarObjectChange(
-			$request,
-			$response,
-			$vCalendar,
-			'calendars/user1/personal',
-			$modifiedFlag,
-			$newFlag
-		);
-	}
+    private Plugin $plugin;
+    private Server&MockObject $server;
+    private IConfig&MockObject $config;
+    private LoggerInterface&MockObject $logger;
+    private DefaultCalendarValidator $calendarValidator;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->calendarValidator = new DefaultCalendarValidator();
+
+        $this->server = $this->createMock(Server::class);
+        $this->server->httpResponse = $this->createMock(ResponseInterface::class);
+        $this->server->xml = new Service();
+
+        $this->plugin = new Plugin($this->config, $this->logger, $this->calendarValidator);
+        $this->plugin->initialize($this->server);
+    }
+
+    public function testInitialize(): void {
+        $calls = [
+            // Sabre\CalDAV\Schedule\Plugin events
+            ['method:POST', [$this->plugin, 'httpPost'], 100],
+            ['propFind', [$this->plugin, 'propFind'], 100],
+            ['propPatch', [$this->plugin, 'propPatch'], 100],
+            ['calendarObjectChange', [$this->plugin, 'calendarObjectChange'], 100],
+            ['beforeUnbind', [$this->plugin, 'beforeUnbind'], 100],
+            ['schedule', [$this->plugin, 'scheduleLocalDelivery'], 100],
+            ['getSupportedPrivilegeSet', [$this->plugin, 'getSupportedPrivilegeSet'], 100],
+            // OCA\DAV\CalDAV\Schedule\Plugin events
+            ['propFind', [$this->plugin, 'propFindDefaultCalendarUrl'], 90],
+            ['afterWriteContent', [$this->plugin, 'dispatchSchedulingResponses'], 100],
+            ['afterCreateFile', [$this->plugin, 'dispatchSchedulingResponses'], 100],
+        ];
+        $this->server->expects($this->exactly(count($calls)))
+            ->method('on')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        $this->plugin->initialize($this->server);
+    }
+
+    public function testGetAddressesForPrincipal(): void {
+        $href = $this->createMock(Href::class);
+        $href
+            ->expects($this->once())
+            ->method('getHrefs')
+            ->willReturn(['lukas@nextcloud.com', 'rullzer@nextcloud.com']);
+        $this->server
+            ->expects($this->once())
+            ->method('getProperties')
+            ->with(
+                'MyPrincipal',
+                [
+                    '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set',
+                ]
+            )
+            ->willReturn([
+                '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => $href
+            ]);
+
+        $result = $this->invokePrivate($this->plugin, 'getAddressesForPrincipal', ['MyPrincipal']);
+        $this->assertSame(['lukas@nextcloud.com', 'rullzer@nextcloud.com'], $result);
+    }
+
+    public function testGetAddressesForPrincipalEmpty(): void {
+        $this->server
+            ->expects($this->once())
+            ->method('getProperties')
+            ->with(
+                'MyPrincipal',
+                [
+                    '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set',
+                ]
+            )
+            ->willReturn(null);
+
+        $result = $this->invokePrivate($this->plugin, 'getAddressesForPrincipal', ['MyPrincipal']);
+        $this->assertSame([], $result);
+    }
+
+    public function testStripOffMailTo(): void {
+        $this->assertEquals('test@example.com', $this->invokePrivate($this->plugin, 'stripOffMailTo', ['test@example.com']));
+        $this->assertEquals('test@example.com', $this->invokePrivate($this->plugin, 'stripOffMailTo', ['mailto:test@example.com']));
+    }
+
+    public function testGetAttendeeRSVP(): void {
+        $property1 = $this->createMock(CalAddress::class);
+        $parameter1 = $this->createMock(Parameter::class);
+        $property1->expects($this->once())
+            ->method('offsetGet')
+            ->with('RSVP')
+            ->willReturn($parameter1);
+        $parameter1->expects($this->once())
+            ->method('getValue')
+            ->with()
+            ->willReturn('TRUE');
+
+        $property2 = $this->createMock(CalAddress::class);
+        $parameter2 = $this->createMock(Parameter::class);
+        $property2->expects($this->once())
+            ->method('offsetGet')
+            ->with('RSVP')
+            ->willReturn($parameter2);
+        $parameter2->expects($this->once())
+            ->method('getValue')
+            ->with()
+            ->willReturn('FALSE');
+
+        $property3 = $this->createMock(CalAddress::class);
+        $property3->expects($this->once())
+            ->method('offsetGet')
+            ->with('RSVP')
+            ->willReturn(null);
+
+        $this->assertTrue($this->invokePrivate($this->plugin, 'getAttendeeRSVP', [$property1]));
+        $this->assertFalse($this->invokePrivate($this->plugin, 'getAttendeeRSVP', [$property2]));
+        $this->assertFalse($this->invokePrivate($this->plugin, 'getAttendeeRSVP', [$property3]));
+    }
+
+    public static function propFindDefaultCalendarUrlProvider(): array {
+        return [
+            [
+                'principals/users/myuser',
+                'calendars/myuser',
+                false,
+                CalDavBackend::PERSONAL_CALENDAR_URI,
+                CalDavBackend::PERSONAL_CALENDAR_NAME,
+                true
+            ],
+            [
+                'principals/users/myuser',
+                'calendars/myuser',
+                false,
+                CalDavBackend::PERSONAL_CALENDAR_URI,
+                CalDavBackend::PERSONAL_CALENDAR_NAME,
+                true,
+                true
+            ],
+            [
+                'principals/users/myuser',
+                'calendars/myuser',
+                false,
+                CalDavBackend::PERSONAL_CALENDAR_URI,
+                CalDavBackend::PERSONAL_CALENDAR_NAME,
+                false,
+                false,
+                true
+            ],
+            [
+                'principals/users/myuser',
+                'calendars/myuser',
+                false,
+                CalDavBackend::PERSONAL_CALENDAR_URI,
+                CalDavBackend::PERSONAL_CALENDAR_NAME,
+                false
+            ],
+            [
+                'principals/users/myuser',
+                null,
+                false,
+                CalDavBackend::PERSONAL_CALENDAR_URI,
+                CalDavBackend::PERSONAL_CALENDAR_NAME,
+                true
+            ],
+            [
+                'principals/users/myuser',
+                'calendars/myuser',
+                false,
+                CalDavBackend::PERSONAL_CALENDAR_URI,
+                CalDavBackend::PERSONAL_CALENDAR_NAME,
+                true,
+                false,
+                false,
+                false,
+            ],
+            [
+                'principals/users/myuser',
+                'calendars/myuser',
+                false,
+                'my_other_calendar',
+                'My Other Calendar',
+                true
+            ],
+            [
+                'principals/calendar-resources',
+                'system-calendars/calendar-resources/myuser',
+                true,
+                CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI,
+                CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME,
+                true
+            ],
+            [
+                'principals/calendar-resources',
+                'system-calendars/calendar-resources/myuser',
+                true,
+                CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI,
+                CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME,
+                false
+            ],
+            [
+                'principals/something-else',
+                'calendars/whatever',
+                false,
+                CalDavBackend::PERSONAL_CALENDAR_URI,
+                CalDavBackend::PERSONAL_CALENDAR_NAME,
+                true
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider propFindDefaultCalendarUrlProvider
+     */
+    public function testPropFindDefaultCalendarUrl(string $principalUri, ?string $calendarHome, bool $isResource, string $calendarUri, string $displayName, bool $exists, bool $deleted = false, bool $hasExistingCalendars = false, bool $propertiesForPath = true): void {
+        $propFind = new PropFind(
+            $principalUri,
+            [
+                Plugin::SCHEDULE_DEFAULT_CALENDAR_URL
+            ],
+            0
+        );
+        /** @var IPrincipal&MockObject $node */
+        $node = $this->getMockBuilder(IPrincipal::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $node->expects($this->once())
+            ->method('getPrincipalUrl')
+            ->with()
+            ->willReturn($principalUri);
+
+        $calDAVPlugin = $this->getMockBuilder(CalDAVPlugin::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $calDAVPlugin->expects($this->once())
+            ->method('getCalendarHomeForPrincipal')
+            ->willReturn($calendarHome);
+
+        $this->server->expects($this->once())
+            ->method('getPlugin')
+            ->with('caldav')
+            ->willReturn($calDAVPlugin);
+        if (!$calendarHome) {
+            $this->plugin->propFindDefaultCalendarUrl($propFind, $node);
+
+            $this->assertNull($propFind->get(Plugin::SCHEDULE_DEFAULT_CALENDAR_URL));
+            return;
+        }
+        if ($principalUri === 'principals/something-else') {
+            $this->plugin->propFindDefaultCalendarUrl($propFind, $node);
+
+            $this->assertNull($propFind->get(Plugin::SCHEDULE_DEFAULT_CALENDAR_URL));
+            return;
+        }
+
+        if (!$isResource) {
+            $this->config->expects($this->once())
+                ->method('getUserValue')
+                ->with('myuser', 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI)
+                ->willReturn($calendarUri);
+        }
+
+        $calendarHomeObject = $this->createMock(CalendarHome::class);
+        $calendarHomeObject->expects($this->once())
+            ->method('childExists')
+            ->with($calendarUri)
+            ->willReturn($exists);
+
+        if ($exists) {
+            $calendar = $this->createMock(Calendar::class);
+            $calendar->expects($this->once())->method('isDeleted')->willReturn($deleted);
+            $calendarHomeObject->expects($deleted && !$hasExistingCalendars ? $this->exactly(2) : $this->once())->method('getChild')->with($calendarUri)->willReturn($calendar);
+        }
+
+        $calendarBackend = $this->createMock(CalDavBackend::class);
+        $calendarUri = $hasExistingCalendars ? 'custom' : $calendarUri;
+        $displayName = $hasExistingCalendars ? 'Custom Calendar' : $displayName;
+
+        $existingCalendars = $hasExistingCalendars ? [
+            new Calendar(
+                $calendarBackend,
+                ['uri' => 'deleted', '{DAV:}displayname' => 'A deleted calendar', TrashbinPlugin::PROPERTY_DELETED_AT => 42],
+                $this->createMock(IL10N::class),
+                $this->config,
+                $this->createMock(LoggerInterface::class)
+            ),
+            new Calendar(
+                $calendarBackend,
+                ['uri' => $calendarUri, '{DAV:}displayname' => $displayName],
+                $this->createMock(IL10N::class),
+                $this->config,
+                $this->createMock(LoggerInterface::class)
+            )
+        ] : [];
+
+        if (!$exists || $deleted) {
+            if (!$hasExistingCalendars) {
+                $calendarBackend->expects($this->once())
+                    ->method('createCalendar')
+                    ->with($principalUri, $calendarUri, [
+                        '{DAV:}displayname' => $displayName,
+                    ]);
+
+                $calendarHomeObject->expects($this->exactly($deleted ? 2 : 1))
+                    ->method('getCalDAVBackend')
+                    ->with()
+                    ->willReturn($calendarBackend);
+            }
+
+            if (!$isResource) {
+                $calendarHomeObject->expects($this->once())
+                    ->method('getChildren')
+                    ->with()
+                    ->willReturn($existingCalendars);
+            }
+        }
+
+        /** @var Tree&MockObject $tree */
+        $tree = $this->createMock(Tree::class);
+        $tree->expects($this->once())
+            ->method('getNodeForPath')
+            ->with($calendarHome)
+            ->willReturn($calendarHomeObject);
+        $this->server->tree = $tree;
+
+        $properties = $propertiesForPath ? [
+            ['href' => '/remote.php/dav/' . $calendarHome . '/' . $calendarUri]
+        ] : [];
+
+        $this->server->expects($this->once())
+            ->method('getPropertiesForPath')
+            ->with($calendarHome . '/' . $calendarUri, [], 1)
+            ->willReturn($properties);
+
+        $this->plugin->propFindDefaultCalendarUrl($propFind, $node);
+
+        if (!$propertiesForPath) {
+            $this->assertNull($propFind->get(Plugin::SCHEDULE_DEFAULT_CALENDAR_URL));
+            return;
+        }
+
+        /** @var LocalHref $result */
+        $result = $propFind->get(Plugin::SCHEDULE_DEFAULT_CALENDAR_URL);
+        $this->assertEquals('/remote.php/dav/' . $calendarHome . '/' . $calendarUri, $result->getHref());
+    }
+
+    /**
+     * Test Calendar Event Creation for Personal Calendar
+     *
+     * Should generate 2 messages for attendees User 2 and User External
+     */
+    public function testCalendarObjectChangePersonalCalendarCreate(): void {
+
+        // define place holders
+        /** @var Message[] $iTipMessages */
+        $iTipMessages = [];
+        // construct calendar node
+        $calendarNode = new Calendar(
+            $this->createMock(BackendInterface::class),
+            [
+                'uri' => 'personal',
+                'principaluri' => 'principals/users/user1',
+                '{DAV:}displayname' => 'Calendar Shared By User1',
+            ],
+            $this->createMock(IL10N::class),
+            $this->config,
+            $this->logger
+        );
+        // construct server request object
+        $request = new Request(
+            'PUT',
+            '/remote.php/dav/calendars/user1/personal/B0DC78AE-6DD7-47E3-80BE-89F23E6D5383.ics'
+        );
+        $request->setBaseUrl('/remote.php/dav/');
+        // construct server response object
+        $response = new Response();
+        // construct server tree object
+        $tree = $this->createMock(Tree::class);
+        $tree->expects($this->once())
+            ->method('getNodeForPath')
+            ->with('calendars/user1/personal')
+            ->willReturn($calendarNode);
+        // construct server properties and returns
+        $this->server->httpRequest = $request;
+        $this->server->tree = $tree;
+        $this->server->expects($this->exactly(1))->method('getProperties')
+            ->willReturnMap([
+                [
+                    'principals/users/user1',
+                    ['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'],
+                    ['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => new LocalHref(
+                        ['mailto:user1@testing.local','/remote.php/dav/principals/users/user1/']
+                    )]
+                ]
+            ]);
+        $this->server->expects($this->exactly(2))->method('emit')->willReturnCallback(
+            function (string $eventName, array $arguments = [], ?callable $continueCallBack = null) use (&$iTipMessages) {
+                $this->assertEquals('schedule', $eventName);
+                $this->assertCount(1, $arguments);
+                $iTipMessages[] = $arguments[0];
+                return true;
+            }
+        );
+        // construct calendar with a 1 hour event and same start/end time zones
+        $vCalendar = new VCalendar();
+        $vEvent = $vCalendar->add('VEVENT', []);
+        $vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
+        $vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('SUMMARY', 'Test Recurring Event');
+        $vEvent->add('ORGANIZER', 'mailto:user1@testing.local', ['CN' => 'User One']);
+        $vEvent->add('ATTENDEE', 'mailto:user2@testing.local', [
+            'CN' => 'User Two',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+        $vEvent->add('ATTENDEE', 'mailto:user@external.local', [
+            'CN' => 'User External',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+        // define flags
+        $newFlag = true;
+        $modifiedFlag = false;
+        // execute method
+        $this->plugin->calendarObjectChange(
+            $request,
+            $response,
+            $vCalendar,
+            'calendars/user1/personal',
+            $modifiedFlag,
+            $newFlag
+        );
+        // test for correct iTip message count
+        $this->assertCount(2, $iTipMessages);
+        // test for Sharer Attendee
+        $this->assertEquals('mailto:user1@testing.local', $iTipMessages[0]->sender);
+        $this->assertEquals('mailto:user2@testing.local', $iTipMessages[0]->recipient);
+        $this->assertTrue($iTipMessages[0]->significantChange);
+        // test for External Attendee
+        $this->assertEquals('mailto:user1@testing.local', $iTipMessages[1]->sender);
+        $this->assertEquals('mailto:user@external.local', $iTipMessages[1]->recipient);
+        $this->assertTrue($iTipMessages[1]->significantChange);
+
+    }
+
+    /**
+     * Test Calendar Event Creation for Shared Calendar as Sharer/Owner
+     *
+     * Should generate 3 messages for attendees User 2 (Sharee), User 3 (Non-Sharee) and User External
+     */
+    public function testCalendarObjectChangeSharedCalendarSharerCreate(): void {
+
+        // define place holders
+        /** @var Message[] $iTipMessages */
+        $iTipMessages = [];
+        // construct calendar node
+        $calendarNode = new Calendar(
+            $this->createMock(BackendInterface::class),
+            [
+                'uri' => 'calendar_shared_by_user1',
+                'principaluri' => 'principals/users/user1',
+                '{DAV:}displayname' => 'Calendar Shared By User1',
+                '{http://owncloud.org/ns}owner-principal' => 'principals/users/user1'
+            ],
+            $this->createMock(IL10N::class),
+            $this->config,
+            $this->logger
+        );
+        // construct server request object
+        $request = new Request(
+            'PUT',
+            '/remote.php/dav/calendars/user1/calendar_shared_by_user1/B0DC78AE-6DD7-47E3-80BE-89F23E6D5383.ics'
+        );
+        $request->setBaseUrl('/remote.php/dav/');
+        // construct server response object
+        $response = new Response();
+        // construct server tree object
+        $tree = $this->createMock(Tree::class);
+        $tree->expects($this->once())
+            ->method('getNodeForPath')
+            ->with('calendars/user1/calendar_shared_by_user1')
+            ->willReturn($calendarNode);
+        // construct server properties and returns
+        $this->server->httpRequest = $request;
+        $this->server->tree = $tree;
+        $this->server->expects($this->exactly(1))->method('getProperties')
+            ->willReturnMap([
+                [
+                    'principals/users/user1',
+                    ['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'],
+                    ['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => new LocalHref(
+                        ['mailto:user1@testing.local','/remote.php/dav/principals/users/user1/']
+                    )]
+                ]
+            ]);
+        $this->server->expects($this->exactly(3))->method('emit')->willReturnCallback(
+            function (string $eventName, array $arguments = [], ?callable $continueCallBack = null) use (&$iTipMessages) {
+                $this->assertEquals('schedule', $eventName);
+                $this->assertCount(1, $arguments);
+                $iTipMessages[] = $arguments[0];
+                return true;
+            }
+        );
+        // construct calendar with a 1 hour event and same start/end time zones
+        $vCalendar = new VCalendar();
+        $vEvent = $vCalendar->add('VEVENT', []);
+        $vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
+        $vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('SUMMARY', 'Test Recurring Event');
+        $vEvent->add('ORGANIZER', 'mailto:user1@testing.local', ['CN' => 'User One']);
+        $vEvent->add('ATTENDEE', 'mailto:user2@testing.local', [
+            'CN' => 'User Two',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+        $vEvent->add('ATTENDEE', 'mailto:user3@testing.local', [
+            'CN' => 'User Three',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+        $vEvent->add('ATTENDEE', 'mailto:user@external.local', [
+            'CN' => 'User External',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+        // define flags
+        $newFlag = true;
+        $modifiedFlag = false;
+        // execute method
+        $this->plugin->calendarObjectChange(
+            $request,
+            $response,
+            $vCalendar,
+            'calendars/user1/calendar_shared_by_user1',
+            $modifiedFlag,
+            $newFlag
+        );
+        // test for correct iTip message count
+        $this->assertCount(3, $iTipMessages);
+        // test for Sharer Attendee
+        $this->assertEquals('mailto:user1@testing.local', $iTipMessages[0]->sender);
+        $this->assertEquals('mailto:user2@testing.local', $iTipMessages[0]->recipient);
+        $this->assertTrue($iTipMessages[0]->significantChange);
+        // test for Non Shee Attendee
+        $this->assertEquals('mailto:user1@testing.local', $iTipMessages[1]->sender);
+        $this->assertEquals('mailto:user3@testing.local', $iTipMessages[1]->recipient);
+        $this->assertTrue($iTipMessages[1]->significantChange);
+        // test for External Attendee
+        $this->assertEquals('mailto:user1@testing.local', $iTipMessages[2]->sender);
+        $this->assertEquals('mailto:user@external.local', $iTipMessages[2]->recipient);
+        $this->assertTrue($iTipMessages[2]->significantChange);
+
+    }
+
+    /**
+     * Test Calendar Event Creation for Shared Calendar as Shree
+     *
+     * Should generate 3 messages for attendees User 1 (Sharer/Owner), User 3 (Non-Sharee) and User External
+     */
+    public function testCalendarObjectChangeSharedCalendarShreeCreate(): void {
+
+        // define place holders
+        /** @var Message[] $iTipMessages */
+        $iTipMessages = [];
+        // construct calendar node
+        $calendarNode = new Calendar(
+            $this->createMock(BackendInterface::class),
+            [
+                'uri' => 'calendar_shared_by_user1',
+                'principaluri' => 'principals/users/user2',
+                '{DAV:}displayname' => 'Calendar Shared By User1',
+                '{http://owncloud.org/ns}owner-principal' => 'principals/users/user1'
+            ],
+            $this->createMock(IL10N::class),
+            $this->config,
+            $this->logger
+        );
+        // construct server request object
+        $request = new Request(
+            'PUT',
+            '/remote.php/dav/calendars/user2/calendar_shared_by_user1/B0DC78AE-6DD7-47E3-80BE-89F23E6D5383.ics'
+        );
+        $request->setBaseUrl('/remote.php/dav/');
+        // construct server response object
+        $response = new Response();
+        // construct server tree object
+        $tree = $this->createMock(Tree::class);
+        $tree->expects($this->once())
+            ->method('getNodeForPath')
+            ->with('calendars/user2/calendar_shared_by_user1')
+            ->willReturn($calendarNode);
+        // construct server properties and returns
+        $this->server->httpRequest = $request;
+        $this->server->tree = $tree;
+        $this->server->expects($this->exactly(2))->method('getProperties')
+            ->willReturnMap([
+                [
+                    'principals/users/user1',
+                    ['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'],
+                    ['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => new LocalHref(
+                        ['mailto:user1@testing.local','/remote.php/dav/principals/users/user1/']
+                    )]
+                ],
+                [
+                    'principals/users/user2',
+                    ['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'],
+                    ['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => new LocalHref(
+                        ['mailto:user2@testing.local','/remote.php/dav/principals/users/user2/']
+                    )]
+                ]
+            ]);
+        $this->server->expects($this->exactly(3))->method('emit')->willReturnCallback(
+            function (string $eventName, array $arguments = [], ?callable $continueCallBack = null) use (&$iTipMessages) {
+                $this->assertEquals('schedule', $eventName);
+                $this->assertCount(1, $arguments);
+                $iTipMessages[] = $arguments[0];
+                return true;
+            }
+        );
+        // construct calendar with a 1 hour event and same start/end time zones
+        $vCalendar = new VCalendar();
+        $vEvent = $vCalendar->add('VEVENT', []);
+        $vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
+        $vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('SUMMARY', 'Test Recurring Event');
+        $vEvent->add('ORGANIZER', 'mailto:user2@testing.local', ['CN' => 'User Two']);
+        $vEvent->add('ATTENDEE', 'mailto:user1@testing.local', [
+            'CN' => 'User One',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+        $vEvent->add('ATTENDEE', 'mailto:user3@testing.local', [
+            'CN' => 'User Three',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+        $vEvent->add('ATTENDEE', 'mailto:user@external.local', [
+            'CN' => 'User External',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+        // define flags
+        $newFlag = true;
+        $modifiedFlag = false;
+        // execute method
+        $this->plugin->calendarObjectChange(
+            $request,
+            $response,
+            $vCalendar,
+            'calendars/user2/calendar_shared_by_user1',
+            $modifiedFlag,
+            $newFlag
+        );
+        // test for correct iTip message count
+        $this->assertCount(3, $iTipMessages);
+        // test for Sharer Attendee
+        $this->assertEquals('mailto:user2@testing.local', $iTipMessages[0]->sender);
+        $this->assertEquals('mailto:user1@testing.local', $iTipMessages[0]->recipient);
+        $this->assertTrue($iTipMessages[0]->significantChange);
+        // test for Non Shee Attendee
+        $this->assertEquals('mailto:user2@testing.local', $iTipMessages[1]->sender);
+        $this->assertEquals('mailto:user3@testing.local', $iTipMessages[1]->recipient);
+        $this->assertTrue($iTipMessages[1]->significantChange);
+        // test for External Attendee
+        $this->assertEquals('mailto:user2@testing.local', $iTipMessages[2]->sender);
+        $this->assertEquals('mailto:user@external.local', $iTipMessages[2]->recipient);
+        $this->assertTrue($iTipMessages[2]->significantChange);
+
+    }
+
+    /**
+     * Test Calendar Event Creation with iTip and iMip disabled
+     *
+     * Should generate 2 messages for attendees User 2 and User External
+     */
+    public function testCalendarObjectChangeWithSchedulingDisabled(): void {
+        // construct server request
+        $request = new Request(
+            'PUT',
+            '/remote.php/dav/calendars/user1/personal/B0DC78AE-6DD7-47E3-80BE-89F23E6D5383.ics',
+            ['x-nc-scheduling' => 'false']
+        );
+        $request->setBaseUrl('/remote.php/dav/');
+        // construct server response
+        $response = new Response();
+        // construct server tree
+        $tree = $this->createMock(Tree::class);
+        $tree->expects($this->never())
+            ->method('getNodeForPath');
+        // construct server properties and returns
+        $this->server->httpRequest = $request;
+        $this->server->tree = $tree;
+        // construct empty calendar event
+        $vCalendar = new VCalendar();
+        $vEvent = $vCalendar->add('VEVENT', []);
+        // define flags
+        $newFlag = true;
+        $modifiedFlag = false;
+        // execute method
+        $this->plugin->calendarObjectChange(
+            $request,
+            $response,
+            $vCalendar,
+            'calendars/user1/personal',
+            $modifiedFlag,
+            $newFlag
+        );
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -74,7 +74,7 @@ 
 		];
 		$this->server->expects($this->exactly(count($calls)))
 			->method('on')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});
@@ -368,12 +368,12 @@ 
 		$this->server->tree = $tree;
 
 		$properties = $propertiesForPath ? [
-			['href' => '/remote.php/dav/' . $calendarHome . '/' . $calendarUri]
+			['href' => '/remote.php/dav/'.$calendarHome.'/'.$calendarUri]
 		] : [];
 
 		$this->server->expects($this->once())
 			->method('getPropertiesForPath')
-			->with($calendarHome . '/' . $calendarUri, [], 1)
+			->with($calendarHome.'/'.$calendarUri, [], 1)
 			->willReturn($properties);
 
 		$this->plugin->propFindDefaultCalendarUrl($propFind, $node);
@@ -385,7 +385,7 @@ 
 
 		/** @var LocalHref $result */
 		$result = $propFind->get(Plugin::SCHEDULE_DEFAULT_CALENDAR_URL);
-		$this->assertEquals('/remote.php/dav/' . $calendarHome . '/' . $calendarUri, $result->getHref());
+		$this->assertEquals('/remote.php/dav/'.$calendarHome.'/'.$calendarUri, $result->getHref());
 	}
 
 	/**
@@ -433,12 +433,12 @@ 
 					'principals/users/user1',
 					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'],
 					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => new LocalHref(
-						['mailto:user1@testing.local','/remote.php/dav/principals/users/user1/']
+						['mailto:user1@testing.local', '/remote.php/dav/principals/users/user1/']
 					)]
 				]
 			]);
 		$this->server->expects($this->exactly(2))->method('emit')->willReturnCallback(
-			function (string $eventName, array $arguments = [], ?callable $continueCallBack = null) use (&$iTipMessages) {
+			function(string $eventName, array $arguments = [], ?callable $continueCallBack = null) use (&$iTipMessages) {
 				$this->assertEquals('schedule', $eventName);
 				$this->assertCount(1, $arguments);
 				$iTipMessages[] = $arguments[0];
@@ -538,12 +538,12 @@ 
 					'principals/users/user1',
 					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'],
 					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => new LocalHref(
-						['mailto:user1@testing.local','/remote.php/dav/principals/users/user1/']
+						['mailto:user1@testing.local', '/remote.php/dav/principals/users/user1/']
 					)]
 				]
 			]);
 		$this->server->expects($this->exactly(3))->method('emit')->willReturnCallback(
-			function (string $eventName, array $arguments = [], ?callable $continueCallBack = null) use (&$iTipMessages) {
+			function(string $eventName, array $arguments = [], ?callable $continueCallBack = null) use (&$iTipMessages) {
 				$this->assertEquals('schedule', $eventName);
 				$this->assertCount(1, $arguments);
 				$iTipMessages[] = $arguments[0];
@@ -654,19 +654,19 @@ 
 					'principals/users/user1',
 					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'],
 					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => new LocalHref(
-						['mailto:user1@testing.local','/remote.php/dav/principals/users/user1/']
+						['mailto:user1@testing.local', '/remote.php/dav/principals/users/user1/']
 					)]
 				],
 				[
 					'principals/users/user2',
 					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'],
 					['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => new LocalHref(
-						['mailto:user2@testing.local','/remote.php/dav/principals/users/user2/']
+						['mailto:user2@testing.local', '/remote.php/dav/principals/users/user2/']
 					)]
 				]
 			]);
 		$this->server->expects($this->exactly(3))->method('emit')->willReturnCallback(
-			function (string $eventName, array $arguments = [], ?callable $continueCallBack = null) use (&$iTipMessages) {
+			function(string $eventName, array $arguments = [], ?callable $continueCallBack = null) use (&$iTipMessages) {
 				$this->assertEquals('schedule', $eventName);
 				$this->assertCount(1, $arguments);
 				$iTipMessages[] = $arguments[0];

apps/dav/tests/unit/CalDAV/Validation/CalDavValidatePluginTest.php

Indentation +43 added lines, -43 removed lines

@@ -18,56 +18,56 @@
 use Test\TestCase;
 
 class CalDavValidatePluginTest extends TestCase {
-	private IAppConfig&MockObject $config;
-	private RequestInterface&MockObject $request;
-	private ResponseInterface&MockObject $response;
+    private IAppConfig&MockObject $config;
+    private RequestInterface&MockObject $request;
+    private ResponseInterface&MockObject $response;
 
-	private CalDavValidatePlugin $plugin;
+    private CalDavValidatePlugin $plugin;
 
-	protected function setUp(): void {
-		parent::setUp();
-		// construct mock objects
-		$this->config = $this->createMock(IAppConfig::class);
-		$this->request = $this->createMock(RequestInterface::class);
-		$this->response = $this->createMock(ResponseInterface::class);
-		$this->plugin = new CalDavValidatePlugin(
-			$this->config,
-		);
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        // construct mock objects
+        $this->config = $this->createMock(IAppConfig::class);
+        $this->request = $this->createMock(RequestInterface::class);
+        $this->response = $this->createMock(ResponseInterface::class);
+        $this->plugin = new CalDavValidatePlugin(
+            $this->config,
+        );
+    }
 
-	public function testPutSizeLessThenLimit(): void {
+    public function testPutSizeLessThenLimit(): void {
 
-		// construct method responses
-		$this->config
-			->method('getValueInt')
-			->with('dav', 'event_size_limit', 10485760)
-			->willReturn(10485760);
-		$this->request
-			->method('getRawServerValue')
-			->with('CONTENT_LENGTH')
-			->willReturn('1024');
-		// test condition
-		$this->assertTrue(
-			$this->plugin->beforePut($this->request, $this->response)
-		);
+        // construct method responses
+        $this->config
+            ->method('getValueInt')
+            ->with('dav', 'event_size_limit', 10485760)
+            ->willReturn(10485760);
+        $this->request
+            ->method('getRawServerValue')
+            ->with('CONTENT_LENGTH')
+            ->willReturn('1024');
+        // test condition
+        $this->assertTrue(
+            $this->plugin->beforePut($this->request, $this->response)
+        );
 
-	}
+    }
 
-	public function testPutSizeMoreThenLimit(): void {
+    public function testPutSizeMoreThenLimit(): void {
 
-		// construct method responses
-		$this->config
-			->method('getValueInt')
-			->with('dav', 'event_size_limit', 10485760)
-			->willReturn(10485760);
-		$this->request
-			->method('getRawServerValue')
-			->with('CONTENT_LENGTH')
-			->willReturn('16242880');
-		$this->expectException(Forbidden::class);
-		// test condition
-		$this->plugin->beforePut($this->request, $this->response);
+        // construct method responses
+        $this->config
+            ->method('getValueInt')
+            ->with('dav', 'event_size_limit', 10485760)
+            ->willReturn(10485760);
+        $this->request
+            ->method('getRawServerValue')
+            ->with('CONTENT_LENGTH')
+            ->willReturn('16242880');
+        $this->expectException(Forbidden::class);
+        // test condition
+        $this->plugin->beforePut($this->request, $this->response);
 
-	}
+    }
 
 }

apps/dav/tests/unit/CalDAV/CalDavBackendTest.php

Indentation +1125 added lines, -1125 removed lines

@@ -32,128 +32,128 @@ 
  * @group DB
  */
 class CalDavBackendTest extends AbstractCalDavBackend {
-	public function testCalendarOperations(): void {
-		$calendarId = $this->createTestCalendar();
-
-		// update its display name
-		$patch = new PropPatch([
-			'{DAV:}displayname' => 'Unit test',
-			'{urn:ietf:params:xml:ns:caldav}calendar-description' => 'Calendar used for unit testing'
-		]);
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->updateCalendar($calendarId, $patch);
-		$patch->commit();
-		$this->assertEquals(1, $this->backend->getCalendarsForUserCount(self::UNIT_TEST_USER));
-		$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
-		$this->assertCount(1, $calendars);
-		$this->assertEquals('Unit test', $calendars[0]['{DAV:}displayname']);
-		$this->assertEquals('Calendar used for unit testing', $calendars[0]['{urn:ietf:params:xml:ns:caldav}calendar-description']);
-		$this->assertEquals('User\'s displayname', $calendars[0]['{http://nextcloud.com/ns}owner-displayname']);
-
-		// delete the address book
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->deleteCalendar($calendars[0]['id'], true);
-		$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
-		self::assertEmpty($calendars);
-	}
-
-	public static function providesSharingData(): array {
-		return [
-			[true, true, true, false, [
-				[
-					'href' => 'principal:' . self::UNIT_TEST_USER1,
-					'readOnly' => false
-				],
-				[
-					'href' => 'principal:' . self::UNIT_TEST_GROUP,
-					'readOnly' => true
-				]
-			], [
-				self::UNIT_TEST_USER1,
-				self::UNIT_TEST_GROUP,
-			]],
-			[true, true, true, false, [
-				[
-					'href' => 'principal:' . self::UNIT_TEST_GROUP,
-					'readOnly' => true,
-				],
-				[
-					'href' => 'principal:' . self::UNIT_TEST_GROUP2,
-					'readOnly' => false,
-				],
-			], [
-				self::UNIT_TEST_GROUP,
-				self::UNIT_TEST_GROUP2,
-			]],
-			[true, true, true, true, [
-				[
-					'href' => 'principal:' . self::UNIT_TEST_GROUP,
-					'readOnly' => false,
-				],
-				[
-					'href' => 'principal:' . self::UNIT_TEST_GROUP2,
-					'readOnly' => true,
-				],
-			], [
-				self::UNIT_TEST_GROUP,
-				self::UNIT_TEST_GROUP2,
-			]],
-			[true, false, false, false, [
-				[
-					'href' => 'principal:' . self::UNIT_TEST_USER1,
-					'readOnly' => true
-				],
-			], [
-				self::UNIT_TEST_USER1,
-			]],
-
-		];
-	}
-
-	/**
-	 * @dataProvider providesSharingData
-	 */
-	public function testCalendarSharing($userCanRead, $userCanWrite, $groupCanRead, $groupCanWrite, $add, $principals): void {
-		$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
-		$config = $this->createMock(IConfig::class);
-
-		$l10n = $this->createMock(IL10N::class);
-		$l10n->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
-				return vsprintf($text, $parameters);
-			});
-
-		$this->userManager->expects($this->any())
-			->method('userExists')
-			->willReturn(true);
-		$this->groupManager->expects($this->any())
-			->method('groupExists')
-			->willReturn(true);
-		$this->principal->expects(self::atLeastOnce())
-			->method('findByUri')
-			->willReturnOnConsecutiveCalls(...$principals);
-
-		$calendarId = $this->createTestCalendar();
-		$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
-		$this->assertCount(1, $calendars);
-		$calendar = new Calendar($this->backend, $calendars[0], $l10n, $config, $logger);
-		$this->backend->updateShares($calendar, $add, []);
-		$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1);
-		$this->assertCount(1, $calendars);
-		$calendar = new Calendar($this->backend, $calendars[0], $l10n, $config, $logger);
-		$acl = $calendar->getACL();
-		$this->assertAcl(self::UNIT_TEST_USER, '{DAV:}read', $acl);
-		$this->assertAcl(self::UNIT_TEST_USER, '{DAV:}write', $acl);
-		$this->assertAccess($userCanRead, self::UNIT_TEST_USER1, '{DAV:}read', $acl);
-		$this->assertAccess($userCanWrite, self::UNIT_TEST_USER1, '{DAV:}write', $acl);
-		$this->assertEquals(self::UNIT_TEST_USER, $calendar->getOwner());
-
-		// test acls on the child
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<'EOD'
+    public function testCalendarOperations(): void {
+        $calendarId = $this->createTestCalendar();
+
+        // update its display name
+        $patch = new PropPatch([
+            '{DAV:}displayname' => 'Unit test',
+            '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'Calendar used for unit testing'
+        ]);
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->updateCalendar($calendarId, $patch);
+        $patch->commit();
+        $this->assertEquals(1, $this->backend->getCalendarsForUserCount(self::UNIT_TEST_USER));
+        $calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
+        $this->assertCount(1, $calendars);
+        $this->assertEquals('Unit test', $calendars[0]['{DAV:}displayname']);
+        $this->assertEquals('Calendar used for unit testing', $calendars[0]['{urn:ietf:params:xml:ns:caldav}calendar-description']);
+        $this->assertEquals('User\'s displayname', $calendars[0]['{http://nextcloud.com/ns}owner-displayname']);
+
+        // delete the address book
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->deleteCalendar($calendars[0]['id'], true);
+        $calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
+        self::assertEmpty($calendars);
+    }
+
+    public static function providesSharingData(): array {
+        return [
+            [true, true, true, false, [
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_USER1,
+                    'readOnly' => false
+                ],
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_GROUP,
+                    'readOnly' => true
+                ]
+            ], [
+                self::UNIT_TEST_USER1,
+                self::UNIT_TEST_GROUP,
+            ]],
+            [true, true, true, false, [
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_GROUP,
+                    'readOnly' => true,
+                ],
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_GROUP2,
+                    'readOnly' => false,
+                ],
+            ], [
+                self::UNIT_TEST_GROUP,
+                self::UNIT_TEST_GROUP2,
+            ]],
+            [true, true, true, true, [
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_GROUP,
+                    'readOnly' => false,
+                ],
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_GROUP2,
+                    'readOnly' => true,
+                ],
+            ], [
+                self::UNIT_TEST_GROUP,
+                self::UNIT_TEST_GROUP2,
+            ]],
+            [true, false, false, false, [
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_USER1,
+                    'readOnly' => true
+                ],
+            ], [
+                self::UNIT_TEST_USER1,
+            ]],
+
+        ];
+    }
+
+    /**
+     * @dataProvider providesSharingData
+     */
+    public function testCalendarSharing($userCanRead, $userCanWrite, $groupCanRead, $groupCanWrite, $add, $principals): void {
+        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $config = $this->createMock(IConfig::class);
+
+        $l10n = $this->createMock(IL10N::class);
+        $l10n->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($text, $parameters = []) {
+                return vsprintf($text, $parameters);
+            });
+
+        $this->userManager->expects($this->any())
+            ->method('userExists')
+            ->willReturn(true);
+        $this->groupManager->expects($this->any())
+            ->method('groupExists')
+            ->willReturn(true);
+        $this->principal->expects(self::atLeastOnce())
+            ->method('findByUri')
+            ->willReturnOnConsecutiveCalls(...$principals);
+
+        $calendarId = $this->createTestCalendar();
+        $calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
+        $this->assertCount(1, $calendars);
+        $calendar = new Calendar($this->backend, $calendars[0], $l10n, $config, $logger);
+        $this->backend->updateShares($calendar, $add, []);
+        $calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1);
+        $this->assertCount(1, $calendars);
+        $calendar = new Calendar($this->backend, $calendars[0], $l10n, $config, $logger);
+        $acl = $calendar->getACL();
+        $this->assertAcl(self::UNIT_TEST_USER, '{DAV:}read', $acl);
+        $this->assertAcl(self::UNIT_TEST_USER, '{DAV:}write', $acl);
+        $this->assertAccess($userCanRead, self::UNIT_TEST_USER1, '{DAV:}read', $acl);
+        $this->assertAccess($userCanWrite, self::UNIT_TEST_USER1, '{DAV:}write', $acl);
+        $this->assertEquals(self::UNIT_TEST_USER, $calendar->getOwner());
+
+        // test acls on the child
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -170,35 +170,35 @@ 
 END:VCALENDAR
 EOD;
 
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
-
-		/** @var IACL $child */
-		$child = $calendar->getChild($uri);
-		$acl = $child->getACL();
-		$this->assertAcl(self::UNIT_TEST_USER, '{DAV:}read', $acl);
-		$this->assertAcl(self::UNIT_TEST_USER, '{DAV:}write', $acl);
-		$this->assertAccess($userCanRead, self::UNIT_TEST_USER1, '{DAV:}read', $acl);
-		$this->assertAccess($userCanWrite, self::UNIT_TEST_USER1, '{DAV:}write', $acl);
-
-		// delete the calendar
-		$this->dispatcher->expects(self::once())
-			->method('dispatchTyped')
-			->with(self::callback(function ($event) {
-				return $event instanceof CalendarDeletedEvent;
-			}));
-		$this->backend->deleteCalendar($calendars[0]['id'], true);
-		$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
-		self::assertEmpty($calendars);
-	}
-
-	public function testCalendarObjectsOperations(): void {
-		$calendarId = $this->createTestCalendar();
-
-		// create a card
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<'EOD'
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
+
+        /** @var IACL $child */
+        $child = $calendar->getChild($uri);
+        $acl = $child->getACL();
+        $this->assertAcl(self::UNIT_TEST_USER, '{DAV:}read', $acl);
+        $this->assertAcl(self::UNIT_TEST_USER, '{DAV:}write', $acl);
+        $this->assertAccess($userCanRead, self::UNIT_TEST_USER1, '{DAV:}read', $acl);
+        $this->assertAccess($userCanWrite, self::UNIT_TEST_USER1, '{DAV:}write', $acl);
+
+        // delete the calendar
+        $this->dispatcher->expects(self::once())
+            ->method('dispatchTyped')
+            ->with(self::callback(function ($event) {
+                return $event instanceof CalendarDeletedEvent;
+            }));
+        $this->backend->deleteCalendar($calendars[0]['id'], true);
+        $calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
+        self::assertEmpty($calendars);
+    }
+
+    public function testCalendarObjectsOperations(): void {
+        $calendarId = $this->createTestCalendar();
+
+        // create a card
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -215,30 +215,30 @@ 
 END:VCALENDAR
 EOD;
 
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
-
-		// get all the calendar objects
-		$calendarObjects = $this->backend->getCalendarObjects($calendarId);
-		$this->assertCount(1, $calendarObjects);
-		$this->assertEquals($calendarId, $calendarObjects[0]['calendarid']);
-		$this->assertArrayHasKey('classification', $calendarObjects[0]);
-
-		// get the calendar objects
-		$calendarObject = $this->backend->getCalendarObject($calendarId, $uri);
-		$this->assertNotNull($calendarObject);
-		$this->assertArrayHasKey('id', $calendarObject);
-		$this->assertArrayHasKey('uri', $calendarObject);
-		$this->assertArrayHasKey('lastmodified', $calendarObject);
-		$this->assertArrayHasKey('etag', $calendarObject);
-		$this->assertArrayHasKey('size', $calendarObject);
-		$this->assertArrayHasKey('classification', $calendarObject);
-		$this->assertArrayHasKey('{' . SharingPlugin::NS_NEXTCLOUD . '}deleted-at', $calendarObject);
-		$this->assertEquals($calData, $calendarObject['calendardata']);
-
-		// update the card
-		$calData = <<<'EOD'
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
+
+        // get all the calendar objects
+        $calendarObjects = $this->backend->getCalendarObjects($calendarId);
+        $this->assertCount(1, $calendarObjects);
+        $this->assertEquals($calendarId, $calendarObjects[0]['calendarid']);
+        $this->assertArrayHasKey('classification', $calendarObjects[0]);
+
+        // get the calendar objects
+        $calendarObject = $this->backend->getCalendarObject($calendarId, $uri);
+        $this->assertNotNull($calendarObject);
+        $this->assertArrayHasKey('id', $calendarObject);
+        $this->assertArrayHasKey('uri', $calendarObject);
+        $this->assertArrayHasKey('lastmodified', $calendarObject);
+        $this->assertArrayHasKey('etag', $calendarObject);
+        $this->assertArrayHasKey('size', $calendarObject);
+        $this->assertArrayHasKey('classification', $calendarObject);
+        $this->assertArrayHasKey('{' . SharingPlugin::NS_NEXTCLOUD . '}deleted-at', $calendarObject);
+        $this->assertEquals($calData, $calendarObject['calendardata']);
+
+        // update the card
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -253,28 +253,28 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->updateCalendarObject($calendarId, $uri, $calData);
-		$calendarObject = $this->backend->getCalendarObject($calendarId, $uri);
-		$this->assertEquals($calData, $calendarObject['calendardata']);
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->updateCalendarObject($calendarId, $uri, $calData);
+        $calendarObject = $this->backend->getCalendarObject($calendarId, $uri);
+        $this->assertEquals($calData, $calendarObject['calendardata']);
 
-		// delete the card
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->deleteCalendarObject($calendarId, $uri);
-		$calendarObjects = $this->backend->getCalendarObjects($calendarId);
-		$this->assertCount(0, $calendarObjects);
-	}
+        // delete the card
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->deleteCalendarObject($calendarId, $uri);
+        $calendarObjects = $this->backend->getCalendarObjects($calendarId);
+        $this->assertCount(0, $calendarObjects);
+    }
 
 
-	public function testMultipleCalendarObjectsWithSameUID(): void {
-		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
-		$this->expectExceptionMessage('Calendar object with uid already exists in this calendar collection.');
+    public function testMultipleCalendarObjectsWithSameUID(): void {
+        $this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+        $this->expectExceptionMessage('Calendar object with uid already exists in this calendar collection.');
 
-		$calendarId = $this->createTestCalendar();
+        $calendarId = $this->createTestCalendar();
 
-		$calData = <<<'EOD'
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -291,18 +291,18 @@ 
 END:VCALENDAR
 EOD;
 
-		$uri0 = static::getUniqueID('event');
-		$uri1 = static::getUniqueID('event');
-		$this->backend->createCalendarObject($calendarId, $uri0, $calData);
-		$this->backend->createCalendarObject($calendarId, $uri1, $calData);
-	}
+        $uri0 = static::getUniqueID('event');
+        $uri1 = static::getUniqueID('event');
+        $this->backend->createCalendarObject($calendarId, $uri0, $calData);
+        $this->backend->createCalendarObject($calendarId, $uri1, $calData);
+    }
 
-	public function testMultiCalendarObjects(): void {
-		$calendarId = $this->createTestCalendar();
+    public function testMultiCalendarObjects(): void {
+        $calendarId = $this->createTestCalendar();
 
-		// create an event
-		$calData = [];
-		$calData[] = <<<'EOD'
+        // create an event
+        $calData = [];
+        $calData[] = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -319,7 +319,7 @@ 
 END:VCALENDAR
 EOD;
 
-		$calData[] = <<<'EOD'
+        $calData[] = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -336,7 +336,7 @@ 
 END:VCALENDAR
 EOD;
 
-		$calData[] = <<<'EOD'
+        $calData[] = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -353,88 +353,88 @@ 
 END:VCALENDAR
 EOD;
 
-		$uri0 = static::getUniqueID('card');
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->createCalendarObject($calendarId, $uri0, $calData[0]);
-		$uri1 = static::getUniqueID('card');
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->createCalendarObject($calendarId, $uri1, $calData[1]);
-		$uri2 = static::getUniqueID('card');
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->createCalendarObject($calendarId, $uri2, $calData[2]);
-
-		// get all the cards
-		$calendarObjects = $this->backend->getCalendarObjects($calendarId);
-		$this->assertCount(3, $calendarObjects);
-
-		// get the cards
-		$calendarObjects = $this->backend->getMultipleCalendarObjects($calendarId, [$uri1, $uri2]);
-		$this->assertCount(2, $calendarObjects);
-		foreach ($calendarObjects as $card) {
-			$this->assertArrayHasKey('id', $card);
-			$this->assertArrayHasKey('uri', $card);
-			$this->assertArrayHasKey('lastmodified', $card);
-			$this->assertArrayHasKey('etag', $card);
-			$this->assertArrayHasKey('size', $card);
-			$this->assertArrayHasKey('classification', $card);
-		}
-
-		usort($calendarObjects, function ($a, $b) {
-			return $a['id'] - $b['id'];
-		});
-
-		$this->assertEquals($calData[1], $calendarObjects[0]['calendardata']);
-		$this->assertEquals($calData[2], $calendarObjects[1]['calendardata']);
-
-		// delete the card
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->deleteCalendarObject($calendarId, $uri0);
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->deleteCalendarObject($calendarId, $uri1);
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->deleteCalendarObject($calendarId, $uri2);
-		$calendarObjects = $this->backend->getCalendarObjects($calendarId);
-		$this->assertCount(0, $calendarObjects);
-	}
-
-	/**
-	 * @dataProvider providesCalendarQueryParameters
-	 */
-	public function testCalendarQuery($expectedEventsInResult, $propFilters, $compFilter): void {
-		$calendarId = $this->createTestCalendar();
-		$events = [];
-		$events[0] = $this->createEvent($calendarId, '20130912T130000Z', '20130912T140000Z');
-		$events[1] = $this->createEvent($calendarId, '20130912T150000Z', '20130912T170000Z');
-		$events[2] = $this->createEvent($calendarId, '20130912T173000Z', '20130912T220000Z');
-		if (PHP_INT_SIZE > 8) {
-			$events[3] = $this->createEvent($calendarId, '21130912T130000Z', '22130912T130000Z');
-		} else {
-			/* On 32bit we do not support events after 2038 */
-			$events[3] = $this->createEvent($calendarId, '20370912T130000Z', '20370912T130000Z');
-		}
-
-		$result = $this->backend->calendarQuery($calendarId, [
-			'name' => '',
-			'prop-filters' => $propFilters,
-			'comp-filters' => $compFilter
-		]);
-
-		$expectedEventsInResult = array_map(function ($index) use ($events) {
-			return $events[$index];
-		}, $expectedEventsInResult);
-		$this->assertEqualsCanonicalizing($expectedEventsInResult, $result);
-	}
-
-	public function testGetCalendarObjectByUID(): void {
-		$calendarId = $this->createTestCalendar();
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<'EOD'
+        $uri0 = static::getUniqueID('card');
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->createCalendarObject($calendarId, $uri0, $calData[0]);
+        $uri1 = static::getUniqueID('card');
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->createCalendarObject($calendarId, $uri1, $calData[1]);
+        $uri2 = static::getUniqueID('card');
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->createCalendarObject($calendarId, $uri2, $calData[2]);
+
+        // get all the cards
+        $calendarObjects = $this->backend->getCalendarObjects($calendarId);
+        $this->assertCount(3, $calendarObjects);
+
+        // get the cards
+        $calendarObjects = $this->backend->getMultipleCalendarObjects($calendarId, [$uri1, $uri2]);
+        $this->assertCount(2, $calendarObjects);
+        foreach ($calendarObjects as $card) {
+            $this->assertArrayHasKey('id', $card);
+            $this->assertArrayHasKey('uri', $card);
+            $this->assertArrayHasKey('lastmodified', $card);
+            $this->assertArrayHasKey('etag', $card);
+            $this->assertArrayHasKey('size', $card);
+            $this->assertArrayHasKey('classification', $card);
+        }
+
+        usort($calendarObjects, function ($a, $b) {
+            return $a['id'] - $b['id'];
+        });
+
+        $this->assertEquals($calData[1], $calendarObjects[0]['calendardata']);
+        $this->assertEquals($calData[2], $calendarObjects[1]['calendardata']);
+
+        // delete the card
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->deleteCalendarObject($calendarId, $uri0);
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->deleteCalendarObject($calendarId, $uri1);
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->deleteCalendarObject($calendarId, $uri2);
+        $calendarObjects = $this->backend->getCalendarObjects($calendarId);
+        $this->assertCount(0, $calendarObjects);
+    }
+
+    /**
+     * @dataProvider providesCalendarQueryParameters
+     */
+    public function testCalendarQuery($expectedEventsInResult, $propFilters, $compFilter): void {
+        $calendarId = $this->createTestCalendar();
+        $events = [];
+        $events[0] = $this->createEvent($calendarId, '20130912T130000Z', '20130912T140000Z');
+        $events[1] = $this->createEvent($calendarId, '20130912T150000Z', '20130912T170000Z');
+        $events[2] = $this->createEvent($calendarId, '20130912T173000Z', '20130912T220000Z');
+        if (PHP_INT_SIZE > 8) {
+            $events[3] = $this->createEvent($calendarId, '21130912T130000Z', '22130912T130000Z');
+        } else {
+            /* On 32bit we do not support events after 2038 */
+            $events[3] = $this->createEvent($calendarId, '20370912T130000Z', '20370912T130000Z');
+        }
+
+        $result = $this->backend->calendarQuery($calendarId, [
+            'name' => '',
+            'prop-filters' => $propFilters,
+            'comp-filters' => $compFilter
+        ]);
+
+        $expectedEventsInResult = array_map(function ($index) use ($events) {
+            return $events[$index];
+        }, $expectedEventsInResult);
+        $this->assertEqualsCanonicalizing($expectedEventsInResult, $result);
+    }
+
+    public function testGetCalendarObjectByUID(): void {
+        $calendarId = $this->createTestCalendar();
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -452,175 +452,175 @@ 
 EOD;
 
 
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
-
-		$co = $this->backend->getCalendarObjectByUID(self::UNIT_TEST_USER, '47d15e3ec8');
-		$this->assertNotNull($co);
-	}
-
-	public static function providesCalendarQueryParameters(): array {
-		return [
-			'all' => [[0, 1, 2, 3], [], []],
-			'only-todos' => [[], ['name' => 'VTODO'], []],
-			'only-events' => [[0, 1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => null], 'prop-filters' => []]],],
-			'start' => [[1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
-			'end' => [[0], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC'))], 'prop-filters' => []]],],
-			'future' => [[3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2036-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
-		];
-	}
-
-	public function testCalendarSynchronization(): void {
-
-		// construct calendar for testing
-		$calendarId = $this->createTestCalendar();
-
-		/** test fresh sync state with NO events in calendar */
-		// construct test state
-		$stateTest = ['syncToken' => 1, 'added' => [], 'modified' => [], 'deleted' => []];
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '', 1);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test fresh sync state with NO events in calendar');
-
-		/** test delta sync state with NO events in calendar */
-		// construct test state
-		$stateTest = ['syncToken' => 1, 'added' => [], 'modified' => [], 'deleted' => []];
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '2', 1);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with NO events in calendar');
-
-		/** add events to calendar */
-		$event1 = $this->createEvent($calendarId, '20240701T130000Z', '20240701T140000Z');
-		$event2 = $this->createEvent($calendarId, '20240701T140000Z', '20240701T150000Z');
-		$event3 = $this->createEvent($calendarId, '20240701T150000Z', '20240701T160000Z');
-
-		/** test fresh sync state with events in calendar */
-		// construct expected state
-		$stateTest = ['syncToken' => 4, 'added' => [$event1, $event2, $event3], 'modified' => [], 'deleted' => []];
-		sort($stateTest['added']);
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '', 1);
-		// sort live state results
-		sort($stateLive['added']);
-		sort($stateLive['modified']);
-		sort($stateLive['deleted']);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test fresh sync state with events in calendar');
-
-		/** test delta sync state with events in calendar */
-		// construct expected state
-		$stateTest = ['syncToken' => 4, 'added' => [$event2, $event3], 'modified' => [], 'deleted' => []];
-		sort($stateTest['added']);
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '2', 1);
-		// sort live state results
-		sort($stateLive['added']);
-		sort($stateLive['modified']);
-		sort($stateLive['deleted']);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with events in calendar');
-
-		/** modify/delete events in calendar */
-		$this->deleteEvent($calendarId, $event1);
-		$this->modifyEvent($calendarId, $event2, '20250701T140000Z', '20250701T150000Z');
-
-		/** test fresh sync state with modified/deleted events in calendar */
-		// construct expected state
-		$stateTest = ['syncToken' => 6, 'added' => [$event2, $event3], 'modified' => [], 'deleted' => []];
-		sort($stateTest['added']);
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '', 1);
-		// sort live state results
-		sort($stateLive['added']);
-		sort($stateLive['modified']);
-		sort($stateLive['deleted']);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test fresh sync state with modified/deleted events in calendar');
-
-		/** test delta sync state with modified/deleted events in calendar */
-		// construct expected state
-		$stateTest = ['syncToken' => 6, 'added' => [$event3], 'modified' => [$event2], 'deleted' => [$event1]];
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '3', 1);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with modified/deleted events in calendar');
-
-		/** test delta sync state with modified/deleted events in calendar and invalid token */
-		// construct expected state
-		$stateTest = ['syncToken' => 6, 'added' => [], 'modified' => [], 'deleted' => []];
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '6', 1);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with modified/deleted events in calendar and invalid token');
-
-	}
-
-	public function testPublications(): void {
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-
-		$this->backend->createCalendar(self::UNIT_TEST_USER, 'Example', []);
-
-		$calendarInfo = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER)[0];
-
-		/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject $l10n */
-		$l10n = $this->createMock(IL10N::class);
-		$config = $this->createMock(IConfig::class);
-		$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
-		$calendar = new Calendar($this->backend, $calendarInfo, $l10n, $config, $logger);
-		$calendar->setPublishStatus(true);
-		$this->assertNotEquals(false, $calendar->getPublishStatus());
-
-		$publicCalendars = $this->backend->getPublicCalendars();
-		$this->assertCount(1, $publicCalendars);
-		$this->assertEquals(true, $publicCalendars[0]['{http://owncloud.org/ns}public']);
-		$this->assertEquals('User\'s displayname', $publicCalendars[0]['{http://nextcloud.com/ns}owner-displayname']);
-
-		$publicCalendarURI = $publicCalendars[0]['uri'];
-		$publicCalendar = $this->backend->getPublicCalendar($publicCalendarURI);
-		$this->assertEquals(true, $publicCalendar['{http://owncloud.org/ns}public']);
-
-		$calendar->setPublishStatus(false);
-		$this->assertEquals(false, $calendar->getPublishStatus());
-
-		$this->expectException(NotFound::class);
-		$this->backend->getPublicCalendar($publicCalendarURI);
-	}
-
-	public function testSubscriptions(): void {
-		$id = $this->backend->createSubscription(self::UNIT_TEST_USER, 'Subscription', [
-			'{http://calendarserver.org/ns/}source' => new Href('test-source'),
-			'{http://apple.com/ns/ical/}calendar-color' => '#1C4587',
-			'{http://calendarserver.org/ns/}subscribed-strip-todos' => ''
-		]);
-
-		$subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
-		$this->assertCount(1, $subscriptions);
-		$this->assertEquals('#1C4587', $subscriptions[0]['{http://apple.com/ns/ical/}calendar-color']);
-		$this->assertEquals(true, $subscriptions[0]['{http://calendarserver.org/ns/}subscribed-strip-todos']);
-		$this->assertEquals($id, $subscriptions[0]['id']);
-
-		$patch = new PropPatch([
-			'{DAV:}displayname' => 'Unit test',
-			'{http://apple.com/ns/ical/}calendar-color' => '#ac0606',
-		]);
-		$this->backend->updateSubscription($id, $patch);
-		$patch->commit();
-
-		$subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
-		$this->assertCount(1, $subscriptions);
-		$this->assertEquals($id, $subscriptions[0]['id']);
-		$this->assertEquals('Unit test', $subscriptions[0]['{DAV:}displayname']);
-		$this->assertEquals('#ac0606', $subscriptions[0]['{http://apple.com/ns/ical/}calendar-color']);
-
-		$this->backend->deleteSubscription($id);
-		$subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
-		$this->assertCount(0, $subscriptions);
-	}
-
-	public static function providesSchedulingData(): array {
-		$data = <<<EOS
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
+
+        $co = $this->backend->getCalendarObjectByUID(self::UNIT_TEST_USER, '47d15e3ec8');
+        $this->assertNotNull($co);
+    }
+
+    public static function providesCalendarQueryParameters(): array {
+        return [
+            'all' => [[0, 1, 2, 3], [], []],
+            'only-todos' => [[], ['name' => 'VTODO'], []],
+            'only-events' => [[0, 1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => null], 'prop-filters' => []]],],
+            'start' => [[1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
+            'end' => [[0], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC'))], 'prop-filters' => []]],],
+            'future' => [[3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2036-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
+        ];
+    }
+
+    public function testCalendarSynchronization(): void {
+
+        // construct calendar for testing
+        $calendarId = $this->createTestCalendar();
+
+        /** test fresh sync state with NO events in calendar */
+        // construct test state
+        $stateTest = ['syncToken' => 1, 'added' => [], 'modified' => [], 'deleted' => []];
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '', 1);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test fresh sync state with NO events in calendar');
+
+        /** test delta sync state with NO events in calendar */
+        // construct test state
+        $stateTest = ['syncToken' => 1, 'added' => [], 'modified' => [], 'deleted' => []];
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '2', 1);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with NO events in calendar');
+
+        /** add events to calendar */
+        $event1 = $this->createEvent($calendarId, '20240701T130000Z', '20240701T140000Z');
+        $event2 = $this->createEvent($calendarId, '20240701T140000Z', '20240701T150000Z');
+        $event3 = $this->createEvent($calendarId, '20240701T150000Z', '20240701T160000Z');
+
+        /** test fresh sync state with events in calendar */
+        // construct expected state
+        $stateTest = ['syncToken' => 4, 'added' => [$event1, $event2, $event3], 'modified' => [], 'deleted' => []];
+        sort($stateTest['added']);
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '', 1);
+        // sort live state results
+        sort($stateLive['added']);
+        sort($stateLive['modified']);
+        sort($stateLive['deleted']);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test fresh sync state with events in calendar');
+
+        /** test delta sync state with events in calendar */
+        // construct expected state
+        $stateTest = ['syncToken' => 4, 'added' => [$event2, $event3], 'modified' => [], 'deleted' => []];
+        sort($stateTest['added']);
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '2', 1);
+        // sort live state results
+        sort($stateLive['added']);
+        sort($stateLive['modified']);
+        sort($stateLive['deleted']);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with events in calendar');
+
+        /** modify/delete events in calendar */
+        $this->deleteEvent($calendarId, $event1);
+        $this->modifyEvent($calendarId, $event2, '20250701T140000Z', '20250701T150000Z');
+
+        /** test fresh sync state with modified/deleted events in calendar */
+        // construct expected state
+        $stateTest = ['syncToken' => 6, 'added' => [$event2, $event3], 'modified' => [], 'deleted' => []];
+        sort($stateTest['added']);
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '', 1);
+        // sort live state results
+        sort($stateLive['added']);
+        sort($stateLive['modified']);
+        sort($stateLive['deleted']);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test fresh sync state with modified/deleted events in calendar');
+
+        /** test delta sync state with modified/deleted events in calendar */
+        // construct expected state
+        $stateTest = ['syncToken' => 6, 'added' => [$event3], 'modified' => [$event2], 'deleted' => [$event1]];
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '3', 1);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with modified/deleted events in calendar');
+
+        /** test delta sync state with modified/deleted events in calendar and invalid token */
+        // construct expected state
+        $stateTest = ['syncToken' => 6, 'added' => [], 'modified' => [], 'deleted' => []];
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '6', 1);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with modified/deleted events in calendar and invalid token');
+
+    }
+
+    public function testPublications(): void {
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+
+        $this->backend->createCalendar(self::UNIT_TEST_USER, 'Example', []);
+
+        $calendarInfo = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER)[0];
+
+        /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject $l10n */
+        $l10n = $this->createMock(IL10N::class);
+        $config = $this->createMock(IConfig::class);
+        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $calendar = new Calendar($this->backend, $calendarInfo, $l10n, $config, $logger);
+        $calendar->setPublishStatus(true);
+        $this->assertNotEquals(false, $calendar->getPublishStatus());
+
+        $publicCalendars = $this->backend->getPublicCalendars();
+        $this->assertCount(1, $publicCalendars);
+        $this->assertEquals(true, $publicCalendars[0]['{http://owncloud.org/ns}public']);
+        $this->assertEquals('User\'s displayname', $publicCalendars[0]['{http://nextcloud.com/ns}owner-displayname']);
+
+        $publicCalendarURI = $publicCalendars[0]['uri'];
+        $publicCalendar = $this->backend->getPublicCalendar($publicCalendarURI);
+        $this->assertEquals(true, $publicCalendar['{http://owncloud.org/ns}public']);
+
+        $calendar->setPublishStatus(false);
+        $this->assertEquals(false, $calendar->getPublishStatus());
+
+        $this->expectException(NotFound::class);
+        $this->backend->getPublicCalendar($publicCalendarURI);
+    }
+
+    public function testSubscriptions(): void {
+        $id = $this->backend->createSubscription(self::UNIT_TEST_USER, 'Subscription', [
+            '{http://calendarserver.org/ns/}source' => new Href('test-source'),
+            '{http://apple.com/ns/ical/}calendar-color' => '#1C4587',
+            '{http://calendarserver.org/ns/}subscribed-strip-todos' => ''
+        ]);
+
+        $subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
+        $this->assertCount(1, $subscriptions);
+        $this->assertEquals('#1C4587', $subscriptions[0]['{http://apple.com/ns/ical/}calendar-color']);
+        $this->assertEquals(true, $subscriptions[0]['{http://calendarserver.org/ns/}subscribed-strip-todos']);
+        $this->assertEquals($id, $subscriptions[0]['id']);
+
+        $patch = new PropPatch([
+            '{DAV:}displayname' => 'Unit test',
+            '{http://apple.com/ns/ical/}calendar-color' => '#ac0606',
+        ]);
+        $this->backend->updateSubscription($id, $patch);
+        $patch->commit();
+
+        $subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
+        $this->assertCount(1, $subscriptions);
+        $this->assertEquals($id, $subscriptions[0]['id']);
+        $this->assertEquals('Unit test', $subscriptions[0]['{DAV:}displayname']);
+        $this->assertEquals('#ac0606', $subscriptions[0]['{http://apple.com/ns/ical/}calendar-color']);
+
+        $this->backend->deleteSubscription($id);
+        $subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
+        $this->assertCount(0, $subscriptions);
+    }
+
+    public static function providesSchedulingData(): array {
+        $data = <<<EOS
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Sabre//Sabre VObject 3.5.0//EN
@@ -685,74 +685,74 @@ 
 END:VCALENDAR
 EOS;
 
-		return [
-			'no data' => [''],
-			'failing on postgres' => [$data]
-		];
-	}
+        return [
+            'no data' => [''],
+            'failing on postgres' => [$data]
+        ];
+    }
 
-	/**
-	 * @dataProvider providesSchedulingData
-	 * @param $objectData
-	 */
-	public function testScheduling($objectData): void {
-		$this->backend->createSchedulingObject(self::UNIT_TEST_USER, 'Sample Schedule', $objectData);
+    /**
+     * @dataProvider providesSchedulingData
+     * @param $objectData
+     */
+    public function testScheduling($objectData): void {
+        $this->backend->createSchedulingObject(self::UNIT_TEST_USER, 'Sample Schedule', $objectData);
 
-		$sos = $this->backend->getSchedulingObjects(self::UNIT_TEST_USER);
-		$this->assertCount(1, $sos);
+        $sos = $this->backend->getSchedulingObjects(self::UNIT_TEST_USER);
+        $this->assertCount(1, $sos);
 
-		$so = $this->backend->getSchedulingObject(self::UNIT_TEST_USER, 'Sample Schedule');
-		$this->assertNotNull($so);
+        $so = $this->backend->getSchedulingObject(self::UNIT_TEST_USER, 'Sample Schedule');
+        $this->assertNotNull($so);
 
-		$this->backend->deleteSchedulingObject(self::UNIT_TEST_USER, 'Sample Schedule');
+        $this->backend->deleteSchedulingObject(self::UNIT_TEST_USER, 'Sample Schedule');
 
-		$sos = $this->backend->getSchedulingObjects(self::UNIT_TEST_USER);
-		$this->assertCount(0, $sos);
-	}
+        $sos = $this->backend->getSchedulingObjects(self::UNIT_TEST_USER);
+        $this->assertCount(0, $sos);
+    }
 
-	/**
-	 * @dataProvider providesCalDataForGetDenormalizedData
-	 */
-	public function testGetDenormalizedData($expected, $key, $calData): void {
-		try {
-			$actual = $this->backend->getDenormalizedData($calData);
-			$this->assertEquals($expected, $actual[$key]);
-		} catch (\Throwable $e) {
-			if (($e->getMessage() === 'Epoch doesn\'t fit in a PHP integer') && (PHP_INT_SIZE < 8)) {
-				$this->markTestSkipped('This fail on 32bits because of PHP limitations in DateTime');
-			}
-			throw $e;
-		}
-	}
+    /**
+     * @dataProvider providesCalDataForGetDenormalizedData
+     */
+    public function testGetDenormalizedData($expected, $key, $calData): void {
+        try {
+            $actual = $this->backend->getDenormalizedData($calData);
+            $this->assertEquals($expected, $actual[$key]);
+        } catch (\Throwable $e) {
+            if (($e->getMessage() === 'Epoch doesn\'t fit in a PHP integer') && (PHP_INT_SIZE < 8)) {
+                $this->markTestSkipped('This fail on 32bits because of PHP limitations in DateTime');
+            }
+            throw $e;
+        }
+    }
 
-	public static function providesCalDataForGetDenormalizedData(): array {
-		return [
-			'first occurrence before unix epoch starts' => [0, 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:413F269B-B51B-46B1-AFB6-40055C53A4DC\r\nDTSTAMP:20160309T095056Z\r\nDTSTART;VALUE=DATE:16040222\r\nDTEND;VALUE=DATE:16040223\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:SUMMARY\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
-			'no first occurrence because yearly' => [null, 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:413F269B-B51B-46B1-AFB6-40055C53A4DC\r\nDTSTAMP:20160309T095056Z\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:SUMMARY\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
+    public static function providesCalDataForGetDenormalizedData(): array {
+        return [
+            'first occurrence before unix epoch starts' => [0, 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:413F269B-B51B-46B1-AFB6-40055C53A4DC\r\nDTSTAMP:20160309T095056Z\r\nDTSTART;VALUE=DATE:16040222\r\nDTEND;VALUE=DATE:16040223\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:SUMMARY\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
+            'no first occurrence because yearly' => [null, 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:413F269B-B51B-46B1-AFB6-40055C53A4DC\r\nDTSTAMP:20160309T095056Z\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:SUMMARY\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
 
-			'last occurrence is max when only last VEVENT in group is weekly' => [(new DateTime(CalDavBackend::MAX_DATE))->getTimestamp(), 'lastOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.3.0//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20200812T103000\r\nDTEND;TZID=America/Los_Angeles:20200812T110000\r\nDTSTAMP:20200927T180638Z\r\nUID:asdfasdfasdf@google.com\r\nRECURRENCE-ID;TZID=America/Los_Angeles:20200811T123000\r\nCREATED:20200626T181848Z\r\nLAST-MODIFIED:20200922T192707Z\r\nSUMMARY:Weekly 1:1\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20200728T123000\r\nDTEND;TZID=America/Los_Angeles:20200728T130000\r\nEXDATE;TZID=America/Los_Angeles:20200818T123000\r\nRRULE:FREQ=WEEKLY;BYDAY=TU\r\nDTSTAMP:20200927T180638Z\r\nUID:asdfasdfasdf@google.com\r\nCREATED:20200626T181848Z\r\nDESCRIPTION:Setting up recurring time on our calendars\r\nLAST-MODIFIED:20200922T192707Z\r\nSUMMARY:Weekly 1:1\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
+            'last occurrence is max when only last VEVENT in group is weekly' => [(new DateTime(CalDavBackend::MAX_DATE))->getTimestamp(), 'lastOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.3.0//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20200812T103000\r\nDTEND;TZID=America/Los_Angeles:20200812T110000\r\nDTSTAMP:20200927T180638Z\r\nUID:asdfasdfasdf@google.com\r\nRECURRENCE-ID;TZID=America/Los_Angeles:20200811T123000\r\nCREATED:20200626T181848Z\r\nLAST-MODIFIED:20200922T192707Z\r\nSUMMARY:Weekly 1:1\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20200728T123000\r\nDTEND;TZID=America/Los_Angeles:20200728T130000\r\nEXDATE;TZID=America/Los_Angeles:20200818T123000\r\nRRULE:FREQ=WEEKLY;BYDAY=TU\r\nDTSTAMP:20200927T180638Z\r\nUID:asdfasdfasdf@google.com\r\nCREATED:20200626T181848Z\r\nDESCRIPTION:Setting up recurring time on our calendars\r\nLAST-MODIFIED:20200922T192707Z\r\nSUMMARY:Weekly 1:1\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
 
-			'last occurrence before unix epoch starts' => [0, 'lastOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.3.0//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:19110324\r\nDTEND;VALUE=DATE:19110325\r\nDTSTAMP:20200927T180638Z\r\nUID:asdfasdfasdf@google.com\r\nCREATED:20200626T181848Z\r\nDESCRIPTION:Very old event\r\nLAST-MODIFIED:20200922T192707Z\r\nSUMMARY:Some old event\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
+            'last occurrence before unix epoch starts' => [0, 'lastOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.3.0//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:19110324\r\nDTEND;VALUE=DATE:19110325\r\nDTSTAMP:20200927T180638Z\r\nUID:asdfasdfasdf@google.com\r\nCREATED:20200626T181848Z\r\nDESCRIPTION:Very old event\r\nLAST-MODIFIED:20200922T192707Z\r\nSUMMARY:Some old event\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
 
-			'first occurrence is found when not first VEVENT in group' => [(new DateTime('2020-09-01T110000', new DateTimeZone('America/Los_Angeles')))->getTimestamp(), 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.3.0//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20201013T110000\r\nDTEND;TZID=America/Los_Angeles:20201013T120000\r\nDTSTAMP:20200927T180638Z\r\nUID:asdf0000@google.com\r\nRECURRENCE-ID;TZID=America/Los_Angeles:20201013T110000\r\nCREATED:20160330T034726Z\r\nLAST-MODIFIED:20200925T042014Z\r\nSTATUS:CONFIRMED\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20200901T110000\r\nDTEND;TZID=America/Los_Angeles:20200901T120000\r\nRRULE:FREQ=WEEKLY;BYDAY=TU\r\nEXDATE;TZID=America/Los_Angeles:20200922T110000\r\nEXDATE;TZID=America/Los_Angeles:20200915T110000\r\nEXDATE;TZID=America/Los_Angeles:20200908T110000\r\nDTSTAMP:20200927T180638Z\r\nUID:asdf0000@google.com\r\nCREATED:20160330T034726Z\r\nLAST-MODIFIED:20200915T162810Z\r\nSTATUS:CONFIRMED\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
+            'first occurrence is found when not first VEVENT in group' => [(new DateTime('2020-09-01T110000', new DateTimeZone('America/Los_Angeles')))->getTimestamp(), 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.3.0//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20201013T110000\r\nDTEND;TZID=America/Los_Angeles:20201013T120000\r\nDTSTAMP:20200927T180638Z\r\nUID:asdf0000@google.com\r\nRECURRENCE-ID;TZID=America/Los_Angeles:20201013T110000\r\nCREATED:20160330T034726Z\r\nLAST-MODIFIED:20200925T042014Z\r\nSTATUS:CONFIRMED\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20200901T110000\r\nDTEND;TZID=America/Los_Angeles:20200901T120000\r\nRRULE:FREQ=WEEKLY;BYDAY=TU\r\nEXDATE;TZID=America/Los_Angeles:20200922T110000\r\nEXDATE;TZID=America/Los_Angeles:20200915T110000\r\nEXDATE;TZID=America/Los_Angeles:20200908T110000\r\nDTSTAMP:20200927T180638Z\r\nUID:asdf0000@google.com\r\nCREATED:20160330T034726Z\r\nLAST-MODIFIED:20200915T162810Z\r\nSTATUS:CONFIRMED\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
 
-			'CLASS:PRIVATE' => [CalDavBackend::CLASSIFICATION_PRIVATE, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:PRIVATE\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
+            'CLASS:PRIVATE' => [CalDavBackend::CLASSIFICATION_PRIVATE, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:PRIVATE\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
 
-			'CLASS:PUBLIC' => [CalDavBackend::CLASSIFICATION_PUBLIC, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:PUBLIC\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
+            'CLASS:PUBLIC' => [CalDavBackend::CLASSIFICATION_PUBLIC, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:PUBLIC\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
 
-			'CLASS:CONFIDENTIAL' => [CalDavBackend::CLASSIFICATION_CONFIDENTIAL, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:CONFIDENTIAL\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
+            'CLASS:CONFIDENTIAL' => [CalDavBackend::CLASSIFICATION_CONFIDENTIAL, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:CONFIDENTIAL\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
 
-			'no class set -> public' => [CalDavBackend::CLASSIFICATION_PUBLIC, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nTRANSP:OPAQUE\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
+            'no class set -> public' => [CalDavBackend::CLASSIFICATION_PUBLIC, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nTRANSP:OPAQUE\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
 
-			'unknown class -> private' => [CalDavBackend::CLASSIFICATION_PRIVATE, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:VERTRAULICH\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
-		];
-	}
+            'unknown class -> private' => [CalDavBackend::CLASSIFICATION_PRIVATE, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:VERTRAULICH\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
+        ];
+    }
 
-	public function testCalendarSearch(): void {
-		$calendarId = $this->createTestCalendar();
+    public function testCalendarSearch(): void {
+        $calendarId = $this->createTestCalendar();
 
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<EOD
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -769,24 +769,24 @@ 
 END:VCALENDAR
 EOD;
 
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
 
-		$search1 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
-			'comps' => [
-				'VEVENT',
-				'VTODO'
-			],
-			'props' => [
-				'SUMMARY',
-				'LOCATION'
-			],
-			'search-term' => 'Test',
-		]);
-		$this->assertEquals(count($search1), 1);
+        $search1 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
+            'comps' => [
+                'VEVENT',
+                'VTODO'
+            ],
+            'props' => [
+                'SUMMARY',
+                'LOCATION'
+            ],
+            'search-term' => 'Test',
+        ]);
+        $this->assertEquals(count($search1), 1);
 
 
-		// update the card
-		$calData = <<<'EOD'
+        // update the card
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -802,93 +802,93 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->updateCalendarObject($calendarId, $uri, $calData);
-
-		$search2 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
-			'comps' => [
-				'VEVENT',
-				'VTODO'
-			],
-			'props' => [
-				'SUMMARY',
-				'LOCATION'
-			],
-			'search-term' => 'Test',
-		]);
-		$this->assertEquals(count($search2), 0);
-
-		$search3 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
-			'comps' => [
-				'VEVENT',
-				'VTODO'
-			],
-			'props' => [
-				'SUMMARY',
-				'LOCATION'
-			],
-			'params' => [
-				[
-					'property' => 'ATTENDEE',
-					'parameter' => 'CN'
-				]
-			],
-			'search-term' => 'Test',
-		]);
-		$this->assertEquals(count($search3), 1);
-
-		// t matches both summary and attendee's CN, but we want unique results
-		$search4 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
-			'comps' => [
-				'VEVENT',
-				'VTODO'
-			],
-			'props' => [
-				'SUMMARY',
-				'LOCATION'
-			],
-			'params' => [
-				[
-					'property' => 'ATTENDEE',
-					'parameter' => 'CN'
-				]
-			],
-			'search-term' => 't',
-		]);
-		$this->assertEquals(count($search4), 1);
-
-		$this->backend->deleteCalendarObject($calendarId, $uri);
-
-		$search5 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
-			'comps' => [
-				'VEVENT',
-				'VTODO'
-			],
-			'props' => [
-				'SUMMARY',
-				'LOCATION'
-			],
-			'params' => [
-				[
-					'property' => 'ATTENDEE',
-					'parameter' => 'CN'
-				]
-			],
-			'search-term' => 't',
-		]);
-		$this->assertEquals(count($search5), 0);
-	}
-
-	/**
-	 * @dataProvider searchDataProvider
-	 */
-	public function testSearch(bool $isShared, array $searchOptions, int $count): void {
-		$calendarId = $this->createTestCalendar();
-
-		$uris = [];
-		$calData = [];
-
-		$uris[] = static::getUniqueID('calobj');
-		$calData[] = <<<EOD
+        $this->backend->updateCalendarObject($calendarId, $uri, $calData);
+
+        $search2 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
+            'comps' => [
+                'VEVENT',
+                'VTODO'
+            ],
+            'props' => [
+                'SUMMARY',
+                'LOCATION'
+            ],
+            'search-term' => 'Test',
+        ]);
+        $this->assertEquals(count($search2), 0);
+
+        $search3 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
+            'comps' => [
+                'VEVENT',
+                'VTODO'
+            ],
+            'props' => [
+                'SUMMARY',
+                'LOCATION'
+            ],
+            'params' => [
+                [
+                    'property' => 'ATTENDEE',
+                    'parameter' => 'CN'
+                ]
+            ],
+            'search-term' => 'Test',
+        ]);
+        $this->assertEquals(count($search3), 1);
+
+        // t matches both summary and attendee's CN, but we want unique results
+        $search4 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
+            'comps' => [
+                'VEVENT',
+                'VTODO'
+            ],
+            'props' => [
+                'SUMMARY',
+                'LOCATION'
+            ],
+            'params' => [
+                [
+                    'property' => 'ATTENDEE',
+                    'parameter' => 'CN'
+                ]
+            ],
+            'search-term' => 't',
+        ]);
+        $this->assertEquals(count($search4), 1);
+
+        $this->backend->deleteCalendarObject($calendarId, $uri);
+
+        $search5 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
+            'comps' => [
+                'VEVENT',
+                'VTODO'
+            ],
+            'props' => [
+                'SUMMARY',
+                'LOCATION'
+            ],
+            'params' => [
+                [
+                    'property' => 'ATTENDEE',
+                    'parameter' => 'CN'
+                ]
+            ],
+            'search-term' => 't',
+        ]);
+        $this->assertEquals(count($search5), 0);
+    }
+
+    /**
+     * @dataProvider searchDataProvider
+     */
+    public function testSearch(bool $isShared, array $searchOptions, int $count): void {
+        $calendarId = $this->createTestCalendar();
+
+        $uris = [];
+        $calData = [];
+
+        $uris[] = static::getUniqueID('calobj');
+        $calData[] = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -905,8 +905,8 @@ 
 END:VCALENDAR
 EOD;
 
-		$uris[] = static::getUniqueID('calobj');
-		$calData[] = <<<EOD
+        $uris[] = static::getUniqueID('calobj');
+        $calData[] = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -924,8 +924,8 @@ 
 END:VCALENDAR
 EOD;
 
-		$uris[] = static::getUniqueID('calobj');
-		$calData[] = <<<EOD
+        $uris[] = static::getUniqueID('calobj');
+        $calData[] = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -943,8 +943,8 @@ 
 END:VCALENDAR
 EOD;
 
-		$uris[] = static::getUniqueID('calobj');
-		$calData[] = <<<EOD
+        $uris[] = static::getUniqueID('calobj');
+        $calData[] = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -962,38 +962,38 @@ 
 END:VCALENDAR
 EOD;
 
-		$uriCount = count($uris);
-		for ($i = 0; $i < $uriCount; $i++) {
-			$this->backend->createCalendarObject($calendarId,
-				$uris[$i], $calData[$i]);
-		}
-
-		$calendarInfo = [
-			'id' => $calendarId,
-			'principaluri' => 'user1',
-			'{http://owncloud.org/ns}owner-principal' => $isShared ? 'user2' : 'user1',
-		];
-
-		$result = $this->backend->search($calendarInfo, 'Test',
-			['SUMMARY', 'LOCATION', 'ATTENDEE'], $searchOptions, null, null);
-
-		$this->assertCount($count, $result);
-	}
-
-	public static function searchDataProvider(): array {
-		return [
-			[false, [], 4],
-			[true, ['timerange' => ['start' => new DateTime('2013-09-12 13:00:00'), 'end' => new DateTime('2013-09-12 14:00:00')]], 2],
-			[true, ['timerange' => ['start' => new DateTime('2013-09-12 15:00:00'), 'end' => new DateTime('2013-09-12 16:00:00')]], 0],
-		];
-	}
-
-	public function testSameUriSameIdForDifferentCalendarTypes(): void {
-		$calendarId = $this->createTestCalendar();
-		$subscriptionId = $this->createTestSubscription();
-
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<EOD
+        $uriCount = count($uris);
+        for ($i = 0; $i < $uriCount; $i++) {
+            $this->backend->createCalendarObject($calendarId,
+                $uris[$i], $calData[$i]);
+        }
+
+        $calendarInfo = [
+            'id' => $calendarId,
+            'principaluri' => 'user1',
+            '{http://owncloud.org/ns}owner-principal' => $isShared ? 'user2' : 'user1',
+        ];
+
+        $result = $this->backend->search($calendarInfo, 'Test',
+            ['SUMMARY', 'LOCATION', 'ATTENDEE'], $searchOptions, null, null);
+
+        $this->assertCount($count, $result);
+    }
+
+    public static function searchDataProvider(): array {
+        return [
+            [false, [], 4],
+            [true, ['timerange' => ['start' => new DateTime('2013-09-12 13:00:00'), 'end' => new DateTime('2013-09-12 14:00:00')]], 2],
+            [true, ['timerange' => ['start' => new DateTime('2013-09-12 15:00:00'), 'end' => new DateTime('2013-09-12 16:00:00')]], 0],
+        ];
+    }
+
+    public function testSameUriSameIdForDifferentCalendarTypes(): void {
+        $calendarId = $this->createTestCalendar();
+        $subscriptionId = $this->createTestSubscription();
+
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -1010,7 +1010,7 @@ 
 END:VCALENDAR
 EOD;
 
-		$calData2 = <<<EOD
+        $calData2 = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -1027,17 +1027,17 @@ 
 END:VCALENDAR
 EOD;
 
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
-		$this->backend->createCalendarObject($subscriptionId, $uri, $calData2, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
+        $this->backend->createCalendarObject($subscriptionId, $uri, $calData2, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
 
-		$this->assertEquals($calData, $this->backend->getCalendarObject($calendarId, $uri, CalDavBackend::CALENDAR_TYPE_CALENDAR)['calendardata']);
-		$this->assertEquals($calData2, $this->backend->getCalendarObject($subscriptionId, $uri, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION)['calendardata']);
-	}
+        $this->assertEquals($calData, $this->backend->getCalendarObject($calendarId, $uri, CalDavBackend::CALENDAR_TYPE_CALENDAR)['calendardata']);
+        $this->assertEquals($calData2, $this->backend->getCalendarObject($subscriptionId, $uri, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION)['calendardata']);
+    }
 
-	public function testPurgeAllCachedEventsForSubscription(): void {
-		$subscriptionId = $this->createTestSubscription();
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<EOD
+    public function testPurgeAllCachedEventsForSubscription(): void {
+        $subscriptionId = $this->createTestSubscription();
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -1054,30 +1054,30 @@ 
 END:VCALENDAR
 EOD;
 
-		$this->backend->createCalendarObject($subscriptionId, $uri, $calData, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-		$this->backend->purgeAllCachedEventsForSubscription($subscriptionId);
+        $this->backend->createCalendarObject($subscriptionId, $uri, $calData, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+        $this->backend->purgeAllCachedEventsForSubscription($subscriptionId);
 
-		$this->assertEquals(null, $this->backend->getCalendarObject($subscriptionId, $uri, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION));
-	}
+        $this->assertEquals(null, $this->backend->getCalendarObject($subscriptionId, $uri, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION));
+    }
 
-	public function testCalendarMovement(): void {
-		$this->backend->createCalendar(self::UNIT_TEST_USER, 'Example', []);
+    public function testCalendarMovement(): void {
+        $this->backend->createCalendar(self::UNIT_TEST_USER, 'Example', []);
 
-		$this->assertCount(1, $this->backend->getCalendarsForUser(self::UNIT_TEST_USER));
+        $this->assertCount(1, $this->backend->getCalendarsForUser(self::UNIT_TEST_USER));
 
-		$calendarInfoUser = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER)[0];
+        $calendarInfoUser = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER)[0];
 
-		$this->backend->moveCalendar('Example', self::UNIT_TEST_USER, self::UNIT_TEST_USER1);
-		$this->assertCount(0, $this->backend->getCalendarsForUser(self::UNIT_TEST_USER));
-		$this->assertCount(1, $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1));
+        $this->backend->moveCalendar('Example', self::UNIT_TEST_USER, self::UNIT_TEST_USER1);
+        $this->assertCount(0, $this->backend->getCalendarsForUser(self::UNIT_TEST_USER));
+        $this->assertCount(1, $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1));
 
-		$calendarInfoUser1 = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1)[0];
-		$this->assertEquals($calendarInfoUser['id'], $calendarInfoUser1['id']);
-		$this->assertEquals($calendarInfoUser['uri'], $calendarInfoUser1['uri']);
-	}
+        $calendarInfoUser1 = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1)[0];
+        $this->assertEquals($calendarInfoUser['id'], $calendarInfoUser1['id']);
+        $this->assertEquals($calendarInfoUser['uri'], $calendarInfoUser1['uri']);
+    }
 
-	public function testSearchPrincipal(): void {
-		$myPublic = <<<EOD
+    public function testSearchPrincipal(): void {
+        $myPublic = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
@@ -1113,7 +1113,7 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$myPrivate = <<<EOD
+        $myPrivate = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
@@ -1149,7 +1149,7 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$myConfidential = <<<EOD
+        $myConfidential = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
@@ -1186,7 +1186,7 @@ 
 END:VCALENDAR
 EOD;
 
-		$sharerPublic = <<<EOD
+        $sharerPublic = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
@@ -1222,7 +1222,7 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$sharerPrivate = <<<EOD
+        $sharerPrivate = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
@@ -1258,7 +1258,7 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$sharerConfidential = <<<EOD
+        $sharerConfidential = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
@@ -1295,81 +1295,81 @@ 
 END:VCALENDAR
 EOD;
 
-		$l10n = $this->createMock(IL10N::class);
-		$l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
-				return vsprintf($text, $parameters);
-			});
-		$config = $this->createMock(IConfig::class);
-		$this->userManager->expects($this->any())
-			->method('userExists')
-			->willReturn(true);
-		$this->groupManager->expects($this->any())
-			->method('groupExists')
-			->willReturn(true);
-		$this->principal->expects(self::atLeastOnce())
-			->method('findByUri')
-			->willReturn(self::UNIT_TEST_USER);
-
-		$me = self::UNIT_TEST_USER;
-		$sharer = self::UNIT_TEST_USER1;
-		$this->backend->createCalendar($me, 'calendar-uri-me', []);
-		$this->backend->createCalendar($sharer, 'calendar-uri-sharer', []);
-
-		$myCalendars = $this->backend->getCalendarsForUser($me);
-		$this->assertCount(1, $myCalendars);
-
-		$sharerCalendars = $this->backend->getCalendarsForUser($sharer);
-		$this->assertCount(1, $sharerCalendars);
-
-		$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
-		$sharerCalendar = new Calendar($this->backend, $sharerCalendars[0], $l10n, $config, $logger);
-		$this->backend->updateShares($sharerCalendar, [
-			[
-				'href' => 'principal:' . $me,
-				'readOnly' => false,
-			],
-		], []);
-
-		$this->assertCount(2, $this->backend->getCalendarsForUser($me));
-
-		$this->backend->createCalendarObject($myCalendars[0]['id'], 'event0.ics', $myPublic);
-		$this->backend->createCalendarObject($myCalendars[0]['id'], 'event1.ics', $myPrivate);
-		$this->backend->createCalendarObject($myCalendars[0]['id'], 'event2.ics', $myConfidential);
-
-		$this->backend->createCalendarObject($sharerCalendars[0]['id'], 'event3.ics', $sharerPublic);
-		$this->backend->createCalendarObject($sharerCalendars[0]['id'], 'event4.ics', $sharerPrivate);
-		$this->backend->createCalendarObject($sharerCalendars[0]['id'], 'event5.ics', $sharerConfidential);
-
-		$mySearchResults = $this->backend->searchPrincipalUri($me, 'Test', ['VEVENT'], ['SUMMARY'], []);
-		$sharerSearchResults = $this->backend->searchPrincipalUri($sharer, 'Test', ['VEVENT'], ['SUMMARY'], []);
-
-		$this->assertCount(4, $mySearchResults);
-		$this->assertCount(3, $sharerSearchResults);
-
-		$this->assertEquals($myPublic, $mySearchResults[0]['calendardata']);
-		$this->assertEquals($myPrivate, $mySearchResults[1]['calendardata']);
-		$this->assertEquals($myConfidential, $mySearchResults[2]['calendardata']);
-		$this->assertEquals($sharerPublic, $mySearchResults[3]['calendardata']);
-
-		$this->assertEquals($sharerPublic, $sharerSearchResults[0]['calendardata']);
-		$this->assertEquals($sharerPrivate, $sharerSearchResults[1]['calendardata']);
-		$this->assertEquals($sharerConfidential, $sharerSearchResults[2]['calendardata']);
-	}
-
-	/**
-	 * @throws \OCP\DB\Exception
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function testPruneOutdatedSyncTokens(): void {
-		$calendarId = $this->createTestCalendar();
-		$changes = $this->backend->getChangesForCalendar($calendarId, '', 1);
-		$syncToken = $changes['syncToken'];
-
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<EOD
+        $l10n = $this->createMock(IL10N::class);
+        $l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($text, $parameters = []) {
+                return vsprintf($text, $parameters);
+            });
+        $config = $this->createMock(IConfig::class);
+        $this->userManager->expects($this->any())
+            ->method('userExists')
+            ->willReturn(true);
+        $this->groupManager->expects($this->any())
+            ->method('groupExists')
+            ->willReturn(true);
+        $this->principal->expects(self::atLeastOnce())
+            ->method('findByUri')
+            ->willReturn(self::UNIT_TEST_USER);
+
+        $me = self::UNIT_TEST_USER;
+        $sharer = self::UNIT_TEST_USER1;
+        $this->backend->createCalendar($me, 'calendar-uri-me', []);
+        $this->backend->createCalendar($sharer, 'calendar-uri-sharer', []);
+
+        $myCalendars = $this->backend->getCalendarsForUser($me);
+        $this->assertCount(1, $myCalendars);
+
+        $sharerCalendars = $this->backend->getCalendarsForUser($sharer);
+        $this->assertCount(1, $sharerCalendars);
+
+        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $sharerCalendar = new Calendar($this->backend, $sharerCalendars[0], $l10n, $config, $logger);
+        $this->backend->updateShares($sharerCalendar, [
+            [
+                'href' => 'principal:' . $me,
+                'readOnly' => false,
+            ],
+        ], []);
+
+        $this->assertCount(2, $this->backend->getCalendarsForUser($me));
+
+        $this->backend->createCalendarObject($myCalendars[0]['id'], 'event0.ics', $myPublic);
+        $this->backend->createCalendarObject($myCalendars[0]['id'], 'event1.ics', $myPrivate);
+        $this->backend->createCalendarObject($myCalendars[0]['id'], 'event2.ics', $myConfidential);
+
+        $this->backend->createCalendarObject($sharerCalendars[0]['id'], 'event3.ics', $sharerPublic);
+        $this->backend->createCalendarObject($sharerCalendars[0]['id'], 'event4.ics', $sharerPrivate);
+        $this->backend->createCalendarObject($sharerCalendars[0]['id'], 'event5.ics', $sharerConfidential);
+
+        $mySearchResults = $this->backend->searchPrincipalUri($me, 'Test', ['VEVENT'], ['SUMMARY'], []);
+        $sharerSearchResults = $this->backend->searchPrincipalUri($sharer, 'Test', ['VEVENT'], ['SUMMARY'], []);
+
+        $this->assertCount(4, $mySearchResults);
+        $this->assertCount(3, $sharerSearchResults);
+
+        $this->assertEquals($myPublic, $mySearchResults[0]['calendardata']);
+        $this->assertEquals($myPrivate, $mySearchResults[1]['calendardata']);
+        $this->assertEquals($myConfidential, $mySearchResults[2]['calendardata']);
+        $this->assertEquals($sharerPublic, $mySearchResults[3]['calendardata']);
+
+        $this->assertEquals($sharerPublic, $sharerSearchResults[0]['calendardata']);
+        $this->assertEquals($sharerPrivate, $sharerSearchResults[1]['calendardata']);
+        $this->assertEquals($sharerConfidential, $sharerSearchResults[2]['calendardata']);
+    }
+
+    /**
+     * @throws \OCP\DB\Exception
+     * @throws \Sabre\DAV\Exception\BadRequest
+     */
+    public function testPruneOutdatedSyncTokens(): void {
+        $calendarId = $this->createTestCalendar();
+        $changes = $this->backend->getChangesForCalendar($calendarId, '', 1);
+        $syncToken = $changes['syncToken'];
+
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1386,10 +1386,10 @@ 
 END:VCALENDAR
 EOD;
 
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
 
-		// update the card
-		$calData = <<<'EOD'
+        // update the card
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1405,29 +1405,29 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->updateCalendarObject($calendarId, $uri, $calData);
+        $this->backend->updateCalendarObject($calendarId, $uri, $calData);
 
-		// Keep everything
-		$deleted = $this->backend->pruneOutdatedSyncTokens(0, 0);
-		self::assertSame(0, $deleted);
+        // Keep everything
+        $deleted = $this->backend->pruneOutdatedSyncTokens(0, 0);
+        self::assertSame(0, $deleted);
 
-		$deleted = $this->backend->pruneOutdatedSyncTokens(0, time());
-		// At least one from the object creation and one from the object update
-		$this->assertGreaterThanOrEqual(2, $deleted);
-		$changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 1);
-		$this->assertEmpty($changes['added']);
-		$this->assertEmpty($changes['modified']);
-		$this->assertEmpty($changes['deleted']);
+        $deleted = $this->backend->pruneOutdatedSyncTokens(0, time());
+        // At least one from the object creation and one from the object update
+        $this->assertGreaterThanOrEqual(2, $deleted);
+        $changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 1);
+        $this->assertEmpty($changes['added']);
+        $this->assertEmpty($changes['modified']);
+        $this->assertEmpty($changes['deleted']);
 
-		// Test that objects remain
+        // Test that objects remain
 
-		// Currently changes are empty
-		$changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
-		$this->assertEquals(0, count($changes['added'] + $changes['modified'] + $changes['deleted']));
+        // Currently changes are empty
+        $changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
+        $this->assertEquals(0, count($changes['added'] + $changes['modified'] + $changes['deleted']));
 
-		// Create card
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<EOD
+        // Create card
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1443,16 +1443,16 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
 
-		// We now have one add
-		$changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
-		$this->assertEquals(1, count($changes['added']));
-		$this->assertEmpty($changes['modified']);
-		$this->assertEmpty($changes['deleted']);
+        // We now have one add
+        $changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
+        $this->assertEquals(1, count($changes['added']));
+        $this->assertEmpty($changes['modified']);
+        $this->assertEmpty($changes['deleted']);
 
-		// update the card
-		$calData = <<<'EOD'
+        // update the card
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1468,38 +1468,38 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->updateCalendarObject($calendarId, $uri, $calData);
-
-		// One add, one modify, but shortened to modify
-		$changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
-		$this->assertEmpty($changes['added']);
-		$this->assertEquals(1, count($changes['modified']));
-		$this->assertEmpty($changes['deleted']);
-
-		// Delete all but last change
-		$deleted = $this->backend->pruneOutdatedSyncTokens(1, time());
-		$this->assertEquals(1, $deleted); // We had two changes before, now one
-
-		// Only update should remain
-		$changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
-		$this->assertEmpty($changes['added']);
-		$this->assertEquals(1, count($changes['modified']));
-		$this->assertEmpty($changes['deleted']);
-
-		// Check that no crash occurs when prune is called without current changes
-		$deleted = $this->backend->pruneOutdatedSyncTokens(1, time());
-		self::assertSame(0, $deleted);
-	}
-
-	public function testSearchAndExpandRecurrences(): void {
-		$calendarId = $this->createTestCalendar();
-		$calendarInfo = [
-			'id' => $calendarId,
-			'principaluri' => 'user1',
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-		];
-
-		$calData = <<<'EOD'
+        $this->backend->updateCalendarObject($calendarId, $uri, $calData);
+
+        // One add, one modify, but shortened to modify
+        $changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
+        $this->assertEmpty($changes['added']);
+        $this->assertEquals(1, count($changes['modified']));
+        $this->assertEmpty($changes['deleted']);
+
+        // Delete all but last change
+        $deleted = $this->backend->pruneOutdatedSyncTokens(1, time());
+        $this->assertEquals(1, $deleted); // We had two changes before, now one
+
+        // Only update should remain
+        $changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
+        $this->assertEmpty($changes['added']);
+        $this->assertEquals(1, count($changes['modified']));
+        $this->assertEmpty($changes['deleted']);
+
+        // Check that no crash occurs when prune is called without current changes
+        $deleted = $this->backend->pruneOutdatedSyncTokens(1, time());
+        self::assertSame(0, $deleted);
+    }
+
+    public function testSearchAndExpandRecurrences(): void {
+        $calendarId = $this->createTestCalendar();
+        $calendarInfo = [
+            'id' => $calendarId,
+            'principaluri' => 'user1',
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+        ];
+
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 PRODID:-//IDN nextcloud.com//Calendar app 4.5.0-alpha.2//EN
 CALSCALE:GREGORIAN
@@ -1518,50 +1518,50 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$uri = static::getUniqueID('calobj');
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
-
-		$start = new DateTimeImmutable('2023-09-20T00:00:00Z');
-		$end = $start->add(new DateInterval('P14D'));
-
-		$results = $this->backend->search(
-			$calendarInfo,
-			'',
-			[],
-			[
-				'timerange' => [
-					'start' => $start,
-					'end' => $end,
-				]
-			],
-			null,
-			null,
-		);
-
-		$this->assertCount(1, $results);
-		$this->assertCount(14, $results[0]['objects']);
-		foreach ($results as $result) {
-			foreach ($result['objects'] as $object) {
-				$this->assertEquals($object['UID'][0], '7b7d5d12-683c-48ce-973a-b3e1cb0bae2a');
-				$this->assertEquals($object['SUMMARY'][0], 'Daily Event');
-				$this->assertGreaterThanOrEqual(
-					$start->getTimestamp(),
-					$object['DTSTART'][0]->getTimestamp(),
-					'Recurrence starting before requested start',
-				);
-				$this->assertLessThanOrEqual(
-					$end->getTimestamp(),
-					$object['DTSTART'][0]->getTimestamp(),
-					'Recurrence starting after requested end',
-				);
-			}
-		}
-	}
-
-	public function testRestoreChanges(): void {
-		$calendarId = $this->createTestCalendar();
-		$uri1 = static::getUniqueID('calobj1') . '.ics';
-		$calData = <<<EOD
+        $uri = static::getUniqueID('calobj');
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
+
+        $start = new DateTimeImmutable('2023-09-20T00:00:00Z');
+        $end = $start->add(new DateInterval('P14D'));
+
+        $results = $this->backend->search(
+            $calendarInfo,
+            '',
+            [],
+            [
+                'timerange' => [
+                    'start' => $start,
+                    'end' => $end,
+                ]
+            ],
+            null,
+            null,
+        );
+
+        $this->assertCount(1, $results);
+        $this->assertCount(14, $results[0]['objects']);
+        foreach ($results as $result) {
+            foreach ($result['objects'] as $object) {
+                $this->assertEquals($object['UID'][0], '7b7d5d12-683c-48ce-973a-b3e1cb0bae2a');
+                $this->assertEquals($object['SUMMARY'][0], 'Daily Event');
+                $this->assertGreaterThanOrEqual(
+                    $start->getTimestamp(),
+                    $object['DTSTART'][0]->getTimestamp(),
+                    'Recurrence starting before requested start',
+                );
+                $this->assertLessThanOrEqual(
+                    $end->getTimestamp(),
+                    $object['DTSTART'][0]->getTimestamp(),
+                    'Recurrence starting after requested end',
+                );
+            }
+        }
+    }
+
+    public function testRestoreChanges(): void {
+        $calendarId = $this->createTestCalendar();
+        $uri1 = static::getUniqueID('calobj1') . '.ics';
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1577,8 +1577,8 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->createCalendarObject($calendarId, $uri1, $calData);
-		$calData = <<<EOD
+        $this->backend->createCalendarObject($calendarId, $uri1, $calData);
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1595,9 +1595,9 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->updateCalendarObject($calendarId, $uri1, $calData);
-		$uri2 = static::getUniqueID('calobj2') . '.ics';
-		$calData = <<<EOD
+        $this->backend->updateCalendarObject($calendarId, $uri1, $calData);
+        $uri2 = static::getUniqueID('calobj2') . '.ics';
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1613,11 +1613,11 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->createCalendarObject($calendarId, $uri2, $calData);
-		$changesBefore = $this->backend->getChangesForCalendar($calendarId, null, 1);
-		$this->backend->deleteCalendarObject($calendarId, $uri2);
-		$uri3 = static::getUniqueID('calobj3') . '.ics';
-		$calData = <<<EOD
+        $this->backend->createCalendarObject($calendarId, $uri2, $calData);
+        $changesBefore = $this->backend->getChangesForCalendar($calendarId, null, 1);
+        $this->backend->deleteCalendarObject($calendarId, $uri2);
+        $uri3 = static::getUniqueID('calobj3') . '.ics';
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1633,261 +1633,261 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->createCalendarObject($calendarId, $uri3, $calData);
-		$deleteChanges = $this->db->getQueryBuilder();
-		$deleteChanges->delete('calendarchanges')
-			->where($deleteChanges->expr()->eq('calendarid', $deleteChanges->createNamedParameter($calendarId)));
-		$deleteChanges->executeStatement();
-
-		$this->backend->restoreChanges($calendarId);
-
-		$changesAfter = $this->backend->getChangesForCalendar($calendarId, $changesBefore['syncToken'], 1);
-		self::assertEquals([], $changesAfter['added']);
-		self::assertEqualsCanonicalizing([$uri1, $uri3], $changesAfter['modified']);
-		self::assertEquals([$uri2], $changesAfter['deleted']);
-	}
-
-	public function testSearchWithLimitAndTimeRange(): void {
-		$calendarId = $this->createTestCalendar();
-		$calendarInfo = [
-			'id' => $calendarId,
-			'principaluri' => 'user1',
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-		];
-
-		$testFiles = [
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics',
-		];
-
-		foreach ($testFiles as $testFile) {
-			$objectUri = static::getUniqueID('search-limit-timerange-');
-			$calendarData = \file_get_contents($testFile);
-			$this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
-		}
-
-		$start = new DateTimeImmutable('2024-05-06T00:00:00Z');
-		$end = $start->add(new DateInterval('P14D'));
-
-		$results = $this->backend->search(
-			$calendarInfo,
-			'',
-			[],
-			[
-				'timerange' => [
-					'start' => $start,
-					'end' => $end,
-				]
-			],
-			4,
-			null,
-		);
-
-		$this->assertCount(2, $results);
-
-		$this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
-		$this->assertGreaterThanOrEqual(
-			$start->getTimestamp(),
-			$results[0]['objects'][0]['DTSTART'][0]->getTimestamp(),
-			'Recurrence starting before requested start',
-		);
-
-		$this->assertEquals('Pasta Day', $results[1]['objects'][0]['SUMMARY'][0]);
-		$this->assertGreaterThanOrEqual(
-			$start->getTimestamp(),
-			$results[1]['objects'][0]['DTSTART'][0]->getTimestamp(),
-			'Recurrence starting before requested start',
-		);
-	}
-
-	public function testSearchWithLimitAndTimeRangeShouldNotReturnMoreObjectsThenLimit(): void {
-		$calendarId = $this->createTestCalendar();
-		$calendarInfo = [
-			'id' => $calendarId,
-			'principaluri' => 'user1',
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-		];
-
-		$testFiles = [
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics',
-		];
-
-		foreach ($testFiles as $testFile) {
-			$objectUri = static::getUniqueID('search-limit-timerange-');
-			$calendarData = \file_get_contents($testFile);
-			$this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
-		}
-
-		$start = new DateTimeImmutable('2024-05-06T00:00:00Z');
-		$end = $start->add(new DateInterval('P14D'));
-
-		$results = $this->backend->search(
-			$calendarInfo,
-			'',
-			[],
-			[
-				'timerange' => [
-					'start' => $start,
-					'end' => $end,
-				]
-			],
-			1,
-			null,
-		);
-
-		$this->assertCount(1, $results);
-
-		$this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
-		$this->assertGreaterThanOrEqual(
-			$start->getTimestamp(),
-			$results[0]['objects'][0]['DTSTART'][0]->getTimestamp(),
-			'Recurrence starting before requested start',
-		);
-	}
-
-	public function testSearchWithLimitAndTimeRangeShouldReturnObjectsInTheSameOrder(): void {
-		$calendarId = $this->createTestCalendar();
-		$calendarInfo = [
-			'id' => $calendarId,
-			'principaluri' => 'user1',
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-		];
-
-		$testFiles = [
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional!
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
-		];
-
-		foreach ($testFiles as $testFile) {
-			$objectUri = static::getUniqueID('search-limit-timerange-');
-			$calendarData = \file_get_contents($testFile);
-			$this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
-		}
-
-		$start = new DateTimeImmutable('2024-05-06T00:00:00Z');
-		$end = $start->add(new DateInterval('P14D'));
-
-		$results = $this->backend->search(
-			$calendarInfo,
-			'',
-			[],
-			[
-				'timerange' => [
-					'start' => $start,
-					'end' => $end,
-				]
-			],
-			2,
-			null,
-		);
-
-		$this->assertCount(2, $results);
-
-		$this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
-		$this->assertGreaterThanOrEqual(
-			$start->getTimestamp(),
-			$results[0]['objects'][0]['DTSTART'][0]->getTimestamp(),
-			'Recurrence starting before requested start',
-		);
-
-		$this->assertEquals('Pasta Day', $results[1]['objects'][0]['SUMMARY'][0]);
-		$this->assertGreaterThanOrEqual(
-			$start->getTimestamp(),
-			$results[1]['objects'][0]['DTSTART'][0]->getTimestamp(),
-			'Recurrence starting before requested start',
-		);
-	}
-
-	public function testSearchShouldReturnObjectsInTheSameOrderMissingDate(): void {
-		$calendarId = $this->createTestCalendar();
-		$calendarInfo = [
-			'id' => $calendarId,
-			'principaluri' => 'user1',
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-		];
-
-		$testFiles = [
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional!
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-missing-start-1.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-missing-start-2.ics',
-		];
-
-		foreach ($testFiles as $testFile) {
-			$objectUri = static::getUniqueID('search-return-objects-in-same-order-');
-			$calendarData = \file_get_contents($testFile);
-			$this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
-		}
-
-		$results = $this->backend->search(
-			$calendarInfo,
-			'',
-			[],
-			[],
-			4,
-			null,
-		);
-
-		$this->assertCount(4, $results);
-
-		$this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
-		$this->assertEquals('Pasta Day', $results[1]['objects'][0]['SUMMARY'][0]);
-		$this->assertEquals('Missing DTSTART 1', $results[2]['objects'][0]['SUMMARY'][0]);
-		$this->assertEquals('Missing DTSTART 2', $results[3]['objects'][0]['SUMMARY'][0]);
-	}
-
-	public function testUnshare(): void {
-		$principalGroup = 'principal:' . self::UNIT_TEST_GROUP;
-		$principalUser = 'principal:' . self::UNIT_TEST_USER;
-
-		$l10n = $this->createMock(IL10N::class);
-		$l10n->method('t')
-			->willReturnCallback(fn ($text, $parameters = []) => vsprintf($text, $parameters));
-		$config = $this->createMock(IConfig::class);
-		$logger = new NullLogger();
-
-		$this->principal->expects($this->exactly(2))
-			->method('findByUri')
-			->willReturnMap([
-				[$principalGroup, '', self::UNIT_TEST_GROUP],
-				[$principalUser, '', self::UNIT_TEST_USER],
-			]);
-		$this->groupManager->expects($this->once())
-			->method('groupExists')
-			->willReturn(true);
-		$this->dispatcher->expects($this->exactly(2))
-			->method('dispatchTyped');
-
-		$calendarId = $this->createTestCalendar();
-		$calendarInfo = $this->backend->getCalendarById($calendarId);
-
-		$calendar = new Calendar($this->backend, $calendarInfo, $l10n, $config, $logger);
-
-		$this->backend->updateShares(
-			shareable: $calendar,
-			add: [
-				['href' => $principalGroup, 'readOnly' => false]
-			],
-			remove: []
-		);
-
-		$this->backend->unshare(
-			shareable: $calendar,
-			principal: $principalUser
-		);
-
-	}
+        $this->backend->createCalendarObject($calendarId, $uri3, $calData);
+        $deleteChanges = $this->db->getQueryBuilder();
+        $deleteChanges->delete('calendarchanges')
+            ->where($deleteChanges->expr()->eq('calendarid', $deleteChanges->createNamedParameter($calendarId)));
+        $deleteChanges->executeStatement();
+
+        $this->backend->restoreChanges($calendarId);
+
+        $changesAfter = $this->backend->getChangesForCalendar($calendarId, $changesBefore['syncToken'], 1);
+        self::assertEquals([], $changesAfter['added']);
+        self::assertEqualsCanonicalizing([$uri1, $uri3], $changesAfter['modified']);
+        self::assertEquals([$uri2], $changesAfter['deleted']);
+    }
+
+    public function testSearchWithLimitAndTimeRange(): void {
+        $calendarId = $this->createTestCalendar();
+        $calendarInfo = [
+            'id' => $calendarId,
+            'principaluri' => 'user1',
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+        ];
+
+        $testFiles = [
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics',
+        ];
+
+        foreach ($testFiles as $testFile) {
+            $objectUri = static::getUniqueID('search-limit-timerange-');
+            $calendarData = \file_get_contents($testFile);
+            $this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
+        }
+
+        $start = new DateTimeImmutable('2024-05-06T00:00:00Z');
+        $end = $start->add(new DateInterval('P14D'));
+
+        $results = $this->backend->search(
+            $calendarInfo,
+            '',
+            [],
+            [
+                'timerange' => [
+                    'start' => $start,
+                    'end' => $end,
+                ]
+            ],
+            4,
+            null,
+        );
+
+        $this->assertCount(2, $results);
+
+        $this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
+        $this->assertGreaterThanOrEqual(
+            $start->getTimestamp(),
+            $results[0]['objects'][0]['DTSTART'][0]->getTimestamp(),
+            'Recurrence starting before requested start',
+        );
+
+        $this->assertEquals('Pasta Day', $results[1]['objects'][0]['SUMMARY'][0]);
+        $this->assertGreaterThanOrEqual(
+            $start->getTimestamp(),
+            $results[1]['objects'][0]['DTSTART'][0]->getTimestamp(),
+            'Recurrence starting before requested start',
+        );
+    }
+
+    public function testSearchWithLimitAndTimeRangeShouldNotReturnMoreObjectsThenLimit(): void {
+        $calendarId = $this->createTestCalendar();
+        $calendarInfo = [
+            'id' => $calendarId,
+            'principaluri' => 'user1',
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+        ];
+
+        $testFiles = [
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics',
+        ];
+
+        foreach ($testFiles as $testFile) {
+            $objectUri = static::getUniqueID('search-limit-timerange-');
+            $calendarData = \file_get_contents($testFile);
+            $this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
+        }
+
+        $start = new DateTimeImmutable('2024-05-06T00:00:00Z');
+        $end = $start->add(new DateInterval('P14D'));
+
+        $results = $this->backend->search(
+            $calendarInfo,
+            '',
+            [],
+            [
+                'timerange' => [
+                    'start' => $start,
+                    'end' => $end,
+                ]
+            ],
+            1,
+            null,
+        );
+
+        $this->assertCount(1, $results);
+
+        $this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
+        $this->assertGreaterThanOrEqual(
+            $start->getTimestamp(),
+            $results[0]['objects'][0]['DTSTART'][0]->getTimestamp(),
+            'Recurrence starting before requested start',
+        );
+    }
+
+    public function testSearchWithLimitAndTimeRangeShouldReturnObjectsInTheSameOrder(): void {
+        $calendarId = $this->createTestCalendar();
+        $calendarInfo = [
+            'id' => $calendarId,
+            'principaluri' => 'user1',
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+        ];
+
+        $testFiles = [
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional!
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
+        ];
+
+        foreach ($testFiles as $testFile) {
+            $objectUri = static::getUniqueID('search-limit-timerange-');
+            $calendarData = \file_get_contents($testFile);
+            $this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
+        }
+
+        $start = new DateTimeImmutable('2024-05-06T00:00:00Z');
+        $end = $start->add(new DateInterval('P14D'));
+
+        $results = $this->backend->search(
+            $calendarInfo,
+            '',
+            [],
+            [
+                'timerange' => [
+                    'start' => $start,
+                    'end' => $end,
+                ]
+            ],
+            2,
+            null,
+        );
+
+        $this->assertCount(2, $results);
+
+        $this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
+        $this->assertGreaterThanOrEqual(
+            $start->getTimestamp(),
+            $results[0]['objects'][0]['DTSTART'][0]->getTimestamp(),
+            'Recurrence starting before requested start',
+        );
+
+        $this->assertEquals('Pasta Day', $results[1]['objects'][0]['SUMMARY'][0]);
+        $this->assertGreaterThanOrEqual(
+            $start->getTimestamp(),
+            $results[1]['objects'][0]['DTSTART'][0]->getTimestamp(),
+            'Recurrence starting before requested start',
+        );
+    }
+
+    public function testSearchShouldReturnObjectsInTheSameOrderMissingDate(): void {
+        $calendarId = $this->createTestCalendar();
+        $calendarInfo = [
+            'id' => $calendarId,
+            'principaluri' => 'user1',
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+        ];
+
+        $testFiles = [
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional!
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-missing-start-1.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-missing-start-2.ics',
+        ];
+
+        foreach ($testFiles as $testFile) {
+            $objectUri = static::getUniqueID('search-return-objects-in-same-order-');
+            $calendarData = \file_get_contents($testFile);
+            $this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
+        }
+
+        $results = $this->backend->search(
+            $calendarInfo,
+            '',
+            [],
+            [],
+            4,
+            null,
+        );
+
+        $this->assertCount(4, $results);
+
+        $this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
+        $this->assertEquals('Pasta Day', $results[1]['objects'][0]['SUMMARY'][0]);
+        $this->assertEquals('Missing DTSTART 1', $results[2]['objects'][0]['SUMMARY'][0]);
+        $this->assertEquals('Missing DTSTART 2', $results[3]['objects'][0]['SUMMARY'][0]);
+    }
+
+    public function testUnshare(): void {
+        $principalGroup = 'principal:' . self::UNIT_TEST_GROUP;
+        $principalUser = 'principal:' . self::UNIT_TEST_USER;
+
+        $l10n = $this->createMock(IL10N::class);
+        $l10n->method('t')
+            ->willReturnCallback(fn ($text, $parameters = []) => vsprintf($text, $parameters));
+        $config = $this->createMock(IConfig::class);
+        $logger = new NullLogger();
+
+        $this->principal->expects($this->exactly(2))
+            ->method('findByUri')
+            ->willReturnMap([
+                [$principalGroup, '', self::UNIT_TEST_GROUP],
+                [$principalUser, '', self::UNIT_TEST_USER],
+            ]);
+        $this->groupManager->expects($this->once())
+            ->method('groupExists')
+            ->willReturn(true);
+        $this->dispatcher->expects($this->exactly(2))
+            ->method('dispatchTyped');
+
+        $calendarId = $this->createTestCalendar();
+        $calendarInfo = $this->backend->getCalendarById($calendarId);
+
+        $calendar = new Calendar($this->backend, $calendarInfo, $l10n, $config, $logger);
+
+        $this->backend->updateShares(
+            shareable: $calendar,
+            add: [
+                ['href' => $principalGroup, 'readOnly' => false]
+            ],
+            remove: []
+        );
+
+        $this->backend->unshare(
+            shareable: $calendar,
+            principal: $principalUser
+        );
+
+    }
 }

apps/dav/tests/unit/CalDAV/TipBrokerTest.php

Indentation +163 added lines, -163 removed lines

@@ -13,168 +13,168 @@
 
 class TipBrokerTest extends TestCase {
 
-	private TipBroker $broker;
-	private VCalendar $vCalendar1a;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->broker = new TipBroker();
-		// construct calendar with a 1 hour event and same start/end time zones
-		$this->vCalendar1a = new VCalendar();
-		/** @var VEvent $vEvent */
-		$vEvent = $this->vCalendar1a->add('VEVENT', []);
-		$vEvent->add('UID', '96a0e6b1-d886-4a55-a60d-152b31401dcc');
-		$vEvent->add('DTSTAMP', '20240701T000000Z');
-		$vEvent->add('CREATED', '20240701T000000Z');
-		$vEvent->add('LAST-MODIFIED', '20240701T000000Z');
-		$vEvent->add('SEQUENCE', '1');
-		$vEvent->add('STATUS', 'CONFIRMED');
-		$vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('SUMMARY', 'Test Event');
-		$vEvent->add('ORGANIZER', 'mailto:organizer@testing.com', ['CN' => 'Organizer']);
-		$vEvent->add('ATTENDEE', 'mailto:attendee1@testing.com', [
-			'CN' => 'Attendee One',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-	}
-
-	public function testParseEventForOrganizerOnCreate(): void {
-
-		// construct calendar and generate event info for newly created event with one attendee
-		$calendar = clone $this->vCalendar1a;
-		$previousEventInfo = [
-			'organizer' => null,
-			'significantChangeHash' => '',
-			'attendees' => [],
-		];
-		$currentEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
-		// test iTip generation
-		$messages = $this->invokePrivate($this->broker, 'parseEventForOrganizer', [$calendar, $currentEventInfo, $previousEventInfo]);
-		$this->assertCount(1, $messages);
-		$this->assertEquals('REQUEST', $messages[0]->method);
-		$this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[0]->sender);
-		$this->assertEquals($calendar->VEVENT->ATTENDEE[0]->getValue(), $messages[0]->recipient);
-
-	}
-
-	public function testParseEventForOrganizerOnModify(): void {
-
-		// construct calendar and generate event info for modified event with one attendee
-		$calendar = clone $this->vCalendar1a;
-		$previousEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
-		$calendar->VEVENT->{'LAST-MODIFIED'}->setValue('20240701T020000Z');
-		$calendar->VEVENT->SEQUENCE->setValue(2);
-		$calendar->VEVENT->SUMMARY->setValue('Test Event Modified');
-		$currentEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
-		// test iTip generation
-		$messages = $this->invokePrivate($this->broker, 'parseEventForOrganizer', [$calendar, $currentEventInfo, $previousEventInfo]);
-		$this->assertCount(1, $messages);
-		$this->assertEquals('REQUEST', $messages[0]->method);
-		$this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[0]->sender);
-		$this->assertEquals($calendar->VEVENT->ATTENDEE[0]->getValue(), $messages[0]->recipient);
-
-	}
-
-	public function testParseEventForOrganizerOnDelete(): void {
-
-		// construct calendar and generate event info for modified event with one attendee
-		$calendar = clone $this->vCalendar1a;
-		$previousEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
-		$currentEventInfo = $previousEventInfo;
-		$currentEventInfo['attendees'] = [];
-		++$currentEventInfo['sequence'];
-		// test iTip generation
-		$messages = $this->invokePrivate($this->broker, 'parseEventForOrganizer', [$calendar, $currentEventInfo, $previousEventInfo]);
-		$this->assertCount(1, $messages);
-		$this->assertEquals('CANCEL', $messages[0]->method);
-		$this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[0]->sender);
-		$this->assertEquals($calendar->VEVENT->ATTENDEE[0]->getValue(), $messages[0]->recipient);
-
-	}
-
-	public function testParseEventForOrganizerOnStatusCancelled(): void {
-
-		// construct calendar and generate event info for modified event with one attendee
-		$calendar = clone $this->vCalendar1a;
-		$previousEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
-		$calendar->VEVENT->{'LAST-MODIFIED'}->setValue('20240701T020000Z');
-		$calendar->VEVENT->SEQUENCE->setValue(2);
-		$calendar->VEVENT->STATUS->setValue('CANCELLED');
-		$currentEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
-		// test iTip generation
-		$messages = $this->invokePrivate($this->broker, 'parseEventForOrganizer', [$calendar, $currentEventInfo, $previousEventInfo]);
-		$this->assertCount(1, $messages);
-		$this->assertEquals('CANCEL', $messages[0]->method);
-		$this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[0]->sender);
-		$this->assertEquals($calendar->VEVENT->ATTENDEE[0]->getValue(), $messages[0]->recipient);
-
-	}
-
-	public function testParseEventForOrganizerOnAddAttendee(): void {
-
-		// construct calendar and generate event info for modified event with two attendees
-		$calendar = clone $this->vCalendar1a;
-		$previousEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
-		$calendar->VEVENT->{'LAST-MODIFIED'}->setValue('20240701T020000Z');
-		$calendar->VEVENT->SEQUENCE->setValue(2);
-		$calendar->VEVENT->add('ATTENDEE', 'mailto:attendee2@testing.com', [
-			'CN' => 'Attendee Two',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-		$currentEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
-		// test iTip generation
-		$messages = $this->invokePrivate($this->broker, 'parseEventForOrganizer', [$calendar, $currentEventInfo, $previousEventInfo]);
-		$this->assertCount(2, $messages);
-		$this->assertEquals('REQUEST', $messages[0]->method);
-		$this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[0]->sender);
-		$this->assertEquals($calendar->VEVENT->ATTENDEE[0]->getValue(), $messages[0]->recipient);
-		$this->assertEquals('REQUEST', $messages[1]->method);
-		$this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[1]->sender);
-		$this->assertEquals($calendar->VEVENT->ATTENDEE[1]->getValue(), $messages[1]->recipient);
-
-	}
-
-	public function testParseEventForOrganizerOnRemoveAttendee(): void {
-
-		// construct calendar and generate event info for modified event with two attendees
-		$calendar = clone $this->vCalendar1a;
-		$calendar->VEVENT->add('ATTENDEE', 'mailto:attendee2@testing.com', [
-			'CN' => 'Attendee Two',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-		$previousEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
-		$calendar->VEVENT->{'LAST-MODIFIED'}->setValue('20240701T020000Z');
-		$calendar->VEVENT->SEQUENCE->setValue(2);
-		$calendar->VEVENT->remove('ATTENDEE');
-		$calendar->VEVENT->add('ATTENDEE', 'mailto:attendee1@testing.com', [
-			'CN' => 'Attendee One',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-		$currentEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
-		// test iTip generation
-		$messages = $this->invokePrivate($this->broker, 'parseEventForOrganizer', [$calendar, $currentEventInfo, $previousEventInfo]);
-		$this->assertCount(2, $messages);
-		$this->assertEquals('REQUEST', $messages[0]->method);
-		$this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[0]->sender);
-		$this->assertEquals($calendar->VEVENT->ATTENDEE[0]->getValue(), $messages[0]->recipient);
-		$this->assertEquals('CANCEL', $messages[1]->method);
-		$this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[1]->sender);
-		$this->assertEquals('mailto:attendee2@testing.com', $messages[1]->recipient);
-
-	}
+    private TipBroker $broker;
+    private VCalendar $vCalendar1a;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->broker = new TipBroker();
+        // construct calendar with a 1 hour event and same start/end time zones
+        $this->vCalendar1a = new VCalendar();
+        /** @var VEvent $vEvent */
+        $vEvent = $this->vCalendar1a->add('VEVENT', []);
+        $vEvent->add('UID', '96a0e6b1-d886-4a55-a60d-152b31401dcc');
+        $vEvent->add('DTSTAMP', '20240701T000000Z');
+        $vEvent->add('CREATED', '20240701T000000Z');
+        $vEvent->add('LAST-MODIFIED', '20240701T000000Z');
+        $vEvent->add('SEQUENCE', '1');
+        $vEvent->add('STATUS', 'CONFIRMED');
+        $vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('SUMMARY', 'Test Event');
+        $vEvent->add('ORGANIZER', 'mailto:organizer@testing.com', ['CN' => 'Organizer']);
+        $vEvent->add('ATTENDEE', 'mailto:attendee1@testing.com', [
+            'CN' => 'Attendee One',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+    }
+
+    public function testParseEventForOrganizerOnCreate(): void {
+
+        // construct calendar and generate event info for newly created event with one attendee
+        $calendar = clone $this->vCalendar1a;
+        $previousEventInfo = [
+            'organizer' => null,
+            'significantChangeHash' => '',
+            'attendees' => [],
+        ];
+        $currentEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
+        // test iTip generation
+        $messages = $this->invokePrivate($this->broker, 'parseEventForOrganizer', [$calendar, $currentEventInfo, $previousEventInfo]);
+        $this->assertCount(1, $messages);
+        $this->assertEquals('REQUEST', $messages[0]->method);
+        $this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[0]->sender);
+        $this->assertEquals($calendar->VEVENT->ATTENDEE[0]->getValue(), $messages[0]->recipient);
+
+    }
+
+    public function testParseEventForOrganizerOnModify(): void {
+
+        // construct calendar and generate event info for modified event with one attendee
+        $calendar = clone $this->vCalendar1a;
+        $previousEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
+        $calendar->VEVENT->{'LAST-MODIFIED'}->setValue('20240701T020000Z');
+        $calendar->VEVENT->SEQUENCE->setValue(2);
+        $calendar->VEVENT->SUMMARY->setValue('Test Event Modified');
+        $currentEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
+        // test iTip generation
+        $messages = $this->invokePrivate($this->broker, 'parseEventForOrganizer', [$calendar, $currentEventInfo, $previousEventInfo]);
+        $this->assertCount(1, $messages);
+        $this->assertEquals('REQUEST', $messages[0]->method);
+        $this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[0]->sender);
+        $this->assertEquals($calendar->VEVENT->ATTENDEE[0]->getValue(), $messages[0]->recipient);
+
+    }
+
+    public function testParseEventForOrganizerOnDelete(): void {
+
+        // construct calendar and generate event info for modified event with one attendee
+        $calendar = clone $this->vCalendar1a;
+        $previousEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
+        $currentEventInfo = $previousEventInfo;
+        $currentEventInfo['attendees'] = [];
+        ++$currentEventInfo['sequence'];
+        // test iTip generation
+        $messages = $this->invokePrivate($this->broker, 'parseEventForOrganizer', [$calendar, $currentEventInfo, $previousEventInfo]);
+        $this->assertCount(1, $messages);
+        $this->assertEquals('CANCEL', $messages[0]->method);
+        $this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[0]->sender);
+        $this->assertEquals($calendar->VEVENT->ATTENDEE[0]->getValue(), $messages[0]->recipient);
+
+    }
+
+    public function testParseEventForOrganizerOnStatusCancelled(): void {
+
+        // construct calendar and generate event info for modified event with one attendee
+        $calendar = clone $this->vCalendar1a;
+        $previousEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
+        $calendar->VEVENT->{'LAST-MODIFIED'}->setValue('20240701T020000Z');
+        $calendar->VEVENT->SEQUENCE->setValue(2);
+        $calendar->VEVENT->STATUS->setValue('CANCELLED');
+        $currentEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
+        // test iTip generation
+        $messages = $this->invokePrivate($this->broker, 'parseEventForOrganizer', [$calendar, $currentEventInfo, $previousEventInfo]);
+        $this->assertCount(1, $messages);
+        $this->assertEquals('CANCEL', $messages[0]->method);
+        $this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[0]->sender);
+        $this->assertEquals($calendar->VEVENT->ATTENDEE[0]->getValue(), $messages[0]->recipient);
+
+    }
+
+    public function testParseEventForOrganizerOnAddAttendee(): void {
+
+        // construct calendar and generate event info for modified event with two attendees
+        $calendar = clone $this->vCalendar1a;
+        $previousEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
+        $calendar->VEVENT->{'LAST-MODIFIED'}->setValue('20240701T020000Z');
+        $calendar->VEVENT->SEQUENCE->setValue(2);
+        $calendar->VEVENT->add('ATTENDEE', 'mailto:attendee2@testing.com', [
+            'CN' => 'Attendee Two',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+        $currentEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
+        // test iTip generation
+        $messages = $this->invokePrivate($this->broker, 'parseEventForOrganizer', [$calendar, $currentEventInfo, $previousEventInfo]);
+        $this->assertCount(2, $messages);
+        $this->assertEquals('REQUEST', $messages[0]->method);
+        $this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[0]->sender);
+        $this->assertEquals($calendar->VEVENT->ATTENDEE[0]->getValue(), $messages[0]->recipient);
+        $this->assertEquals('REQUEST', $messages[1]->method);
+        $this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[1]->sender);
+        $this->assertEquals($calendar->VEVENT->ATTENDEE[1]->getValue(), $messages[1]->recipient);
+
+    }
+
+    public function testParseEventForOrganizerOnRemoveAttendee(): void {
+
+        // construct calendar and generate event info for modified event with two attendees
+        $calendar = clone $this->vCalendar1a;
+        $calendar->VEVENT->add('ATTENDEE', 'mailto:attendee2@testing.com', [
+            'CN' => 'Attendee Two',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+        $previousEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
+        $calendar->VEVENT->{'LAST-MODIFIED'}->setValue('20240701T020000Z');
+        $calendar->VEVENT->SEQUENCE->setValue(2);
+        $calendar->VEVENT->remove('ATTENDEE');
+        $calendar->VEVENT->add('ATTENDEE', 'mailto:attendee1@testing.com', [
+            'CN' => 'Attendee One',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+        $currentEventInfo = $this->invokePrivate($this->broker, 'parseEventInfo', [$calendar]);
+        // test iTip generation
+        $messages = $this->invokePrivate($this->broker, 'parseEventForOrganizer', [$calendar, $currentEventInfo, $previousEventInfo]);
+        $this->assertCount(2, $messages);
+        $this->assertEquals('REQUEST', $messages[0]->method);
+        $this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[0]->sender);
+        $this->assertEquals($calendar->VEVENT->ATTENDEE[0]->getValue(), $messages[0]->recipient);
+        $this->assertEquals('CANCEL', $messages[1]->method);
+        $this->assertEquals($calendar->VEVENT->ORGANIZER->getValue(), $messages[1]->sender);
+        $this->assertEquals('mailto:attendee2@testing.com', $messages[1]->recipient);
+
+    }
 
 }

apps/dav/tests/unit/CalDAV/EventComparisonServiceTest.php

Indentation +169 added lines, -169 removed lines

@@ -14,175 +14,175 @@
 use Test\TestCase;
 
 class EventComparisonServiceTest extends TestCase {
-	private EventComparisonService $eventComparisonService;
-
-	protected function setUp(): void {
-		$this->eventComparisonService = new EventComparisonService();
-	}
-
-	public function testNoModifiedEvent(): void {
-		$vCalendarOld = new VCalendar();
-		$vCalendarNew = new VCalendar();
-
-		$vEventOld = $vCalendarOld->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
-		]);
-		$vEventOld->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$vEventOld->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-
-		$vEventNew = $vCalendarNew->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
-		]);
-		$vEventNew->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$vEventNew->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-
-		$result = $this->eventComparisonService->findModified($vCalendarNew, $vCalendarOld);
-		$this->assertEmpty($result['old']);
-		$this->assertEmpty($result['new']);
-	}
-
-	public function testNewEvent(): void {
-		$vCalendarOld = null;
-		$vCalendarNew = new VCalendar();
-
-		$vEventNew = $vCalendarNew->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
-		]);
-		$vEventNew->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$vEventNew->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-
-		$result = $this->eventComparisonService->findModified($vCalendarNew, $vCalendarOld);
-		$this->assertNull($result['old']);
-		$this->assertEquals([$vEventNew], $result['new']);
-	}
-
-	public function testModifiedUnmodifiedEvent(): void {
-		$vCalendarOld = new VCalendar();
-		$vCalendarNew = new VCalendar();
-
-		$vEventOld1 = $vCalendarOld->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-		]);
-		$vEventOld1->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$vEventOld1->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-
-		$vEventOld2 = $vCalendarOld->add('VEVENT', [
-			'UID' => 'uid-1235',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-		]);
-		$vEventOld2->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$vEventOld2->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-
-		$vEventNew1 = $vCalendarNew->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-		]);
-		$vEventNew1->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$vEventNew1->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-
-		$vEventNew2 = $vCalendarNew->add('VEVENT', [
-			'UID' => 'uid-1235',
-			'LAST-MODIFIED' => 123457,
-			'SEQUENCE' => 3,
-			'SUMMARY' => 'Fellowship meeting 2',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-		]);
-		$vEventNew2->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$vEventNew2->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-
-		$result = $this->eventComparisonService->findModified($vCalendarNew, $vCalendarOld);
-		$this->assertEquals([$vEventOld2], $result['old']);
-		$this->assertEquals([$vEventNew2], $result['new']);
-	}
-
-	// First test to certify fix for issue nextcloud/server#41084
-	public function testSequenceNumberIncrementDetectedForFirstModificationToEventWithoutZeroInit(): void {
-		$vCalendarOld = new VCalendar();
-		$vCalendarNew = new VCalendar();
-
-		$vEventOld = $vCalendarOld->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			// 'SEQUENCE' => 0,			// sequence number may not be set to zero during event creation and instead fully omitted
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
-		]);
-		$vEventOld->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$vEventOld->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-
-		$vEventNew = $vCalendarNew->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 1,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
-		]);
-		$vEventNew->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$vEventNew->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-
-		$result = $this->eventComparisonService->findModified($vCalendarNew, $vCalendarOld);
-		$this->assertEquals([$vEventOld], $result['old']);
-		$this->assertEquals([$vEventNew], $result['new']);
-	}
-
-	// Second test to certify fix for issue nextcloud/server#41084
-	public function testSequenceNumberIncrementDetectedForFirstModificationToEventWithZeroInit(): void {
-		$vCalendarOld = new VCalendar();
-		$vCalendarNew = new VCalendar();
-
-		$vEventOld = $vCalendarOld->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 0,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
-		]);
-		$vEventOld->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$vEventOld->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-
-		$vEventNew = $vCalendarNew->add('VEVENT', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 1,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
-		]);
-		$vEventNew->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$vEventNew->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-
-		$result = $this->eventComparisonService->findModified($vCalendarNew, $vCalendarOld);
-		$this->assertEquals([$vEventOld], $result['old']);
-		$this->assertEquals([$vEventNew], $result['new']);
-	}
+    private EventComparisonService $eventComparisonService;
+
+    protected function setUp(): void {
+        $this->eventComparisonService = new EventComparisonService();
+    }
+
+    public function testNoModifiedEvent(): void {
+        $vCalendarOld = new VCalendar();
+        $vCalendarNew = new VCalendar();
+
+        $vEventOld = $vCalendarOld->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
+        ]);
+        $vEventOld->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $vEventOld->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+
+        $vEventNew = $vCalendarNew->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
+        ]);
+        $vEventNew->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $vEventNew->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+
+        $result = $this->eventComparisonService->findModified($vCalendarNew, $vCalendarOld);
+        $this->assertEmpty($result['old']);
+        $this->assertEmpty($result['new']);
+    }
+
+    public function testNewEvent(): void {
+        $vCalendarOld = null;
+        $vCalendarNew = new VCalendar();
+
+        $vEventNew = $vCalendarNew->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
+        ]);
+        $vEventNew->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $vEventNew->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+
+        $result = $this->eventComparisonService->findModified($vCalendarNew, $vCalendarOld);
+        $this->assertNull($result['old']);
+        $this->assertEquals([$vEventNew], $result['new']);
+    }
+
+    public function testModifiedUnmodifiedEvent(): void {
+        $vCalendarOld = new VCalendar();
+        $vCalendarNew = new VCalendar();
+
+        $vEventOld1 = $vCalendarOld->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+        ]);
+        $vEventOld1->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $vEventOld1->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+
+        $vEventOld2 = $vCalendarOld->add('VEVENT', [
+            'UID' => 'uid-1235',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+        ]);
+        $vEventOld2->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $vEventOld2->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+
+        $vEventNew1 = $vCalendarNew->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+        ]);
+        $vEventNew1->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $vEventNew1->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+
+        $vEventNew2 = $vCalendarNew->add('VEVENT', [
+            'UID' => 'uid-1235',
+            'LAST-MODIFIED' => 123457,
+            'SEQUENCE' => 3,
+            'SUMMARY' => 'Fellowship meeting 2',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+        ]);
+        $vEventNew2->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $vEventNew2->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+
+        $result = $this->eventComparisonService->findModified($vCalendarNew, $vCalendarOld);
+        $this->assertEquals([$vEventOld2], $result['old']);
+        $this->assertEquals([$vEventNew2], $result['new']);
+    }
+
+    // First test to certify fix for issue nextcloud/server#41084
+    public function testSequenceNumberIncrementDetectedForFirstModificationToEventWithoutZeroInit(): void {
+        $vCalendarOld = new VCalendar();
+        $vCalendarNew = new VCalendar();
+
+        $vEventOld = $vCalendarOld->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            // 'SEQUENCE' => 0,			// sequence number may not be set to zero during event creation and instead fully omitted
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
+        ]);
+        $vEventOld->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $vEventOld->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+
+        $vEventNew = $vCalendarNew->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 1,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
+        ]);
+        $vEventNew->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $vEventNew->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+
+        $result = $this->eventComparisonService->findModified($vCalendarNew, $vCalendarOld);
+        $this->assertEquals([$vEventOld], $result['old']);
+        $this->assertEquals([$vEventNew], $result['new']);
+    }
+
+    // Second test to certify fix for issue nextcloud/server#41084
+    public function testSequenceNumberIncrementDetectedForFirstModificationToEventWithZeroInit(): void {
+        $vCalendarOld = new VCalendar();
+        $vCalendarNew = new VCalendar();
+
+        $vEventOld = $vCalendarOld->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 0,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
+        ]);
+        $vEventOld->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $vEventOld->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+
+        $vEventNew = $vCalendarNew->add('VEVENT', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 1,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z',
+        ]);
+        $vEventNew->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $vEventNew->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+
+        $result = $this->eventComparisonService->findModified($vCalendarNew, $vCalendarOld);
+        $this->assertEquals([$vEventOld], $result['old']);
+        $this->assertEquals([$vEventNew], $result['new']);
+    }
 
 
 }

apps/dav/tests/unit/CalDAV/Reminder/NotifierTest.php

Indentation +241 added lines, -241 removed lines

@@ -21,245 +21,245 @@
 use Test\TestCase;
 
 class NotifierTest extends TestCase {
-	protected IFactory&MockObject $factory;
-	protected IURLGenerator&MockObject $urlGenerator;
-	protected IL10N&MockObject $l10n;
-	protected ITimeFactory&MockObject $timeFactory;
-	protected Notifier $notifier;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->l10n->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($string, $args) {
-				if (!is_array($args)) {
-					$args = [$args];
-				}
-				return vsprintf($string, $args);
-			});
-		$this->l10n->expects($this->any())
-			->method('l')
-			->willReturnCallback(function ($string, $args) {
-				/** \DateTime $args */
-				return $args->format(\DateTime::ATOM);
-			});
-		$this->l10n->expects($this->any())
-			->method('n')
-			->willReturnCallback(function ($textSingular, $textPlural, $count, $args) {
-				$text = $count === 1 ? $textSingular : $textPlural;
-				$text = str_replace('%n', (string)$count, $text);
-				return vsprintf($text, $args);
-			});
-		$this->factory = $this->createMock(IFactory::class);
-		$this->factory->expects($this->any())
-			->method('get')
-			->willReturn($this->l10n);
-
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->timeFactory
-			->method('getDateTime')
-			->willReturn(\DateTime::createFromFormat(\DateTime::ATOM, '2005-08-15T14:00:00+02:00'));
-
-		$this->notifier = new Notifier(
-			$this->factory,
-			$this->urlGenerator,
-			$this->timeFactory
-		);
-	}
-
-	public function testGetId():void {
-		$this->assertEquals($this->notifier->getID(), 'dav');
-	}
-
-	public function testGetName():void {
-		$this->assertEquals($this->notifier->getName(), 'Calendar');
-	}
-
-
-	public function testPrepareWrongApp(): void {
-		$this->expectException(UnknownNotificationException::class);
-		$this->expectExceptionMessage('Notification not from this app');
-
-		/** @var INotification&MockObject $notification */
-		$notification = $this->createMock(INotification::class);
-
-		$notification->expects($this->once())
-			->method('getApp')
-			->willReturn('notifications');
-		$notification->expects($this->never())
-			->method('getSubject');
-
-		$this->notifier->prepare($notification, 'en');
-	}
-
-
-	public function testPrepareWrongSubject(): void {
-		$this->expectException(UnknownNotificationException::class);
-		$this->expectExceptionMessage('Unknown subject');
-
-		/** @var INotification&MockObject $notification */
-		$notification = $this->createMock(INotification::class);
-
-		$notification->expects($this->once())
-			->method('getApp')
-			->willReturn(Application::APP_ID);
-		$notification->expects($this->once())
-			->method('getSubject')
-			->willReturn('wrong subject');
-
-		$this->notifier->prepare($notification, 'en');
-	}
-
-	private static function hasPhpDatetimeDiffBug(): bool {
-		$d1 = \DateTime::createFromFormat(\DateTimeInterface::ATOM, '2023-11-22T11:52:00+01:00');
-		$d2 = new \DateTime('2023-11-22T10:52:03', new \DateTimeZone('UTC'));
-
-		// The difference is 3 seconds, not -1year+11months+…
-		return $d1->diff($d2)->y < 0;
-	}
-
-	public static function dataPrepare(): array {
-		return [
-			[
-				'calendar_reminder',
-				[
-					'title' => 'Title of this event',
-					'start_atom' => '2005-08-15T15:52:01+02:00'
-				],
-				self::hasPhpDatetimeDiffBug() ? 'Title of this event' : 'Title of this event (in 1 hour, 52 minutes)',
-				[
-					'title' => 'Title of this event',
-					'description' => null,
-					'location' => 'NC Headquarters',
-					'all_day' => false,
-					'start_atom' => '2005-08-15T15:52:01+02:00',
-					'start_is_floating' => false,
-					'start_timezone' => 'Europe/Berlin',
-					'end_atom' => '2005-08-15T17:52:01+02:00',
-					'end_is_floating' => false,
-					'end_timezone' => 'Europe/Berlin',
-					'calendar_displayname' => 'Personal',
-				],
-				"Calendar: Personal\r\nDate: 2005-08-15T15:52:01+02:00, 2005-08-15T15:52:01+02:00 - 2005-08-15T17:52:01+02:00 (Europe/Berlin)\r\nWhere: NC Headquarters"
-			],
-			[
-				'calendar_reminder',
-				[
-					'title' => 'Title of this event',
-					'start_atom' => '2005-08-15T13:00:00+02:00',
-				],
-				self::hasPhpDatetimeDiffBug() ? 'Title of this event' : 'Title of this event (1 hour ago)',
-				[
-					'title' => 'Title of this event',
-					'description' => null,
-					'location' => 'NC Headquarters',
-					'all_day' => false,
-					'start_atom' => '2005-08-15T13:00:00+02:00',
-					'start_is_floating' => false,
-					'start_timezone' => 'Europe/Berlin',
-					'end_atom' => '2005-08-15T15:00:00+02:00',
-					'end_is_floating' => false,
-					'end_timezone' => 'Europe/Berlin',
-					'calendar_displayname' => 'Personal',
-				],
-				"Calendar: Personal\r\nDate: 2005-08-15T13:00:00+02:00, 2005-08-15T13:00:00+02:00 - 2005-08-15T15:00:00+02:00 (Europe/Berlin)\r\nWhere: NC Headquarters"
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider dataPrepare
-	 */
-	public function testPrepare(string $subjectType, array $subjectParams, string $subject, array $messageParams, string $message): void {
-		/** @var INotification&MockObject $notification */
-		$notification = $this->createMock(INotification::class);
-
-		$notification->expects($this->once())
-			->method('getApp')
-			->willReturn(Application::APP_ID);
-		$notification->expects($this->once())
-			->method('getSubject')
-			->willReturn($subjectType);
-		$notification->expects($this->once())
-			->method('getSubjectParameters')
-			->willReturn($subjectParams);
-		$notification->expects($this->once())
-			->method('getMessageParameters')
-			->willReturn($messageParams);
-
-		$notification->expects($this->once())
-			->method('setParsedSubject')
-			->with($subject)
-			->willReturnSelf();
-
-		$notification->expects($this->once())
-			->method('setParsedMessage')
-			->with($message)
-			->willReturnSelf();
-
-		$this->urlGenerator->expects($this->once())
-			->method('imagePath')
-			->with('core', 'places/calendar.svg')
-			->willReturn('icon-url');
-		$this->urlGenerator->expects($this->once())
-			->method('getAbsoluteURL')
-			->with('icon-url')
-			->willReturn('absolute-icon-url');
-		$notification->expects($this->once())
-			->method('setIcon')
-			->with('absolute-icon-url')
-			->willReturnSelf();
-
-		$return = $this->notifier->prepare($notification, 'en');
-
-		$this->assertEquals($notification, $return);
-	}
-
-	public function testPassedEvent(): void {
-		/** @var INotification&MockObject $notification */
-		$notification = $this->createMock(INotification::class);
-
-		$notification->expects($this->once())
-			->method('getApp')
-			->willReturn(Application::APP_ID);
-		$notification->expects($this->once())
-			->method('getSubject')
-			->willReturn('calendar_reminder');
-		$notification->expects($this->once())
-			->method('getSubjectParameters')
-			->willReturn([
-				'title' => 'Title of this event',
-				'start_atom' => '2005-08-15T08:00:00+02:00'
-			]);
-
-		$notification->expects($this->once())
-			->method('getMessageParameters')
-			->willReturn([
-				'title' => 'Title of this event',
-				'description' => null,
-				'location' => 'NC Headquarters',
-				'all_day' => false,
-				'start_atom' => '2005-08-15T08:00:00+02:00',
-				'start_is_floating' => false,
-				'start_timezone' => 'Europe/Berlin',
-				'end_atom' => '2005-08-15T13:00:00+02:00',
-				'end_is_floating' => false,
-				'end_timezone' => 'Europe/Berlin',
-				'calendar_displayname' => 'Personal',
-			]);
-
-		$notification->expects($this->once())
-			->method('setParsedSubject')
-			->with(self::hasPhpDatetimeDiffBug() ? 'Title of this event' : 'Title of this event (6 hours ago)')
-			->willReturnSelf();
-
-		$this->expectException(AlreadyProcessedException::class);
-
-		$return = $this->notifier->prepare($notification, 'en');
-
-		$this->assertEquals($notification, $return);
-	}
+    protected IFactory&MockObject $factory;
+    protected IURLGenerator&MockObject $urlGenerator;
+    protected IL10N&MockObject $l10n;
+    protected ITimeFactory&MockObject $timeFactory;
+    protected Notifier $notifier;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->l10n->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($string, $args) {
+                if (!is_array($args)) {
+                    $args = [$args];
+                }
+                return vsprintf($string, $args);
+            });
+        $this->l10n->expects($this->any())
+            ->method('l')
+            ->willReturnCallback(function ($string, $args) {
+                /** \DateTime $args */
+                return $args->format(\DateTime::ATOM);
+            });
+        $this->l10n->expects($this->any())
+            ->method('n')
+            ->willReturnCallback(function ($textSingular, $textPlural, $count, $args) {
+                $text = $count === 1 ? $textSingular : $textPlural;
+                $text = str_replace('%n', (string)$count, $text);
+                return vsprintf($text, $args);
+            });
+        $this->factory = $this->createMock(IFactory::class);
+        $this->factory->expects($this->any())
+            ->method('get')
+            ->willReturn($this->l10n);
+
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->timeFactory
+            ->method('getDateTime')
+            ->willReturn(\DateTime::createFromFormat(\DateTime::ATOM, '2005-08-15T14:00:00+02:00'));
+
+        $this->notifier = new Notifier(
+            $this->factory,
+            $this->urlGenerator,
+            $this->timeFactory
+        );
+    }
+
+    public function testGetId():void {
+        $this->assertEquals($this->notifier->getID(), 'dav');
+    }
+
+    public function testGetName():void {
+        $this->assertEquals($this->notifier->getName(), 'Calendar');
+    }
+
+
+    public function testPrepareWrongApp(): void {
+        $this->expectException(UnknownNotificationException::class);
+        $this->expectExceptionMessage('Notification not from this app');
+
+        /** @var INotification&MockObject $notification */
+        $notification = $this->createMock(INotification::class);
+
+        $notification->expects($this->once())
+            ->method('getApp')
+            ->willReturn('notifications');
+        $notification->expects($this->never())
+            ->method('getSubject');
+
+        $this->notifier->prepare($notification, 'en');
+    }
+
+
+    public function testPrepareWrongSubject(): void {
+        $this->expectException(UnknownNotificationException::class);
+        $this->expectExceptionMessage('Unknown subject');
+
+        /** @var INotification&MockObject $notification */
+        $notification = $this->createMock(INotification::class);
+
+        $notification->expects($this->once())
+            ->method('getApp')
+            ->willReturn(Application::APP_ID);
+        $notification->expects($this->once())
+            ->method('getSubject')
+            ->willReturn('wrong subject');
+
+        $this->notifier->prepare($notification, 'en');
+    }
+
+    private static function hasPhpDatetimeDiffBug(): bool {
+        $d1 = \DateTime::createFromFormat(\DateTimeInterface::ATOM, '2023-11-22T11:52:00+01:00');
+        $d2 = new \DateTime('2023-11-22T10:52:03', new \DateTimeZone('UTC'));
+
+        // The difference is 3 seconds, not -1year+11months+…
+        return $d1->diff($d2)->y < 0;
+    }
+
+    public static function dataPrepare(): array {
+        return [
+            [
+                'calendar_reminder',
+                [
+                    'title' => 'Title of this event',
+                    'start_atom' => '2005-08-15T15:52:01+02:00'
+                ],
+                self::hasPhpDatetimeDiffBug() ? 'Title of this event' : 'Title of this event (in 1 hour, 52 minutes)',
+                [
+                    'title' => 'Title of this event',
+                    'description' => null,
+                    'location' => 'NC Headquarters',
+                    'all_day' => false,
+                    'start_atom' => '2005-08-15T15:52:01+02:00',
+                    'start_is_floating' => false,
+                    'start_timezone' => 'Europe/Berlin',
+                    'end_atom' => '2005-08-15T17:52:01+02:00',
+                    'end_is_floating' => false,
+                    'end_timezone' => 'Europe/Berlin',
+                    'calendar_displayname' => 'Personal',
+                ],
+                "Calendar: Personal\r\nDate: 2005-08-15T15:52:01+02:00, 2005-08-15T15:52:01+02:00 - 2005-08-15T17:52:01+02:00 (Europe/Berlin)\r\nWhere: NC Headquarters"
+            ],
+            [
+                'calendar_reminder',
+                [
+                    'title' => 'Title of this event',
+                    'start_atom' => '2005-08-15T13:00:00+02:00',
+                ],
+                self::hasPhpDatetimeDiffBug() ? 'Title of this event' : 'Title of this event (1 hour ago)',
+                [
+                    'title' => 'Title of this event',
+                    'description' => null,
+                    'location' => 'NC Headquarters',
+                    'all_day' => false,
+                    'start_atom' => '2005-08-15T13:00:00+02:00',
+                    'start_is_floating' => false,
+                    'start_timezone' => 'Europe/Berlin',
+                    'end_atom' => '2005-08-15T15:00:00+02:00',
+                    'end_is_floating' => false,
+                    'end_timezone' => 'Europe/Berlin',
+                    'calendar_displayname' => 'Personal',
+                ],
+                "Calendar: Personal\r\nDate: 2005-08-15T13:00:00+02:00, 2005-08-15T13:00:00+02:00 - 2005-08-15T15:00:00+02:00 (Europe/Berlin)\r\nWhere: NC Headquarters"
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider dataPrepare
+     */
+    public function testPrepare(string $subjectType, array $subjectParams, string $subject, array $messageParams, string $message): void {
+        /** @var INotification&MockObject $notification */
+        $notification = $this->createMock(INotification::class);
+
+        $notification->expects($this->once())
+            ->method('getApp')
+            ->willReturn(Application::APP_ID);
+        $notification->expects($this->once())
+            ->method('getSubject')
+            ->willReturn($subjectType);
+        $notification->expects($this->once())
+            ->method('getSubjectParameters')
+            ->willReturn($subjectParams);
+        $notification->expects($this->once())
+            ->method('getMessageParameters')
+            ->willReturn($messageParams);
+
+        $notification->expects($this->once())
+            ->method('setParsedSubject')
+            ->with($subject)
+            ->willReturnSelf();
+
+        $notification->expects($this->once())
+            ->method('setParsedMessage')
+            ->with($message)
+            ->willReturnSelf();
+
+        $this->urlGenerator->expects($this->once())
+            ->method('imagePath')
+            ->with('core', 'places/calendar.svg')
+            ->willReturn('icon-url');
+        $this->urlGenerator->expects($this->once())
+            ->method('getAbsoluteURL')
+            ->with('icon-url')
+            ->willReturn('absolute-icon-url');
+        $notification->expects($this->once())
+            ->method('setIcon')
+            ->with('absolute-icon-url')
+            ->willReturnSelf();
+
+        $return = $this->notifier->prepare($notification, 'en');
+
+        $this->assertEquals($notification, $return);
+    }
+
+    public function testPassedEvent(): void {
+        /** @var INotification&MockObject $notification */
+        $notification = $this->createMock(INotification::class);
+
+        $notification->expects($this->once())
+            ->method('getApp')
+            ->willReturn(Application::APP_ID);
+        $notification->expects($this->once())
+            ->method('getSubject')
+            ->willReturn('calendar_reminder');
+        $notification->expects($this->once())
+            ->method('getSubjectParameters')
+            ->willReturn([
+                'title' => 'Title of this event',
+                'start_atom' => '2005-08-15T08:00:00+02:00'
+            ]);
+
+        $notification->expects($this->once())
+            ->method('getMessageParameters')
+            ->willReturn([
+                'title' => 'Title of this event',
+                'description' => null,
+                'location' => 'NC Headquarters',
+                'all_day' => false,
+                'start_atom' => '2005-08-15T08:00:00+02:00',
+                'start_is_floating' => false,
+                'start_timezone' => 'Europe/Berlin',
+                'end_atom' => '2005-08-15T13:00:00+02:00',
+                'end_is_floating' => false,
+                'end_timezone' => 'Europe/Berlin',
+                'calendar_displayname' => 'Personal',
+            ]);
+
+        $notification->expects($this->once())
+            ->method('setParsedSubject')
+            ->with(self::hasPhpDatetimeDiffBug() ? 'Title of this event' : 'Title of this event (6 hours ago)')
+            ->willReturnSelf();
+
+        $this->expectException(AlreadyProcessedException::class);
+
+        $return = $this->notifier->prepare($notification, 'en');
+
+        $this->assertEquals($notification, $return);
+    }
 }

apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php

Indentation +358 added lines, -358 removed lines

@@ -14,364 +14,364 @@
 use Test\TestCase;
 
 class BackendTest extends TestCase {
-	private ReminderBackend $reminderBackend;
-	private ITimeFactory&MockObject $timeFactory;
+    private ReminderBackend $reminderBackend;
+    private ITimeFactory&MockObject $timeFactory;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$query = self::$realDatabase->getQueryBuilder();
-		$query->delete('calendar_reminders')->executeStatement();
-		$query->delete('calendarobjects')->executeStatement();
-		$query->delete('calendars')->executeStatement();
-
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->reminderBackend = new ReminderBackend(self::$realDatabase, $this->timeFactory);
-
-		$this->createRemindersTestSet();
-	}
-
-	protected function tearDown(): void {
-		$query = self::$realDatabase->getQueryBuilder();
-		$query->delete('calendar_reminders')->executeStatement();
-		$query->delete('calendarobjects')->executeStatement();
-		$query->delete('calendars')->executeStatement();
-
-		parent::tearDown();
-	}
-
-
-	public function testCleanRemindersForEvent(): void {
-		$query = self::$realDatabase->getQueryBuilder();
-		$rows = $query->select('*')
-			->from('calendar_reminders')
-			->execute()
-			->fetchAll();
-
-		$this->assertCount(4, $rows);
-
-		$this->reminderBackend->cleanRemindersForEvent(1);
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$rows = $query->select('*')
-			->from('calendar_reminders')
-			->execute()
-			->fetchAll();
-
-		$this->assertCount(2, $rows);
-	}
-
-	public function testCleanRemindersForCalendar(): void {
-		$query = self::$realDatabase->getQueryBuilder();
-		$rows = $query->select('*')
-			->from('calendar_reminders')
-			->execute()
-			->fetchAll();
-
-		$this->assertCount(4, $rows);
-
-		$this->reminderBackend->cleanRemindersForCalendar(1);
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$rows = $query->select('*')
-			->from('calendar_reminders')
-			->execute()
-			->fetchAll();
-
-		$this->assertCount(1, $rows);
-	}
-
-	public function testRemoveReminder(): void {
-		$query = self::$realDatabase->getQueryBuilder();
-		$rows = $query->select('*')
-			->from('calendar_reminders')
-			->execute()
-			->fetchAll();
-
-		$this->assertCount(4, $rows);
-
-		$this->reminderBackend->removeReminder((int)$rows[3]['id']);
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$rows = $query->select('*')
-			->from('calendar_reminders')
-			->execute()
-			->fetchAll();
-
-		$this->assertCount(3, $rows);
-	}
-
-	public function testGetRemindersToProcess(): void {
-		$this->timeFactory->expects($this->exactly(1))
-			->method('getTime')
-			->with()
-			->willReturn(123457);
-
-		$rows = $this->reminderBackend->getRemindersToProcess();
-
-		$this->assertCount(2, $rows);
-		unset($rows[0]['id']);
-		unset($rows[1]['id']);
-
-		$expected1 = [
-			'calendar_id' => 1,
-			'object_id' => 1,
-			'uid' => 'asd',
-			'is_recurring' => false,
-			'recurrence_id' => 123458,
-			'is_recurrence_exception' => false,
-			'event_hash' => 'asd123',
-			'alarm_hash' => 'asd567',
-			'type' => 'EMAIL',
-			'is_relative' => true,
-			'notification_date' => 123456,
-			'is_repeat_based' => false,
-			'calendardata' => 'Calendar data 123',
-			'displayname' => 'Displayname 123',
-			'principaluri' => 'principals/users/user001',
-		];
-		$expected2 = [
-			'calendar_id' => 1,
-			'object_id' => 1,
-			'uid' => 'asd',
-			'is_recurring' => false,
-			'recurrence_id' => 123458,
-			'is_recurrence_exception' => false,
-			'event_hash' => 'asd123',
-			'alarm_hash' => 'asd567',
-			'type' => 'AUDIO',
-			'is_relative' => true,
-			'notification_date' => 123456,
-			'is_repeat_based' => false,
-			'calendardata' => 'Calendar data 123',
-			'displayname' => 'Displayname 123',
-			'principaluri' => 'principals/users/user001',
-		];
-
-		$this->assertEqualsCanonicalizing([$rows[0],$rows[1]], [$expected1,$expected2]);
-	}
-
-	public function testGetAllScheduledRemindersForEvent(): void {
-		$rows = $this->reminderBackend->getAllScheduledRemindersForEvent(1);
-
-		$this->assertCount(2, $rows);
-		unset($rows[0]['id']);
-		unset($rows[1]['id']);
-
-		$this->assertEquals($rows[0], [
-			'calendar_id' => 1,
-			'object_id' => 1,
-			'uid' => 'asd',
-			'is_recurring' => false,
-			'recurrence_id' => 123458,
-			'is_recurrence_exception' => false,
-			'event_hash' => 'asd123',
-			'alarm_hash' => 'asd567',
-			'type' => 'EMAIL',
-			'is_relative' => true,
-			'notification_date' => 123456,
-			'is_repeat_based' => false,
-		]);
-		$this->assertEquals($rows[1], [
-			'calendar_id' => 1,
-			'object_id' => 1,
-			'uid' => 'asd',
-			'is_recurring' => false,
-			'recurrence_id' => 123458,
-			'is_recurrence_exception' => false,
-			'event_hash' => 'asd123',
-			'alarm_hash' => 'asd567',
-			'type' => 'AUDIO',
-			'is_relative' => true,
-			'notification_date' => 123456,
-			'is_repeat_based' => false,
-		]);
-	}
-
-	public function testInsertReminder(): void {
-		$query = self::$realDatabase->getQueryBuilder();
-		$rows = $query->select('*')
-			->from('calendar_reminders')
-			->execute()
-			->fetchAll();
-
-		$this->assertCount(4, $rows);
-
-		$this->reminderBackend->insertReminder(42, 1337, 'uid99', true, 12345678,
-			true, 'hash99', 'hash42', 'AUDIO', false, 12345670, false);
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$rows = $query->select('*')
-			->from('calendar_reminders')
-			->execute()
-			->fetchAll();
-
-		$this->assertCount(5, $rows);
-
-		unset($rows[4]['id']);
-
-		$this->assertEquals($rows[4], [
-			'calendar_id' => '42',
-			'object_id' => '1337',
-			'is_recurring' => '1',
-			'uid' => 'uid99',
-			'recurrence_id' => '12345678',
-			'is_recurrence_exception' => '1',
-			'event_hash' => 'hash99',
-			'alarm_hash' => 'hash42',
-			'type' => 'AUDIO',
-			'is_relative' => '0',
-			'notification_date' => '12345670',
-			'is_repeat_based' => '0',
-		]);
-	}
-
-	public function testUpdateReminder(): void {
-		$query = self::$realDatabase->getQueryBuilder();
-		$rows = $query->select('*')
-			->from('calendar_reminders')
-			->executeQuery()
-			->fetchAll();
-
-		$this->assertCount(4, $rows);
-
-		$this->assertEquals($rows[3]['notification_date'], 123600);
-
-		$reminderId = (int)$rows[3]['id'];
-		$newNotificationDate = 123700;
-
-		$this->reminderBackend->updateReminder($reminderId, $newNotificationDate);
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$row = $query->select('notification_date')
-			->from('calendar_reminders')
-			->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
-			->executeQuery()
-			->fetch();
-
-		$this->assertEquals((int)$row['notification_date'], 123700);
-	}
-
-
-	private function createRemindersTestSet(): void {
-		$query = self::$realDatabase->getQueryBuilder();
-		$query->insert('calendars')
-			->values([
-				'id' => $query->createNamedParameter(1),
-				'principaluri' => $query->createNamedParameter('principals/users/user001'),
-				'displayname' => $query->createNamedParameter('Displayname 123'),
-			])
-			->executeStatement();
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$query->insert('calendars')
-			->values([
-				'id' => $query->createNamedParameter(99),
-				'principaluri' => $query->createNamedParameter('principals/users/user002'),
-				'displayname' => $query->createNamedParameter('Displayname 99'),
-			])
-			->executeStatement();
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$query->insert('calendarobjects')
-			->values([
-				'id' => $query->createNamedParameter(1),
-				'calendardata' => $query->createNamedParameter('Calendar data 123'),
-				'calendarid' => $query->createNamedParameter(1),
-				'size' => $query->createNamedParameter(42),
-			])
-			->executeStatement();
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$query->insert('calendarobjects')
-			->values([
-				'id' => $query->createNamedParameter(2),
-				'calendardata' => $query->createNamedParameter('Calendar data 456'),
-				'calendarid' => $query->createNamedParameter(1),
-				'size' => $query->createNamedParameter(42),
-			])
-			->executeStatement();
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$query->insert('calendarobjects')
-			->values([
-				'id' => $query->createNamedParameter(10),
-				'calendardata' => $query->createNamedParameter('Calendar data 789'),
-				'calendarid' => $query->createNamedParameter(99),
-				'size' => $query->createNamedParameter(42),
-			])
-			->executeStatement();
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$query->insert('calendar_reminders')
-			->values([
-				'calendar_id' => $query->createNamedParameter(1),
-				'object_id' => $query->createNamedParameter(1),
-				'uid' => $query->createNamedParameter('asd'),
-				'is_recurring' => $query->createNamedParameter(0),
-				'recurrence_id' => $query->createNamedParameter(123458),
-				'is_recurrence_exception' => $query->createNamedParameter(0),
-				'event_hash' => $query->createNamedParameter('asd123'),
-				'alarm_hash' => $query->createNamedParameter('asd567'),
-				'type' => $query->createNamedParameter('EMAIL'),
-				'is_relative' => $query->createNamedParameter(1),
-				'notification_date' => $query->createNamedParameter(123456),
-				'is_repeat_based' => $query->createNamedParameter(0),
-			])
-			->executeStatement();
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$query->insert('calendar_reminders')
-			->values([
-				'calendar_id' => $query->createNamedParameter(1),
-				'object_id' => $query->createNamedParameter(1),
-				'uid' => $query->createNamedParameter('asd'),
-				'is_recurring' => $query->createNamedParameter(0),
-				'recurrence_id' => $query->createNamedParameter(123458),
-				'is_recurrence_exception' => $query->createNamedParameter(0),
-				'event_hash' => $query->createNamedParameter('asd123'),
-				'alarm_hash' => $query->createNamedParameter('asd567'),
-				'type' => $query->createNamedParameter('AUDIO'),
-				'is_relative' => $query->createNamedParameter(1),
-				'notification_date' => $query->createNamedParameter(123456),
-				'is_repeat_based' => $query->createNamedParameter(0),
-			])
-			->executeStatement();
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$query->insert('calendar_reminders')
-			->values([
-				'calendar_id' => $query->createNamedParameter(1),
-				'object_id' => $query->createNamedParameter(2),
-				'uid' => $query->createNamedParameter('asd'),
-				'is_recurring' => $query->createNamedParameter(0),
-				'recurrence_id' => $query->createNamedParameter(123900),
-				'is_recurrence_exception' => $query->createNamedParameter(0),
-				'event_hash' => $query->createNamedParameter('asd123'),
-				'alarm_hash' => $query->createNamedParameter('asd567'),
-				'type' => $query->createNamedParameter('EMAIL'),
-				'is_relative' => $query->createNamedParameter(1),
-				'notification_date' => $query->createNamedParameter(123499),
-				'is_repeat_based' => $query->createNamedParameter(0),
-			])
-			->executeStatement();
-
-		$query = self::$realDatabase->getQueryBuilder();
-		$query->insert('calendar_reminders')
-			->values([
-				'calendar_id' => $query->createNamedParameter(99),
-				'object_id' => $query->createNamedParameter(10),
-				'uid' => $query->createNamedParameter('asd'),
-				'is_recurring' => $query->createNamedParameter(0),
-				'recurrence_id' => $query->createNamedParameter(123900),
-				'is_recurrence_exception' => $query->createNamedParameter(0),
-				'event_hash' => $query->createNamedParameter('asd123'),
-				'alarm_hash' => $query->createNamedParameter('asd567'),
-				'type' => $query->createNamedParameter('DISPLAY'),
-				'is_relative' => $query->createNamedParameter(1),
-				'notification_date' => $query->createNamedParameter(123600),
-				'is_repeat_based' => $query->createNamedParameter(0),
-			])
-			->executeStatement();
-	}
+        $query = self::$realDatabase->getQueryBuilder();
+        $query->delete('calendar_reminders')->executeStatement();
+        $query->delete('calendarobjects')->executeStatement();
+        $query->delete('calendars')->executeStatement();
+
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->reminderBackend = new ReminderBackend(self::$realDatabase, $this->timeFactory);
+
+        $this->createRemindersTestSet();
+    }
+
+    protected function tearDown(): void {
+        $query = self::$realDatabase->getQueryBuilder();
+        $query->delete('calendar_reminders')->executeStatement();
+        $query->delete('calendarobjects')->executeStatement();
+        $query->delete('calendars')->executeStatement();
+
+        parent::tearDown();
+    }
+
+
+    public function testCleanRemindersForEvent(): void {
+        $query = self::$realDatabase->getQueryBuilder();
+        $rows = $query->select('*')
+            ->from('calendar_reminders')
+            ->execute()
+            ->fetchAll();
+
+        $this->assertCount(4, $rows);
+
+        $this->reminderBackend->cleanRemindersForEvent(1);
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $rows = $query->select('*')
+            ->from('calendar_reminders')
+            ->execute()
+            ->fetchAll();
+
+        $this->assertCount(2, $rows);
+    }
+
+    public function testCleanRemindersForCalendar(): void {
+        $query = self::$realDatabase->getQueryBuilder();
+        $rows = $query->select('*')
+            ->from('calendar_reminders')
+            ->execute()
+            ->fetchAll();
+
+        $this->assertCount(4, $rows);
+
+        $this->reminderBackend->cleanRemindersForCalendar(1);
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $rows = $query->select('*')
+            ->from('calendar_reminders')
+            ->execute()
+            ->fetchAll();
+
+        $this->assertCount(1, $rows);
+    }
+
+    public function testRemoveReminder(): void {
+        $query = self::$realDatabase->getQueryBuilder();
+        $rows = $query->select('*')
+            ->from('calendar_reminders')
+            ->execute()
+            ->fetchAll();
+
+        $this->assertCount(4, $rows);
+
+        $this->reminderBackend->removeReminder((int)$rows[3]['id']);
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $rows = $query->select('*')
+            ->from('calendar_reminders')
+            ->execute()
+            ->fetchAll();
+
+        $this->assertCount(3, $rows);
+    }
+
+    public function testGetRemindersToProcess(): void {
+        $this->timeFactory->expects($this->exactly(1))
+            ->method('getTime')
+            ->with()
+            ->willReturn(123457);
+
+        $rows = $this->reminderBackend->getRemindersToProcess();
+
+        $this->assertCount(2, $rows);
+        unset($rows[0]['id']);
+        unset($rows[1]['id']);
+
+        $expected1 = [
+            'calendar_id' => 1,
+            'object_id' => 1,
+            'uid' => 'asd',
+            'is_recurring' => false,
+            'recurrence_id' => 123458,
+            'is_recurrence_exception' => false,
+            'event_hash' => 'asd123',
+            'alarm_hash' => 'asd567',
+            'type' => 'EMAIL',
+            'is_relative' => true,
+            'notification_date' => 123456,
+            'is_repeat_based' => false,
+            'calendardata' => 'Calendar data 123',
+            'displayname' => 'Displayname 123',
+            'principaluri' => 'principals/users/user001',
+        ];
+        $expected2 = [
+            'calendar_id' => 1,
+            'object_id' => 1,
+            'uid' => 'asd',
+            'is_recurring' => false,
+            'recurrence_id' => 123458,
+            'is_recurrence_exception' => false,
+            'event_hash' => 'asd123',
+            'alarm_hash' => 'asd567',
+            'type' => 'AUDIO',
+            'is_relative' => true,
+            'notification_date' => 123456,
+            'is_repeat_based' => false,
+            'calendardata' => 'Calendar data 123',
+            'displayname' => 'Displayname 123',
+            'principaluri' => 'principals/users/user001',
+        ];
+
+        $this->assertEqualsCanonicalizing([$rows[0],$rows[1]], [$expected1,$expected2]);
+    }
+
+    public function testGetAllScheduledRemindersForEvent(): void {
+        $rows = $this->reminderBackend->getAllScheduledRemindersForEvent(1);
+
+        $this->assertCount(2, $rows);
+        unset($rows[0]['id']);
+        unset($rows[1]['id']);
+
+        $this->assertEquals($rows[0], [
+            'calendar_id' => 1,
+            'object_id' => 1,
+            'uid' => 'asd',
+            'is_recurring' => false,
+            'recurrence_id' => 123458,
+            'is_recurrence_exception' => false,
+            'event_hash' => 'asd123',
+            'alarm_hash' => 'asd567',
+            'type' => 'EMAIL',
+            'is_relative' => true,
+            'notification_date' => 123456,
+            'is_repeat_based' => false,
+        ]);
+        $this->assertEquals($rows[1], [
+            'calendar_id' => 1,
+            'object_id' => 1,
+            'uid' => 'asd',
+            'is_recurring' => false,
+            'recurrence_id' => 123458,
+            'is_recurrence_exception' => false,
+            'event_hash' => 'asd123',
+            'alarm_hash' => 'asd567',
+            'type' => 'AUDIO',
+            'is_relative' => true,
+            'notification_date' => 123456,
+            'is_repeat_based' => false,
+        ]);
+    }
+
+    public function testInsertReminder(): void {
+        $query = self::$realDatabase->getQueryBuilder();
+        $rows = $query->select('*')
+            ->from('calendar_reminders')
+            ->execute()
+            ->fetchAll();
+
+        $this->assertCount(4, $rows);
+
+        $this->reminderBackend->insertReminder(42, 1337, 'uid99', true, 12345678,
+            true, 'hash99', 'hash42', 'AUDIO', false, 12345670, false);
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $rows = $query->select('*')
+            ->from('calendar_reminders')
+            ->execute()
+            ->fetchAll();
+
+        $this->assertCount(5, $rows);
+
+        unset($rows[4]['id']);
+
+        $this->assertEquals($rows[4], [
+            'calendar_id' => '42',
+            'object_id' => '1337',
+            'is_recurring' => '1',
+            'uid' => 'uid99',
+            'recurrence_id' => '12345678',
+            'is_recurrence_exception' => '1',
+            'event_hash' => 'hash99',
+            'alarm_hash' => 'hash42',
+            'type' => 'AUDIO',
+            'is_relative' => '0',
+            'notification_date' => '12345670',
+            'is_repeat_based' => '0',
+        ]);
+    }
+
+    public function testUpdateReminder(): void {
+        $query = self::$realDatabase->getQueryBuilder();
+        $rows = $query->select('*')
+            ->from('calendar_reminders')
+            ->executeQuery()
+            ->fetchAll();
+
+        $this->assertCount(4, $rows);
+
+        $this->assertEquals($rows[3]['notification_date'], 123600);
+
+        $reminderId = (int)$rows[3]['id'];
+        $newNotificationDate = 123700;
+
+        $this->reminderBackend->updateReminder($reminderId, $newNotificationDate);
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $row = $query->select('notification_date')
+            ->from('calendar_reminders')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
+            ->executeQuery()
+            ->fetch();
+
+        $this->assertEquals((int)$row['notification_date'], 123700);
+    }
+
+
+    private function createRemindersTestSet(): void {
+        $query = self::$realDatabase->getQueryBuilder();
+        $query->insert('calendars')
+            ->values([
+                'id' => $query->createNamedParameter(1),
+                'principaluri' => $query->createNamedParameter('principals/users/user001'),
+                'displayname' => $query->createNamedParameter('Displayname 123'),
+            ])
+            ->executeStatement();
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $query->insert('calendars')
+            ->values([
+                'id' => $query->createNamedParameter(99),
+                'principaluri' => $query->createNamedParameter('principals/users/user002'),
+                'displayname' => $query->createNamedParameter('Displayname 99'),
+            ])
+            ->executeStatement();
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $query->insert('calendarobjects')
+            ->values([
+                'id' => $query->createNamedParameter(1),
+                'calendardata' => $query->createNamedParameter('Calendar data 123'),
+                'calendarid' => $query->createNamedParameter(1),
+                'size' => $query->createNamedParameter(42),
+            ])
+            ->executeStatement();
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $query->insert('calendarobjects')
+            ->values([
+                'id' => $query->createNamedParameter(2),
+                'calendardata' => $query->createNamedParameter('Calendar data 456'),
+                'calendarid' => $query->createNamedParameter(1),
+                'size' => $query->createNamedParameter(42),
+            ])
+            ->executeStatement();
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $query->insert('calendarobjects')
+            ->values([
+                'id' => $query->createNamedParameter(10),
+                'calendardata' => $query->createNamedParameter('Calendar data 789'),
+                'calendarid' => $query->createNamedParameter(99),
+                'size' => $query->createNamedParameter(42),
+            ])
+            ->executeStatement();
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $query->insert('calendar_reminders')
+            ->values([
+                'calendar_id' => $query->createNamedParameter(1),
+                'object_id' => $query->createNamedParameter(1),
+                'uid' => $query->createNamedParameter('asd'),
+                'is_recurring' => $query->createNamedParameter(0),
+                'recurrence_id' => $query->createNamedParameter(123458),
+                'is_recurrence_exception' => $query->createNamedParameter(0),
+                'event_hash' => $query->createNamedParameter('asd123'),
+                'alarm_hash' => $query->createNamedParameter('asd567'),
+                'type' => $query->createNamedParameter('EMAIL'),
+                'is_relative' => $query->createNamedParameter(1),
+                'notification_date' => $query->createNamedParameter(123456),
+                'is_repeat_based' => $query->createNamedParameter(0),
+            ])
+            ->executeStatement();
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $query->insert('calendar_reminders')
+            ->values([
+                'calendar_id' => $query->createNamedParameter(1),
+                'object_id' => $query->createNamedParameter(1),
+                'uid' => $query->createNamedParameter('asd'),
+                'is_recurring' => $query->createNamedParameter(0),
+                'recurrence_id' => $query->createNamedParameter(123458),
+                'is_recurrence_exception' => $query->createNamedParameter(0),
+                'event_hash' => $query->createNamedParameter('asd123'),
+                'alarm_hash' => $query->createNamedParameter('asd567'),
+                'type' => $query->createNamedParameter('AUDIO'),
+                'is_relative' => $query->createNamedParameter(1),
+                'notification_date' => $query->createNamedParameter(123456),
+                'is_repeat_based' => $query->createNamedParameter(0),
+            ])
+            ->executeStatement();
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $query->insert('calendar_reminders')
+            ->values([
+                'calendar_id' => $query->createNamedParameter(1),
+                'object_id' => $query->createNamedParameter(2),
+                'uid' => $query->createNamedParameter('asd'),
+                'is_recurring' => $query->createNamedParameter(0),
+                'recurrence_id' => $query->createNamedParameter(123900),
+                'is_recurrence_exception' => $query->createNamedParameter(0),
+                'event_hash' => $query->createNamedParameter('asd123'),
+                'alarm_hash' => $query->createNamedParameter('asd567'),
+                'type' => $query->createNamedParameter('EMAIL'),
+                'is_relative' => $query->createNamedParameter(1),
+                'notification_date' => $query->createNamedParameter(123499),
+                'is_repeat_based' => $query->createNamedParameter(0),
+            ])
+            ->executeStatement();
+
+        $query = self::$realDatabase->getQueryBuilder();
+        $query->insert('calendar_reminders')
+            ->values([
+                'calendar_id' => $query->createNamedParameter(99),
+                'object_id' => $query->createNamedParameter(10),
+                'uid' => $query->createNamedParameter('asd'),
+                'is_recurring' => $query->createNamedParameter(0),
+                'recurrence_id' => $query->createNamedParameter(123900),
+                'is_recurrence_exception' => $query->createNamedParameter(0),
+                'event_hash' => $query->createNamedParameter('asd123'),
+                'alarm_hash' => $query->createNamedParameter('asd567'),
+                'type' => $query->createNamedParameter('DISPLAY'),
+                'is_relative' => $query->createNamedParameter(1),
+                'notification_date' => $query->createNamedParameter(123600),
+                'is_repeat_based' => $query->createNamedParameter(0),
+            ])
+            ->executeStatement();
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -90,7 +90,7 @@ 
 
 		$this->assertCount(4, $rows);
 
-		$this->reminderBackend->removeReminder((int)$rows[3]['id']);
+		$this->reminderBackend->removeReminder((int) $rows[3]['id']);
 
 		$query = self::$realDatabase->getQueryBuilder();
 		$rows = $query->select('*')
@@ -148,7 +148,7 @@ 
 			'principaluri' => 'principals/users/user001',
 		];
 
-		$this->assertEqualsCanonicalizing([$rows[0],$rows[1]], [$expected1,$expected2]);
+		$this->assertEqualsCanonicalizing([$rows[0], $rows[1]], [$expected1, $expected2]);
 	}
 
 	public function testGetAllScheduledRemindersForEvent(): void {
@@ -237,7 +237,7 @@ 
 
 		$this->assertEquals($rows[3]['notification_date'], 123600);
 
-		$reminderId = (int)$rows[3]['id'];
+		$reminderId = (int) $rows[3]['id'];
 		$newNotificationDate = 123700;
 
 		$this->reminderBackend->updateReminder($reminderId, $newNotificationDate);
@@ -249,7 +249,7 @@ 
 			->executeQuery()
 			->fetch();
 
-		$this->assertEquals((int)$row['notification_date'], 123700);
+		$this->assertEquals((int) $row['notification_date'], 123700);
 	}
 
 

apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php

Indentation +541 added lines, -541 removed lines

@@ -26,18 +26,18 @@ 
 use Test\TestCase;
 
 class ReminderServiceTest extends TestCase {
-	private Backend&MockObject $backend;
-	private NotificationProviderManager&MockObject $notificationProviderManager;
-	private IUserManager&MockObject $userManager;
-	private IGroupManager&MockObject $groupManager;
-	private CalDavBackend&MockObject $caldavBackend;
-	private ITimeFactory&MockObject $timeFactory;
-	private IConfig&MockObject $config;
-	private LoggerInterface&MockObject $logger;
-	private Principal&MockObject $principalConnector;
-	private ReminderService $reminderService;
-
-	public const CALENDAR_DATA = <<<EOD
+    private Backend&MockObject $backend;
+    private NotificationProviderManager&MockObject $notificationProviderManager;
+    private IUserManager&MockObject $userManager;
+    private IGroupManager&MockObject $groupManager;
+    private CalDavBackend&MockObject $caldavBackend;
+    private ITimeFactory&MockObject $timeFactory;
+    private IConfig&MockObject $config;
+    private LoggerInterface&MockObject $logger;
+    private Principal&MockObject $principalConnector;
+    private ReminderService $reminderService;
+
+    public const CALENDAR_DATA = <<<EOD
 BEGIN:VCALENDAR
 PRODID:-//Nextcloud calendar v1.6.4
 BEGIN:VEVENT
@@ -62,7 +62,7 @@ 
 END:VCALENDAR
 EOD;
 
-	public const CALENDAR_DATA_REPEAT = <<<EOD
+    public const CALENDAR_DATA_REPEAT = <<<EOD
 BEGIN:VCALENDAR
 PRODID:-//Nextcloud calendar v1.6.4
 BEGIN:VEVENT
@@ -85,7 +85,7 @@ 
 END:VCALENDAR
 EOD;
 
-	public const CALENDAR_DATA_RECURRING = <<<EOD
+    public const CALENDAR_DATA_RECURRING = <<<EOD
 BEGIN:VCALENDAR
 PRODID:-//Nextcloud calendar v1.6.4
 BEGIN:VEVENT
@@ -111,7 +111,7 @@ 
 END:VCALENDAR
 EOD;
 
-	public const CALENDAR_DATA_RECURRING_REPEAT = <<<EOD
+    public const CALENDAR_DATA_RECURRING_REPEAT = <<<EOD
 BEGIN:VCALENDAR
 PRODID:-//Nextcloud calendar v1.6.4
 BEGIN:VEVENT
@@ -139,7 +139,7 @@ 
 END:VCALENDAR
 EOD;
 
-	public const CALENDAR_DATA_NO_ALARM = <<<EOD
+    public const CALENDAR_DATA_NO_ALARM = <<<EOD
 BEGIN:VCALENDAR
 PRODID:-//Nextcloud calendar v1.6.4
 BEGIN:VEVENT
@@ -156,7 +156,7 @@ 
 END:VCALENDAR
 EOD;
 
-	private const CALENDAR_DATA_ONE_TIME = <<<EOD
+    private const CALENDAR_DATA_ONE_TIME = <<<EOD
 BEGIN:VCALENDAR
 PRODID:-//IDN nextcloud.com//Calendar app 4.3.0-alpha.0//EN
 CALSCALE:GREGORIAN
@@ -196,7 +196,7 @@ 
 END:VCALENDAR
 EOD;
 
-	private const CALENDAR_DATA_ALL_DAY = <<<EOD
+    private const CALENDAR_DATA_ALL_DAY = <<<EOD
 BEGIN:VCALENDAR
 PRODID:-//IDN nextcloud.com//Calendar app 4.3.0-alpha.0//EN
 CALSCALE:GREGORIAN
@@ -219,7 +219,7 @@ 
 END:VCALENDAR
 EOD;
 
-	private const PAGO_PAGO_VTIMEZONE_ICS = <<<ICS
+    private const PAGO_PAGO_VTIMEZONE_ICS = <<<ICS
 BEGIN:VCALENDAR
 BEGIN:VTIMEZONE
 TZID:Pacific/Pago_Pago
@@ -233,82 +233,82 @@ 
 END:VCALENDAR
 ICS;
 
-	private ?string $oldTimezone;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->backend = $this->createMock(Backend::class);
-		$this->notificationProviderManager = $this->createMock(NotificationProviderManager::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->caldavBackend = $this->createMock(CalDavBackend::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->principalConnector = $this->createMock(Principal::class);
-
-		$this->caldavBackend->method('getShares')->willReturn([]);
-
-		$this->reminderService = new ReminderService(
-			$this->backend,
-			$this->notificationProviderManager,
-			$this->userManager,
-			$this->groupManager,
-			$this->caldavBackend,
-			$this->timeFactory,
-			$this->config,
-			$this->logger,
-			$this->principalConnector,
-		);
-	}
-
-	public function testOnCalendarObjectDelete():void {
-		$this->backend->expects($this->once())
-			->method('cleanRemindersForEvent')
-			->with(44);
-
-		$objectData = [
-			'id' => '44',
-			'component' => 'vevent',
-		];
-
-		$this->reminderService->onCalendarObjectDelete($objectData);
-	}
-
-	public function testOnCalendarObjectCreateSingleEntry():void {
-		$objectData = [
-			'calendardata' => self::CALENDAR_DATA,
-			'id' => '42',
-			'calendarid' => '1337',
-			'component' => 'vevent',
-		];
-
-		$calls = [
-			[1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', 'de919af7429d3b5c11e8b9d289b411a6', 'EMAIL', true, 1465429500, false],
-			[1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', '35b3eae8e792aa2209f0b4e1a302f105', 'DISPLAY', false, 1465344000, false]
-		];
-		$this->backend->expects($this->exactly(count($calls)))
-			->method('insertReminder')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-				return 1;
-			});
-
-		$this->timeFactory->expects($this->once())
-			->method('getDateTime')
-			->with()
-			->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2016-06-08T00:00:00+00:00'));
-
-		$this->reminderService->onCalendarObjectCreate($objectData);
-	}
-
-	/**
-	 * RFC5545 says DTSTART is REQUIRED, but we have seen event without the prop
-	 */
-	public function testOnCalendarObjectCreateNoDtstart(): void {
-		$calendarData = <<<EOD
+    private ?string $oldTimezone;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->backend = $this->createMock(Backend::class);
+        $this->notificationProviderManager = $this->createMock(NotificationProviderManager::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->caldavBackend = $this->createMock(CalDavBackend::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->principalConnector = $this->createMock(Principal::class);
+
+        $this->caldavBackend->method('getShares')->willReturn([]);
+
+        $this->reminderService = new ReminderService(
+            $this->backend,
+            $this->notificationProviderManager,
+            $this->userManager,
+            $this->groupManager,
+            $this->caldavBackend,
+            $this->timeFactory,
+            $this->config,
+            $this->logger,
+            $this->principalConnector,
+        );
+    }
+
+    public function testOnCalendarObjectDelete():void {
+        $this->backend->expects($this->once())
+            ->method('cleanRemindersForEvent')
+            ->with(44);
+
+        $objectData = [
+            'id' => '44',
+            'component' => 'vevent',
+        ];
+
+        $this->reminderService->onCalendarObjectDelete($objectData);
+    }
+
+    public function testOnCalendarObjectCreateSingleEntry():void {
+        $objectData = [
+            'calendardata' => self::CALENDAR_DATA,
+            'id' => '42',
+            'calendarid' => '1337',
+            'component' => 'vevent',
+        ];
+
+        $calls = [
+            [1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', 'de919af7429d3b5c11e8b9d289b411a6', 'EMAIL', true, 1465429500, false],
+            [1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', '35b3eae8e792aa2209f0b4e1a302f105', 'DISPLAY', false, 1465344000, false]
+        ];
+        $this->backend->expects($this->exactly(count($calls)))
+            ->method('insertReminder')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+                return 1;
+            });
+
+        $this->timeFactory->expects($this->once())
+            ->method('getDateTime')
+            ->with()
+            ->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2016-06-08T00:00:00+00:00'));
+
+        $this->reminderService->onCalendarObjectCreate($objectData);
+    }
+
+    /**
+     * RFC5545 says DTSTART is REQUIRED, but we have seen event without the prop
+     */
+    public function testOnCalendarObjectCreateNoDtstart(): void {
+        $calendarData = <<<EOD
 BEGIN:VCALENDAR
 PRODID:-//Nextcloud calendar v1.6.4
 BEGIN:VEVENT
@@ -328,450 +328,450 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$objectData = [
-			'calendardata' => $calendarData,
-			'id' => '42',
-			'calendarid' => '1337',
-			'component' => 'vevent',
-		];
-
-		$this->backend->expects($this->never())
-			->method('insertReminder');
-
-		$this->reminderService->onCalendarObjectCreate($objectData);
-	}
-
-	public function testOnCalendarObjectCreateSingleEntryWithRepeat(): void {
-		$objectData = [
-			'calendardata' => self::CALENDAR_DATA_REPEAT,
-			'id' => '42',
-			'calendarid' => '1337',
-			'component' => 'vevent',
-		];
-
-		$calls = [
-			[1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1465429500, false],
-			[1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1465429620, true],
-			[1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1465429740, true],
-			[1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1465429860, true],
-			[1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1465429980, true]
-		];
-		$this->backend->expects($this->exactly(count($calls)))
-			->method('insertReminder')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-				return 1;
-			});
-
-		$this->timeFactory->expects($this->once())
-			->method('getDateTime')
-			->with()
-			->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2016-06-08T00:00:00+00:00'));
-
-		$this->reminderService->onCalendarObjectCreate($objectData);
-	}
-
-	public function testOnCalendarObjectCreateRecurringEntry(): void {
-		$objectData = [
-			'calendardata' => self::CALENDAR_DATA_RECURRING,
-			'id' => '42',
-			'calendarid' => '1337',
-			'component' => 'vevent',
-		];
-
-		$calls = [
-			[1337, 42, 'wej2z68l9h', true, 1467244800, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'de919af7429d3b5c11e8b9d289b411a6', 'EMAIL', true, 1467243900, false],
-			[1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', '8996992118817f9f311ac5cc56d1cc97', 'EMAIL', true, 1467158400, false]
-		];
-		$this->backend->expects($this->exactly(count($calls)))
-			->method('insertReminder')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-				return 1;
-			});
-
-		$this->timeFactory->expects($this->once())
-			->method('getDateTime')
-			->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2016-06-29T00:00:00+00:00'));
-
-		$this->reminderService->onCalendarObjectCreate($objectData);
-	}
-
-	public function testOnCalendarObjectCreateEmpty():void {
-		$objectData = [
-			'calendardata' => self::CALENDAR_DATA_NO_ALARM,
-			'id' => '42',
-			'calendarid' => '1337',
-			'component' => 'vevent',
-		];
-
-		$this->backend->expects($this->never())
-			->method('insertReminder');
-
-		$this->reminderService->onCalendarObjectCreate($objectData);
-	}
-
-	public function testOnCalendarObjectCreateAllDayWithNullTimezone(): void {
-		$objectData = [
-			'calendardata' => self::CALENDAR_DATA_ALL_DAY,
-			'id' => '42',
-			'calendarid' => '1337',
-			'component' => 'vevent',
-		];
-		$this->timeFactory->expects($this->once())
-			->method('getDateTime')
-			->with()
-			->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2023-02-03T13:28:00+00:00'));
-		$this->caldavBackend->expects(self::once())
-			->method('getCalendarById')
-			->with(1337)
-			->willReturn([
-				'{urn:ietf:params:xml:ns:caldav}calendar-timezone' => null,
-			]);
-
-		// One hour before midnight relative to the server's time
-		$expectedReminderTimstamp = (new DateTime('2023-02-03T23:00:00'))->getTimestamp();
-		$this->backend->expects(self::once())
-			->method('insertReminder')
-			->with(1337, 42, self::anything(), false, 1675468800, false, self::anything(), self::anything(), 'EMAIL', true, $expectedReminderTimstamp, false);
-
-		$this->reminderService->onCalendarObjectCreate($objectData);
-	}
-
-	public function testOnCalendarObjectCreateAllDayWithBlankTimezone(): void {
-		$objectData = [
-			'calendardata' => self::CALENDAR_DATA_ALL_DAY,
-			'id' => '42',
-			'calendarid' => '1337',
-			'component' => 'vevent',
-		];
-		$this->timeFactory->expects($this->once())
-			->method('getDateTime')
-			->with()
-			->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2023-02-03T13:28:00+00:00'));
-		$this->caldavBackend->expects(self::once())
-			->method('getCalendarById')
-			->with(1337)
-			->willReturn([
-				'{urn:ietf:params:xml:ns:caldav}calendar-timezone' => '',
-			]);
-
-		// One hour before midnight relative to the server's time
-		$expectedReminderTimstamp = (new DateTime('2023-02-03T23:00:00'))->getTimestamp();
-		$this->backend->expects(self::once())
-			->method('insertReminder')
-			->with(1337, 42, self::anything(), false, 1675468800, false, self::anything(), self::anything(), 'EMAIL', true, $expectedReminderTimstamp, false);
-
-		$this->reminderService->onCalendarObjectCreate($objectData);
-	}
-
-	public function testOnCalendarObjectCreateAllDayWithTimezone(): void {
-		$objectData = [
-			'calendardata' => self::CALENDAR_DATA_ALL_DAY,
-			'id' => '42',
-			'calendarid' => '1337',
-			'component' => 'vevent',
-		];
-		$this->timeFactory->expects($this->once())
-			->method('getDateTime')
-			->with()
-			->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2023-02-03T13:28:00+00:00'));
-		$this->caldavBackend->expects(self::once())
-			->method('getCalendarById')
-			->with(1337)
-			->willReturn([
-				'{urn:ietf:params:xml:ns:caldav}calendar-timezone' => self::PAGO_PAGO_VTIMEZONE_ICS,
-			]);
-
-		// One hour before midnight relative to the timezone
-		$expectedReminderTimstamp = (new DateTime('2023-02-03T23:00:00', new DateTimeZone('Pacific/Pago_Pago')))->getTimestamp();
-		$this->backend->expects(self::once())
-			->method('insertReminder')
-			->with(1337, 42, 'a163a056-ba26-44a2-8080-955f19611a8f', false, self::anything(), false, self::anything(), self::anything(), 'EMAIL', true, $expectedReminderTimstamp, false);
-
-		$this->reminderService->onCalendarObjectCreate($objectData);
-	}
-
-	public function testOnCalendarObjectCreateRecurringEntryWithRepeat():void {
-		$objectData = [
-			'calendardata' => self::CALENDAR_DATA_RECURRING_REPEAT,
-			'id' => '42',
-			'calendarid' => '1337',
-			'component' => 'vevent',
-		];
-		$this->caldavBackend->expects(self::once())
-			->method('getCalendarById')
-			->with(1337)
-			->willReturn([
-				'{urn:ietf:params:xml:ns:caldav}calendar-timezone' => null,
-			]);
-
-		$calls = [
-			[1337, 42, 'wej2z68l9h', true, 1467244800, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467243900, false],
-			[1337, 42, 'wej2z68l9h', true, 1467244800, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467244020, true],
-			[1337, 42, 'wej2z68l9h', true, 1467244800, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467244140, true],
-			[1337, 42, 'wej2z68l9h', true, 1467244800, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467244260, true],
-			[1337, 42, 'wej2z68l9h', true, 1467244800, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467244380, true],
-			[1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', '8996992118817f9f311ac5cc56d1cc97', 'EMAIL', true, 1467158400, false]
-		];
-		$this->backend->expects($this->exactly(count($calls)))
-			->method('insertReminder')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-				return 1;
-			});
-
-		$this->timeFactory->expects($this->once())
-			->method('getDateTime')
-			->with()
-			->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2016-06-29T00:00:00+00:00'));
-
-		$this->reminderService->onCalendarObjectCreate($objectData);
-	}
-
-	public function testOnCalendarObjectCreateWithEventTimezoneAndCalendarTimezone():void {
-		$objectData = [
-			'calendardata' => self::CALENDAR_DATA_ONE_TIME,
-			'id' => '42',
-			'calendarid' => '1337',
-			'component' => 'vevent',
-		];
-		$this->caldavBackend->expects(self::once())
-			->method('getCalendarById')
-			->with(1337)
-			->willReturn([
-				'{urn:ietf:params:xml:ns:caldav}calendar-timezone' => self::PAGO_PAGO_VTIMEZONE_ICS,
-			]);
-		$expectedReminderTimstamp = (new DateTime('2023-02-04T08:00:00', new DateTimeZone('Europe/Vienna')))->getTimestamp();
-		$this->backend->expects(self::once())
-			->method('insertReminder')
-			->with(1337, 42, self::anything(), false, self::anything(), false, self::anything(), self::anything(), self::anything(), true, $expectedReminderTimstamp, false)
-			->willReturn(1);
-		$this->caldavBackend->expects(self::once())
-			->method('getCalendarById')
-			->with(1337)
-			->willReturn([
-				'{urn:ietf:params:xml:ns:caldav}calendar-timezone' => null,
-			]);
-		$this->timeFactory->expects($this->once())
-			->method('getDateTime')
-			->with()
-			->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2023-02-03T13:28:00+00:00'));
-		;
-
-		$this->reminderService->onCalendarObjectCreate($objectData);
-	}
-
-	public function testProcessReminders():void {
-		$this->backend->expects($this->once())
-			->method('getRemindersToProcess')
-			->with()
-			->willReturn([
-				[
-					'id' => 1,
-					'calendar_id' => 1337,
-					'object_id' => 42,
-					'uid' => 'wej2z68l9h',
-					'is_recurring' => false,
-					'recurrence_id' => 1465430400,
-					'is_recurrence_exception' => false,
-					'event_hash' => '5c70531aab15c92b52518ae10a2f78a4',
-					'alarm_hash' => 'de919af7429d3b5c11e8b9d289b411a6',
-					'type' => 'EMAIL',
-					'is_relative' => true,
-					'notification_date' => 1465429500,
-					'is_repeat_based' => false,
-					'calendardata' => self::CALENDAR_DATA,
-					'displayname' => 'Displayname 123',
-					'principaluri' => 'principals/users/user001',
-				],
-				[
-					'id' => 2,
-					'calendar_id' => 1337,
-					'object_id' => 42,
-					'uid' => 'wej2z68l9h',
-					'is_recurring' => false,
-					'recurrence_id' => 1465430400,
-					'is_recurrence_exception' => false,
-					'event_hash' => '5c70531aab15c92b52518ae10a2f78a4',
-					'alarm_hash' => 'ecacbf07d413c3c78d1ac7ad8c469602',
-					'type' => 'EMAIL',
-					'is_relative' => true,
-					'notification_date' => 1465429740,
-					'is_repeat_based' => true,
-					'calendardata' => self::CALENDAR_DATA_REPEAT,
-					'displayname' => 'Displayname 123',
-					'principaluri' => 'principals/users/user001',
-				],
-				[
-					'id' => 3,
-					'calendar_id' => 1337,
-					'object_id' => 42,
-					'uid' => 'wej2z68l9h',
-					'is_recurring' => false,
-					'recurrence_id' => 1465430400,
-					'is_recurrence_exception' => false,
-					'event_hash' => '5c70531aab15c92b52518ae10a2f78a4',
-					'alarm_hash' => '35b3eae8e792aa2209f0b4e1a302f105',
-					'type' => 'DISPLAY',
-					'is_relative' => false,
-					'notification_date' => 1465344000,
-					'is_repeat_based' => false,
-					'calendardata' => self::CALENDAR_DATA,
-					'displayname' => 'Displayname 123',
-					'principaluri' => 'principals/users/user001',
-				],
-				[
-					'id' => 4,
-					'calendar_id' => 1337,
-					'object_id' => 42,
-					'uid' => 'wej2z68l9h',
-					'is_recurring' => true,
-					'recurrence_id' => 1467244800,
-					'is_recurrence_exception' => false,
-					'event_hash' => 'fbdb2726bc0f7dfacac1d881c1453e20',
-					'alarm_hash' => 'ecacbf07d413c3c78d1ac7ad8c469602',
-					'type' => 'EMAIL',
-					'is_relative' => true,
-					'notification_date' => 1467243900,
-					'is_repeat_based' => false,
-					'calendardata' => self::CALENDAR_DATA_RECURRING_REPEAT,
-					'displayname' => 'Displayname 123',
-					'principaluri' => 'principals/users/user001',
-				],
-				[
-					'id' => 5,
-					'calendar_id' => 1337,
-					'object_id' => 42,
-					'uid' => 'wej2z68l9h',
-					'is_recurring' => true,
-					'recurrence_id' => 1467849600,
-					'is_recurrence_exception' => false,
-					'event_hash' => 'fbdb2726bc0f7dfacac1d881c1453e20',
-					'alarm_hash' => '8996992118817f9f311ac5cc56d1cc97',
-					'type' => 'EMAIL',
-					'is_relative' => true,
-					'notification_date' => 1467158400,
-					'is_repeat_based' => false,
-					'calendardata' => self::CALENDAR_DATA_RECURRING,
-					'displayname' => 'Displayname 123',
-					'principaluri' => 'principals/users/user001',
-				]
-			]);
-
-		$this->notificationProviderManager->expects($this->exactly(5))
-			->method('hasProvider')
-			->willReturnMap([
-				['EMAIL', true],
-				['DISPLAY', true],
-			]);
-
-		$provider1 = $this->createMock(INotificationProvider::class);
-		$provider2 = $this->createMock(INotificationProvider::class);
-		$provider3 = $this->createMock(INotificationProvider::class);
-		$provider4 = $this->createMock(INotificationProvider::class);
-		$provider5 = $this->createMock(INotificationProvider::class);
-
-		$getProviderCalls = [
-			['EMAIL', $provider1],
-			['EMAIL', $provider2],
-			['DISPLAY', $provider3],
-			['EMAIL', $provider4],
-			['EMAIL', $provider5],
-		];
-		$this->notificationProviderManager->expects($this->exactly(count($getProviderCalls)))
-			->method('getProvider')
-			->willReturnCallback(function () use (&$getProviderCalls) {
-				$expected = array_shift($getProviderCalls);
-				$return = array_pop($expected);
-				$this->assertEquals($expected, func_get_args());
-				return $return;
-			});
-
-		$user = $this->createMock(IUser::class);
-		$this->userManager->expects($this->exactly(5))
-			->method('get')
-			->with('user001')
-			->willReturn($user);
-
-		$provider1->expects($this->once())
-			->method('send')
-			->with($this->callback(function ($vevent) {
-				if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-06-09T00:00:00+00:00') {
-					return false;
-				}
-				return true;
-			}, 'Displayname 123', $user));
-		$provider2->expects($this->once())
-			->method('send')
-			->with($this->callback(function ($vevent) {
-				if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-06-09T00:00:00+00:00') {
-					return false;
-				}
-				return true;
-			}, 'Displayname 123', $user));
-		$provider3->expects($this->once())
-			->method('send')
-			->with($this->callback(function ($vevent) {
-				if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-06-09T00:00:00+00:00') {
-					return false;
-				}
-				return true;
-			}, 'Displayname 123', $user));
-		$provider4->expects($this->once())
-			->method('send')
-			->with($this->callback(function ($vevent) {
-				if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-06-30T00:00:00+00:00') {
-					return false;
-				}
-				return true;
-			}, 'Displayname 123', $user));
-		$provider5->expects($this->once())
-			->method('send')
-			->with($this->callback(function ($vevent) {
-				if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-07-07T00:00:00+00:00') {
-					return false;
-				}
-				return true;
-			}, 'Displayname 123', $user));
-
-		$removeReminderCalls = [
-			[1],
-			[2],
-			[3],
-			[4],
-			[5],
-		];
-		$this->backend->expects($this->exactly(5))
-			->method('removeReminder')
-			->willReturnCallback(function () use (&$removeReminderCalls) {
-				$expected = array_shift($removeReminderCalls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-
-		$insertReminderCalls = [
-			[1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467848700, false],
-			[1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467848820, true],
-			[1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467848940, true],
-			[1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467849060, true],
-			[1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467849180, true],
-			[1337, 42, 'wej2z68l9h', true, 1468454400, false, 'fbdb2726bc0f7dfacac1d881c1453e20', '8996992118817f9f311ac5cc56d1cc97', 'EMAIL', true, 1467763200, false],
-		];
-		$this->backend->expects($this->exactly(count($insertReminderCalls)))
-			->method('insertReminder')
-			->willReturnCallback(function () use (&$insertReminderCalls) {
-				$expected = array_shift($insertReminderCalls);
-				$this->assertEquals($expected, func_get_args());
-				return 99;
-			});
-
-		$this->timeFactory->method('getDateTime')
-			->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2016-06-08T00:00:00+00:00'));
-
-		$this->reminderService->processReminders();
-	}
+        $objectData = [
+            'calendardata' => $calendarData,
+            'id' => '42',
+            'calendarid' => '1337',
+            'component' => 'vevent',
+        ];
+
+        $this->backend->expects($this->never())
+            ->method('insertReminder');
+
+        $this->reminderService->onCalendarObjectCreate($objectData);
+    }
+
+    public function testOnCalendarObjectCreateSingleEntryWithRepeat(): void {
+        $objectData = [
+            'calendardata' => self::CALENDAR_DATA_REPEAT,
+            'id' => '42',
+            'calendarid' => '1337',
+            'component' => 'vevent',
+        ];
+
+        $calls = [
+            [1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1465429500, false],
+            [1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1465429620, true],
+            [1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1465429740, true],
+            [1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1465429860, true],
+            [1337, 42, 'wej2z68l9h', false, 1465430400, false, '5c70531aab15c92b52518ae10a2f78a4', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1465429980, true]
+        ];
+        $this->backend->expects($this->exactly(count($calls)))
+            ->method('insertReminder')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+                return 1;
+            });
+
+        $this->timeFactory->expects($this->once())
+            ->method('getDateTime')
+            ->with()
+            ->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2016-06-08T00:00:00+00:00'));
+
+        $this->reminderService->onCalendarObjectCreate($objectData);
+    }
+
+    public function testOnCalendarObjectCreateRecurringEntry(): void {
+        $objectData = [
+            'calendardata' => self::CALENDAR_DATA_RECURRING,
+            'id' => '42',
+            'calendarid' => '1337',
+            'component' => 'vevent',
+        ];
+
+        $calls = [
+            [1337, 42, 'wej2z68l9h', true, 1467244800, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'de919af7429d3b5c11e8b9d289b411a6', 'EMAIL', true, 1467243900, false],
+            [1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', '8996992118817f9f311ac5cc56d1cc97', 'EMAIL', true, 1467158400, false]
+        ];
+        $this->backend->expects($this->exactly(count($calls)))
+            ->method('insertReminder')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+                return 1;
+            });
+
+        $this->timeFactory->expects($this->once())
+            ->method('getDateTime')
+            ->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2016-06-29T00:00:00+00:00'));
+
+        $this->reminderService->onCalendarObjectCreate($objectData);
+    }
+
+    public function testOnCalendarObjectCreateEmpty():void {
+        $objectData = [
+            'calendardata' => self::CALENDAR_DATA_NO_ALARM,
+            'id' => '42',
+            'calendarid' => '1337',
+            'component' => 'vevent',
+        ];
+
+        $this->backend->expects($this->never())
+            ->method('insertReminder');
+
+        $this->reminderService->onCalendarObjectCreate($objectData);
+    }
+
+    public function testOnCalendarObjectCreateAllDayWithNullTimezone(): void {
+        $objectData = [
+            'calendardata' => self::CALENDAR_DATA_ALL_DAY,
+            'id' => '42',
+            'calendarid' => '1337',
+            'component' => 'vevent',
+        ];
+        $this->timeFactory->expects($this->once())
+            ->method('getDateTime')
+            ->with()
+            ->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2023-02-03T13:28:00+00:00'));
+        $this->caldavBackend->expects(self::once())
+            ->method('getCalendarById')
+            ->with(1337)
+            ->willReturn([
+                '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => null,
+            ]);
+
+        // One hour before midnight relative to the server's time
+        $expectedReminderTimstamp = (new DateTime('2023-02-03T23:00:00'))->getTimestamp();
+        $this->backend->expects(self::once())
+            ->method('insertReminder')
+            ->with(1337, 42, self::anything(), false, 1675468800, false, self::anything(), self::anything(), 'EMAIL', true, $expectedReminderTimstamp, false);
+
+        $this->reminderService->onCalendarObjectCreate($objectData);
+    }
+
+    public function testOnCalendarObjectCreateAllDayWithBlankTimezone(): void {
+        $objectData = [
+            'calendardata' => self::CALENDAR_DATA_ALL_DAY,
+            'id' => '42',
+            'calendarid' => '1337',
+            'component' => 'vevent',
+        ];
+        $this->timeFactory->expects($this->once())
+            ->method('getDateTime')
+            ->with()
+            ->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2023-02-03T13:28:00+00:00'));
+        $this->caldavBackend->expects(self::once())
+            ->method('getCalendarById')
+            ->with(1337)
+            ->willReturn([
+                '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => '',
+            ]);
+
+        // One hour before midnight relative to the server's time
+        $expectedReminderTimstamp = (new DateTime('2023-02-03T23:00:00'))->getTimestamp();
+        $this->backend->expects(self::once())
+            ->method('insertReminder')
+            ->with(1337, 42, self::anything(), false, 1675468800, false, self::anything(), self::anything(), 'EMAIL', true, $expectedReminderTimstamp, false);
+
+        $this->reminderService->onCalendarObjectCreate($objectData);
+    }
+
+    public function testOnCalendarObjectCreateAllDayWithTimezone(): void {
+        $objectData = [
+            'calendardata' => self::CALENDAR_DATA_ALL_DAY,
+            'id' => '42',
+            'calendarid' => '1337',
+            'component' => 'vevent',
+        ];
+        $this->timeFactory->expects($this->once())
+            ->method('getDateTime')
+            ->with()
+            ->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2023-02-03T13:28:00+00:00'));
+        $this->caldavBackend->expects(self::once())
+            ->method('getCalendarById')
+            ->with(1337)
+            ->willReturn([
+                '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => self::PAGO_PAGO_VTIMEZONE_ICS,
+            ]);
+
+        // One hour before midnight relative to the timezone
+        $expectedReminderTimstamp = (new DateTime('2023-02-03T23:00:00', new DateTimeZone('Pacific/Pago_Pago')))->getTimestamp();
+        $this->backend->expects(self::once())
+            ->method('insertReminder')
+            ->with(1337, 42, 'a163a056-ba26-44a2-8080-955f19611a8f', false, self::anything(), false, self::anything(), self::anything(), 'EMAIL', true, $expectedReminderTimstamp, false);
+
+        $this->reminderService->onCalendarObjectCreate($objectData);
+    }
+
+    public function testOnCalendarObjectCreateRecurringEntryWithRepeat():void {
+        $objectData = [
+            'calendardata' => self::CALENDAR_DATA_RECURRING_REPEAT,
+            'id' => '42',
+            'calendarid' => '1337',
+            'component' => 'vevent',
+        ];
+        $this->caldavBackend->expects(self::once())
+            ->method('getCalendarById')
+            ->with(1337)
+            ->willReturn([
+                '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => null,
+            ]);
+
+        $calls = [
+            [1337, 42, 'wej2z68l9h', true, 1467244800, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467243900, false],
+            [1337, 42, 'wej2z68l9h', true, 1467244800, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467244020, true],
+            [1337, 42, 'wej2z68l9h', true, 1467244800, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467244140, true],
+            [1337, 42, 'wej2z68l9h', true, 1467244800, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467244260, true],
+            [1337, 42, 'wej2z68l9h', true, 1467244800, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467244380, true],
+            [1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', '8996992118817f9f311ac5cc56d1cc97', 'EMAIL', true, 1467158400, false]
+        ];
+        $this->backend->expects($this->exactly(count($calls)))
+            ->method('insertReminder')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+                return 1;
+            });
+
+        $this->timeFactory->expects($this->once())
+            ->method('getDateTime')
+            ->with()
+            ->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2016-06-29T00:00:00+00:00'));
+
+        $this->reminderService->onCalendarObjectCreate($objectData);
+    }
+
+    public function testOnCalendarObjectCreateWithEventTimezoneAndCalendarTimezone():void {
+        $objectData = [
+            'calendardata' => self::CALENDAR_DATA_ONE_TIME,
+            'id' => '42',
+            'calendarid' => '1337',
+            'component' => 'vevent',
+        ];
+        $this->caldavBackend->expects(self::once())
+            ->method('getCalendarById')
+            ->with(1337)
+            ->willReturn([
+                '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => self::PAGO_PAGO_VTIMEZONE_ICS,
+            ]);
+        $expectedReminderTimstamp = (new DateTime('2023-02-04T08:00:00', new DateTimeZone('Europe/Vienna')))->getTimestamp();
+        $this->backend->expects(self::once())
+            ->method('insertReminder')
+            ->with(1337, 42, self::anything(), false, self::anything(), false, self::anything(), self::anything(), self::anything(), true, $expectedReminderTimstamp, false)
+            ->willReturn(1);
+        $this->caldavBackend->expects(self::once())
+            ->method('getCalendarById')
+            ->with(1337)
+            ->willReturn([
+                '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => null,
+            ]);
+        $this->timeFactory->expects($this->once())
+            ->method('getDateTime')
+            ->with()
+            ->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2023-02-03T13:28:00+00:00'));
+        ;
+
+        $this->reminderService->onCalendarObjectCreate($objectData);
+    }
+
+    public function testProcessReminders():void {
+        $this->backend->expects($this->once())
+            ->method('getRemindersToProcess')
+            ->with()
+            ->willReturn([
+                [
+                    'id' => 1,
+                    'calendar_id' => 1337,
+                    'object_id' => 42,
+                    'uid' => 'wej2z68l9h',
+                    'is_recurring' => false,
+                    'recurrence_id' => 1465430400,
+                    'is_recurrence_exception' => false,
+                    'event_hash' => '5c70531aab15c92b52518ae10a2f78a4',
+                    'alarm_hash' => 'de919af7429d3b5c11e8b9d289b411a6',
+                    'type' => 'EMAIL',
+                    'is_relative' => true,
+                    'notification_date' => 1465429500,
+                    'is_repeat_based' => false,
+                    'calendardata' => self::CALENDAR_DATA,
+                    'displayname' => 'Displayname 123',
+                    'principaluri' => 'principals/users/user001',
+                ],
+                [
+                    'id' => 2,
+                    'calendar_id' => 1337,
+                    'object_id' => 42,
+                    'uid' => 'wej2z68l9h',
+                    'is_recurring' => false,
+                    'recurrence_id' => 1465430400,
+                    'is_recurrence_exception' => false,
+                    'event_hash' => '5c70531aab15c92b52518ae10a2f78a4',
+                    'alarm_hash' => 'ecacbf07d413c3c78d1ac7ad8c469602',
+                    'type' => 'EMAIL',
+                    'is_relative' => true,
+                    'notification_date' => 1465429740,
+                    'is_repeat_based' => true,
+                    'calendardata' => self::CALENDAR_DATA_REPEAT,
+                    'displayname' => 'Displayname 123',
+                    'principaluri' => 'principals/users/user001',
+                ],
+                [
+                    'id' => 3,
+                    'calendar_id' => 1337,
+                    'object_id' => 42,
+                    'uid' => 'wej2z68l9h',
+                    'is_recurring' => false,
+                    'recurrence_id' => 1465430400,
+                    'is_recurrence_exception' => false,
+                    'event_hash' => '5c70531aab15c92b52518ae10a2f78a4',
+                    'alarm_hash' => '35b3eae8e792aa2209f0b4e1a302f105',
+                    'type' => 'DISPLAY',
+                    'is_relative' => false,
+                    'notification_date' => 1465344000,
+                    'is_repeat_based' => false,
+                    'calendardata' => self::CALENDAR_DATA,
+                    'displayname' => 'Displayname 123',
+                    'principaluri' => 'principals/users/user001',
+                ],
+                [
+                    'id' => 4,
+                    'calendar_id' => 1337,
+                    'object_id' => 42,
+                    'uid' => 'wej2z68l9h',
+                    'is_recurring' => true,
+                    'recurrence_id' => 1467244800,
+                    'is_recurrence_exception' => false,
+                    'event_hash' => 'fbdb2726bc0f7dfacac1d881c1453e20',
+                    'alarm_hash' => 'ecacbf07d413c3c78d1ac7ad8c469602',
+                    'type' => 'EMAIL',
+                    'is_relative' => true,
+                    'notification_date' => 1467243900,
+                    'is_repeat_based' => false,
+                    'calendardata' => self::CALENDAR_DATA_RECURRING_REPEAT,
+                    'displayname' => 'Displayname 123',
+                    'principaluri' => 'principals/users/user001',
+                ],
+                [
+                    'id' => 5,
+                    'calendar_id' => 1337,
+                    'object_id' => 42,
+                    'uid' => 'wej2z68l9h',
+                    'is_recurring' => true,
+                    'recurrence_id' => 1467849600,
+                    'is_recurrence_exception' => false,
+                    'event_hash' => 'fbdb2726bc0f7dfacac1d881c1453e20',
+                    'alarm_hash' => '8996992118817f9f311ac5cc56d1cc97',
+                    'type' => 'EMAIL',
+                    'is_relative' => true,
+                    'notification_date' => 1467158400,
+                    'is_repeat_based' => false,
+                    'calendardata' => self::CALENDAR_DATA_RECURRING,
+                    'displayname' => 'Displayname 123',
+                    'principaluri' => 'principals/users/user001',
+                ]
+            ]);
+
+        $this->notificationProviderManager->expects($this->exactly(5))
+            ->method('hasProvider')
+            ->willReturnMap([
+                ['EMAIL', true],
+                ['DISPLAY', true],
+            ]);
+
+        $provider1 = $this->createMock(INotificationProvider::class);
+        $provider2 = $this->createMock(INotificationProvider::class);
+        $provider3 = $this->createMock(INotificationProvider::class);
+        $provider4 = $this->createMock(INotificationProvider::class);
+        $provider5 = $this->createMock(INotificationProvider::class);
+
+        $getProviderCalls = [
+            ['EMAIL', $provider1],
+            ['EMAIL', $provider2],
+            ['DISPLAY', $provider3],
+            ['EMAIL', $provider4],
+            ['EMAIL', $provider5],
+        ];
+        $this->notificationProviderManager->expects($this->exactly(count($getProviderCalls)))
+            ->method('getProvider')
+            ->willReturnCallback(function () use (&$getProviderCalls) {
+                $expected = array_shift($getProviderCalls);
+                $return = array_pop($expected);
+                $this->assertEquals($expected, func_get_args());
+                return $return;
+            });
+
+        $user = $this->createMock(IUser::class);
+        $this->userManager->expects($this->exactly(5))
+            ->method('get')
+            ->with('user001')
+            ->willReturn($user);
+
+        $provider1->expects($this->once())
+            ->method('send')
+            ->with($this->callback(function ($vevent) {
+                if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-06-09T00:00:00+00:00') {
+                    return false;
+                }
+                return true;
+            }, 'Displayname 123', $user));
+        $provider2->expects($this->once())
+            ->method('send')
+            ->with($this->callback(function ($vevent) {
+                if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-06-09T00:00:00+00:00') {
+                    return false;
+                }
+                return true;
+            }, 'Displayname 123', $user));
+        $provider3->expects($this->once())
+            ->method('send')
+            ->with($this->callback(function ($vevent) {
+                if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-06-09T00:00:00+00:00') {
+                    return false;
+                }
+                return true;
+            }, 'Displayname 123', $user));
+        $provider4->expects($this->once())
+            ->method('send')
+            ->with($this->callback(function ($vevent) {
+                if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-06-30T00:00:00+00:00') {
+                    return false;
+                }
+                return true;
+            }, 'Displayname 123', $user));
+        $provider5->expects($this->once())
+            ->method('send')
+            ->with($this->callback(function ($vevent) {
+                if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-07-07T00:00:00+00:00') {
+                    return false;
+                }
+                return true;
+            }, 'Displayname 123', $user));
+
+        $removeReminderCalls = [
+            [1],
+            [2],
+            [3],
+            [4],
+            [5],
+        ];
+        $this->backend->expects($this->exactly(5))
+            ->method('removeReminder')
+            ->willReturnCallback(function () use (&$removeReminderCalls) {
+                $expected = array_shift($removeReminderCalls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+
+        $insertReminderCalls = [
+            [1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467848700, false],
+            [1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467848820, true],
+            [1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467848940, true],
+            [1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467849060, true],
+            [1337, 42, 'wej2z68l9h', true, 1467849600, false, 'fbdb2726bc0f7dfacac1d881c1453e20', 'ecacbf07d413c3c78d1ac7ad8c469602', 'EMAIL', true, 1467849180, true],
+            [1337, 42, 'wej2z68l9h', true, 1468454400, false, 'fbdb2726bc0f7dfacac1d881c1453e20', '8996992118817f9f311ac5cc56d1cc97', 'EMAIL', true, 1467763200, false],
+        ];
+        $this->backend->expects($this->exactly(count($insertReminderCalls)))
+            ->method('insertReminder')
+            ->willReturnCallback(function () use (&$insertReminderCalls) {
+                $expected = array_shift($insertReminderCalls);
+                $this->assertEquals($expected, func_get_args());
+                return 99;
+            });
+
+        $this->timeFactory->method('getDateTime')
+            ->willReturn(DateTime::createFromFormat(DateTime::ATOM, '2016-06-08T00:00:00+00:00'));
+
+        $this->reminderService->processReminders();
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -290,7 +290,7 @@ 
 		];
 		$this->backend->expects($this->exactly(count($calls)))
 			->method('insertReminder')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 				return 1;
@@ -358,7 +358,7 @@ 
 		];
 		$this->backend->expects($this->exactly(count($calls)))
 			->method('insertReminder')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 				return 1;
@@ -386,7 +386,7 @@ 
 		];
 		$this->backend->expects($this->exactly(count($calls)))
 			->method('insertReminder')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 				return 1;
@@ -518,7 +518,7 @@ 
 		];
 		$this->backend->expects($this->exactly(count($calls)))
 			->method('insertReminder')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 				return 1;
@@ -684,7 +684,7 @@ 
 		];
 		$this->notificationProviderManager->expects($this->exactly(count($getProviderCalls)))
 			->method('getProvider')
-			->willReturnCallback(function () use (&$getProviderCalls) {
+			->willReturnCallback(function() use (&$getProviderCalls) {
 				$expected = array_shift($getProviderCalls);
 				$return = array_pop($expected);
 				$this->assertEquals($expected, func_get_args());
@@ -699,7 +699,7 @@ 
 
 		$provider1->expects($this->once())
 			->method('send')
-			->with($this->callback(function ($vevent) {
+			->with($this->callback(function($vevent) {
 				if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-06-09T00:00:00+00:00') {
 					return false;
 				}
@@ -707,7 +707,7 @@ 
 			}, 'Displayname 123', $user));
 		$provider2->expects($this->once())
 			->method('send')
-			->with($this->callback(function ($vevent) {
+			->with($this->callback(function($vevent) {
 				if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-06-09T00:00:00+00:00') {
 					return false;
 				}
@@ -715,7 +715,7 @@ 
 			}, 'Displayname 123', $user));
 		$provider3->expects($this->once())
 			->method('send')
-			->with($this->callback(function ($vevent) {
+			->with($this->callback(function($vevent) {
 				if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-06-09T00:00:00+00:00') {
 					return false;
 				}
@@ -723,7 +723,7 @@ 
 			}, 'Displayname 123', $user));
 		$provider4->expects($this->once())
 			->method('send')
-			->with($this->callback(function ($vevent) {
+			->with($this->callback(function($vevent) {
 				if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-06-30T00:00:00+00:00') {
 					return false;
 				}
@@ -731,7 +731,7 @@ 
 			}, 'Displayname 123', $user));
 		$provider5->expects($this->once())
 			->method('send')
-			->with($this->callback(function ($vevent) {
+			->with($this->callback(function($vevent) {
 				if ($vevent->DTSTART->getDateTime()->format(DateTime::ATOM) !== '2016-07-07T00:00:00+00:00') {
 					return false;
 				}
@@ -747,7 +747,7 @@ 
 		];
 		$this->backend->expects($this->exactly(5))
 			->method('removeReminder')
-			->willReturnCallback(function () use (&$removeReminderCalls) {
+			->willReturnCallback(function() use (&$removeReminderCalls) {
 				$expected = array_shift($removeReminderCalls);
 				$this->assertEquals($expected, func_get_args());
 			});
@@ -763,7 +763,7 @@ 
 		];
 		$this->backend->expects($this->exactly(count($insertReminderCalls)))
 			->method('insertReminder')
-			->willReturnCallback(function () use (&$insertReminderCalls) {
+			->willReturnCallback(function() use (&$insertReminderCalls) {
 				$expected = array_shift($insertReminderCalls);
 				$this->assertEquals($expected, func_get_args());
 				return 99;