nextcloud / server

apps/dav/lib/CalDAV/CalDavBackend.php

Spacing +172 added lines, -172 removed lines

@@ -150,7 +150,7 @@ 
 		'{urn:ietf:params:xml:ns:caldav}calendar-timezone' => ['timezone', 'string'],
 		'{http://apple.com/ns/ical/}calendar-order' => ['calendarorder', 'int'],
 		'{http://apple.com/ns/ical/}calendar-color' => ['calendarcolor', 'string'],
-		'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}deleted-at' => ['deleted_at', 'int'],
+		'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD.'}deleted-at' => ['deleted_at', 'int'],
 	];
 
 	/**
@@ -246,7 +246,7 @@ 
 		}
 
 		$result = $query->executeQuery();
-		$column = (int)$result->fetchOne();
+		$column = (int) $result->fetchOne();
 		$result->closeCursor();
 		return $column;
 	}
@@ -267,7 +267,7 @@ 
 		}
 
 		$result = $query->executeQuery();
-		$column = (int)$result->fetchOne();
+		$column = (int) $result->fetchOne();
 		$result->closeCursor();
 		return $column;
 	}
@@ -285,8 +285,8 @@ 
 		$calendars = [];
 		while (($row = $result->fetchAssociative()) !== false) {
 			$calendars[] = [
-				'id' => (int)$row['id'],
-				'deleted_at' => (int)$row['deleted_at'],
+				'id' => (int) $row['id'],
+				'deleted_at' => (int) $row['deleted_at'],
 			];
 		}
 		$result->closeCursor();
@@ -319,7 +319,7 @@ 
 	 * @return array
 	 */
 	public function getCalendarsForUser($principalUri) {
-		return $this->atomic(function () use ($principalUri) {
+		return $this->atomic(function() use ($principalUri) {
 			$principalUriOriginal = $principalUri;
 			$principalUri = $this->convertPrincipal($principalUri, true);
 			$fields = array_column($this->propertyMap, 0);
@@ -346,7 +346,7 @@ 
 
 			$calendars = [];
 			while ($row = $result->fetchAssociative()) {
-				$row['principaluri'] = (string)$row['principaluri'];
+				$row['principaluri'] = (string) $row['principaluri'];
 				$components = [];
 				if ($row['components']) {
 					$components = explode(',', $row['components']);
@@ -356,11 +356,11 @@ 
 					'id' => $row['id'],
 					'uri' => $row['uri'],
 					'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-					'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
+					'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ?: '0'),
 					'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-					'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-					'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-					'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
+					'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+					'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
+					'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
 				];
 
 				$calendar = $this->rowToCalendar($row, $calendar);
@@ -379,8 +379,8 @@ 
 			$principals[] = $principalUri;
 
 			$fields = array_column($this->propertyMap, 0);
-			$fields = array_map(function (string $field) {
-				return 'a.' . $field;
+			$fields = array_map(function(string $field) {
+				return 'a.'.$field;
 			}, $fields);
 			$fields[] = 'a.id';
 			$fields[] = 'a.uri';
@@ -407,14 +407,14 @@ 
 
 			$results = $select->executeQuery();
 
-			$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+			$readOnlyPropertyName = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only';
 			while ($row = $results->fetchAssociative()) {
-				$row['principaluri'] = (string)$row['principaluri'];
+				$row['principaluri'] = (string) $row['principaluri'];
 				if ($row['principaluri'] === $principalUri) {
 					continue;
 				}
 
-				$readOnly = (int)$row['access'] === Backend::ACCESS_READ;
+				$readOnly = (int) $row['access'] === Backend::ACCESS_READ;
 				if (isset($calendars[$row['id']])) {
 					if ($readOnly) {
 						// New share can not have more permissions than the old one.
@@ -428,8 +428,8 @@ 
 				}
 
 				[, $name] = Uri\split($row['principaluri']);
-				$uri = $row['uri'] . '_shared_by_' . $name;
-				$row['displayname'] = $row['displayname'] . ' (' . ($this->userManager->getDisplayName($name) ?? ($name ?? '')) . ')';
+				$uri = $row['uri'].'_shared_by_'.$name;
+				$row['displayname'] = $row['displayname'].' ('.($this->userManager->getDisplayName($name) ?? ($name ?? '')).')';
 				$components = [];
 				if ($row['components']) {
 					$components = explode(',', $row['components']);
@@ -438,11 +438,11 @@ 
 					'id' => $row['id'],
 					'uri' => $uri,
 					'principaluri' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
-					'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
+					'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ?: '0'),
 					'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-					'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-					'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp('transparent'),
-					'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+					'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+					'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp('transparent'),
+					'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
 					$readOnlyPropertyName => $readOnly,
 				];
 
@@ -479,7 +479,7 @@ 
 		$stmt = $query->executeQuery();
 		$calendars = [];
 		while ($row = $stmt->fetchAssociative()) {
-			$row['principaluri'] = (string)$row['principaluri'];
+			$row['principaluri'] = (string) $row['principaluri'];
 			$components = [];
 			if ($row['components']) {
 				$components = explode(',', $row['components']);
@@ -488,10 +488,10 @@ 
 				'id' => $row['id'],
 				'uri' => $row['uri'],
 				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
+				'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ?: '0'),
 				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+				'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
 			];
 
 			$calendar = $this->rowToCalendar($row, $calendar);
@@ -529,9 +529,9 @@ 
 			->executeQuery();
 
 		while ($row = $result->fetchAssociative()) {
-			$row['principaluri'] = (string)$row['principaluri'];
+			$row['principaluri'] = (string) $row['principaluri'];
 			[, $name] = Uri\split($row['principaluri']);
-			$row['displayname'] = $row['displayname'] . "($name)";
+			$row['displayname'] = $row['displayname']."($name)";
 			$components = [];
 			if ($row['components']) {
 				$components = explode(',', $row['components']);
@@ -540,13 +540,13 @@ 
 				'id' => $row['id'],
 				'uri' => $row['publicuri'],
 				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
+				'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ?: '0'),
 				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], $this->legacyEndpoint),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => true,
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+				'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $this->convertPrincipal($row['principaluri'], $this->legacyEndpoint),
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only' => true,
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}public' => (int) $row['access'] === self::ACCESS_PUBLIC,
 			];
 
 			$calendar = $this->rowToCalendar($row, $calendar);
@@ -591,12 +591,12 @@ 
 		$result->closeCursor();
 
 		if ($row === false) {
-			throw new NotFound('Node with name \'' . $uri . '\' could not be found');
+			throw new NotFound('Node with name \''.$uri.'\' could not be found');
 		}
 
-		$row['principaluri'] = (string)$row['principaluri'];
+		$row['principaluri'] = (string) $row['principaluri'];
 		[, $name] = Uri\split($row['principaluri']);
-		$row['displayname'] = $row['displayname'] . ' ' . "($name)";
+		$row['displayname'] = $row['displayname'].' '."($name)";
 		$components = [];
 		if ($row['components']) {
 			$components = explode(',', $row['components']);
@@ -605,13 +605,13 @@ 
 			'id' => $row['id'],
 			'uri' => $row['publicuri'],
 			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
+			'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ?: '0'),
 			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => true,
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+			'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
+			'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+			'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only' => true,
+			'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}public' => (int) $row['access'] === self::ACCESS_PUBLIC,
 		];
 
 		$calendar = $this->rowToCalendar($row, $calendar);
@@ -649,7 +649,7 @@ 
 			return null;
 		}
 
-		$row['principaluri'] = (string)$row['principaluri'];
+		$row['principaluri'] = (string) $row['principaluri'];
 		$components = [];
 		if ($row['components']) {
 			$components = explode(',', $row['components']);
@@ -659,10 +659,10 @@ 
 			'id' => $row['id'],
 			'uri' => $row['uri'],
 			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
+			'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ?: '0'),
 			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+			'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
 		];
 
 		$calendar = $this->rowToCalendar($row, $calendar);
@@ -698,7 +698,7 @@ 
 			return null;
 		}
 
-		$row['principaluri'] = (string)$row['principaluri'];
+		$row['principaluri'] = (string) $row['principaluri'];
 		$components = [];
 		if ($row['components']) {
 			$components = explode(',', $row['components']);
@@ -708,10 +708,10 @@ 
 			'id' => $row['id'],
 			'uri' => $row['uri'],
 			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
+			'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ?: '0'),
 			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?? 0,
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+			'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
 		];
 
 		$calendar = $this->rowToCalendar($row, $calendar);
@@ -746,14 +746,14 @@ 
 			return null;
 		}
 
-		$row['principaluri'] = (string)$row['principaluri'];
+		$row['principaluri'] = (string) $row['principaluri'];
 		$subscription = [
 			'id' => $row['id'],
 			'uri' => $row['uri'],
 			'principaluri' => $row['principaluri'],
 			'source' => $row['source'],
 			'lastmodified' => $row['lastmodified'],
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
 			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 		];
 
@@ -783,14 +783,14 @@ 
 			return null;
 		}
 
-		$row['principaluri'] = (string)$row['principaluri'];
+		$row['principaluri'] = (string) $row['principaluri'];
 		$subscription = [
 			'id' => $row['id'],
 			'uri' => $row['uri'],
 			'principaluri' => $row['principaluri'],
 			'source' => $row['source'],
 			'lastmodified' => $row['lastmodified'],
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
 			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 		];
 
@@ -828,7 +828,7 @@ 
 		$sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
 		if (isset($properties[$sccs])) {
 			if (!($properties[$sccs] instanceof SupportedCalendarComponentSet)) {
-				throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
+				throw new DAV\Exception('The '.$sccs.' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
 			}
 			$values['components'] = implode(',', $properties[$sccs]->getValue());
 		} elseif (isset($properties['components'])) {
@@ -837,9 +837,9 @@ 
 			$values['components'] = $properties['components'];
 		}
 
-		$transp = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
+		$transp = '{'.Plugin::NS_CALDAV.'}schedule-calendar-transp';
 		if (isset($properties[$transp])) {
-			$values['transparent'] = (int)($properties[$transp]->getValue() === 'transparent');
+			$values['transparent'] = (int) ($properties[$transp]->getValue() === 'transparent');
 		}
 
 		foreach ($this->propertyMap as $xmlName => [$dbName, $type]) {
@@ -848,7 +848,7 @@ 
 			}
 		}
 
-		[$calendarId, $calendarData] = $this->atomic(function () use ($values) {
+		[$calendarId, $calendarData] = $this->atomic(function() use ($values) {
 			$query = $this->db->getQueryBuilder();
 			$query->insert('calendars');
 			foreach ($values as $column => $value) {
@@ -861,7 +861,7 @@ 
 			return [$calendarId, $calendarData];
 		}, $this->db);
 
-		$this->dispatcher->dispatchTyped(new CalendarCreatedEvent((int)$calendarId, $calendarData));
+		$this->dispatcher->dispatchTyped(new CalendarCreatedEvent((int) $calendarId, $calendarData));
 
 		return $calendarId;
 	}
@@ -884,15 +884,15 @@ 
 	 */
 	public function updateCalendar($calendarId, PropPatch $propPatch) {
 		$supportedProperties = array_keys($this->propertyMap);
-		$supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
+		$supportedProperties[] = '{'.Plugin::NS_CALDAV.'}schedule-calendar-transp';
 
-		$propPatch->handle($supportedProperties, function ($mutations) use ($calendarId) {
+		$propPatch->handle($supportedProperties, function($mutations) use ($calendarId) {
 			$newValues = [];
 			foreach ($mutations as $propertyName => $propertyValue) {
 				switch ($propertyName) {
-					case '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp':
+					case '{'.Plugin::NS_CALDAV.'}schedule-calendar-transp':
 						$fieldName = 'transparent';
-						$newValues[$fieldName] = (int)($propertyValue->getValue() === 'transparent');
+						$newValues[$fieldName] = (int) ($propertyValue->getValue() === 'transparent');
 						break;
 					default:
 						$fieldName = $this->propertyMap[$propertyName][0];
@@ -900,7 +900,7 @@ 
 						break;
 				}
 			}
-			[$calendarData, $shares] = $this->atomic(function () use ($calendarId, $newValues) {
+			[$calendarData, $shares] = $this->atomic(function() use ($calendarId, $newValues) {
 				$query = $this->db->getQueryBuilder();
 				$query->update('calendars');
 				foreach ($newValues as $fieldName => $value) {
@@ -929,9 +929,9 @@ 
 	 * @return void
 	 */
 	public function deleteCalendar($calendarId, bool $forceDeletePermanently = false) {
-		$this->publishStatusCache->remove((string)$calendarId);
+		$this->publishStatusCache->remove((string) $calendarId);
 
-		$this->atomic(function () use ($calendarId, $forceDeletePermanently): void {
+		$this->atomic(function() use ($calendarId, $forceDeletePermanently): void {
 			// The calendar is deleted right away if this is either enforced by the caller
 			// or the special contacts birthday calendar or when the preference of an empty
 			// retention (0 seconds) is set, which signals a disabled trashbin.
@@ -994,7 +994,7 @@ 
 	}
 
 	public function restoreCalendar(int $id): void {
-		$this->atomic(function () use ($id): void {
+		$this->atomic(function() use ($id): void {
 			$qb = $this->db->getQueryBuilder();
 			$update = $qb->update('calendars')
 				->set('deleted_at', $qb->createNamedParameter(null))
@@ -1141,11 +1141,11 @@ 
 				'id' => $row['id'],
 				'uri' => $row['uri'],
 				'lastmodified' => $row['lastmodified'],
-				'etag' => '"' . $row['etag'] . '"',
+				'etag' => '"'.$row['etag'].'"',
 				'calendarid' => $row['calendarid'],
-				'size' => (int)$row['size'],
+				'size' => (int) $row['size'],
 				'component' => strtolower($row['componenttype']),
-				'classification' => (int)$row['classification']
+				'classification' => (int) $row['classification']
 			];
 		}
 		$stmt->closeCursor();
@@ -1168,13 +1168,13 @@ 
 				'id' => $row['id'],
 				'uri' => $row['uri'],
 				'lastmodified' => $row['lastmodified'],
-				'etag' => '"' . $row['etag'] . '"',
-				'calendarid' => (int)$row['calendarid'],
-				'calendartype' => (int)$row['calendartype'],
-				'size' => (int)$row['size'],
+				'etag' => '"'.$row['etag'].'"',
+				'calendarid' => (int) $row['calendarid'],
+				'calendartype' => (int) $row['calendartype'],
+				'size' => (int) $row['size'],
 				'component' => strtolower($row['componenttype']),
-				'classification' => (int)$row['classification'],
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int)$row['deleted_at'],
+				'classification' => (int) $row['classification'],
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD.'}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int) $row['deleted_at'],
 			];
 		}
 		$stmt->closeCursor();
@@ -1207,13 +1207,13 @@ 
 				'id' => $row['id'],
 				'uri' => $row['uri'],
 				'lastmodified' => $row['lastmodified'],
-				'etag' => '"' . $row['etag'] . '"',
+				'etag' => '"'.$row['etag'].'"',
 				'calendarid' => $row['calendarid'],
 				'calendaruri' => $row['calendaruri'],
-				'size' => (int)$row['size'],
+				'size' => (int) $row['size'],
 				'component' => strtolower($row['componenttype']),
-				'classification' => (int)$row['classification'],
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int)$row['deleted_at'],
+				'classification' => (int) $row['classification'],
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD.'}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int) $row['deleted_at'],
 			];
 		}
 		$stmt->closeCursor();
@@ -1239,7 +1239,7 @@ 
 	 * @return array|null
 	 */
 	public function getCalendarObject($calendarId, $objectUri, int $calendarType = self::CALENDAR_TYPE_CALENDAR) {
-		$key = $calendarId . '::' . $objectUri . '::' . $calendarType;
+		$key = $calendarId.'::'.$objectUri.'::'.$calendarType;
 		if (isset($this->cachedObjects[$key])) {
 			return $this->cachedObjects[$key];
 		}
@@ -1268,13 +1268,13 @@ 
 			'uri' => $row['uri'],
 			'uid' => $row['uid'],
 			'lastmodified' => $row['lastmodified'],
-			'etag' => '"' . $row['etag'] . '"',
+			'etag' => '"'.$row['etag'].'"',
 			'calendarid' => $row['calendarid'],
-			'size' => (int)$row['size'],
+			'size' => (int) $row['size'],
 			'calendardata' => $this->readBlob($row['calendardata']),
 			'component' => strtolower($row['componenttype']),
-			'classification' => (int)$row['classification'],
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int)$row['deleted_at'],
+			'classification' => (int) $row['classification'],
+			'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD.'}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int) $row['deleted_at'],
 		];
 	}
 
@@ -1316,12 +1316,12 @@ 
 					'id' => $row['id'],
 					'uri' => $row['uri'],
 					'lastmodified' => $row['lastmodified'],
-					'etag' => '"' . $row['etag'] . '"',
+					'etag' => '"'.$row['etag'].'"',
 					'calendarid' => $row['calendarid'],
-					'size' => (int)$row['size'],
+					'size' => (int) $row['size'],
 					'calendardata' => $this->readBlob($row['calendardata']),
 					'component' => strtolower($row['componenttype']),
-					'classification' => (int)$row['classification']
+					'classification' => (int) $row['classification']
 				];
 			}
 			$result->closeCursor();
@@ -1353,7 +1353,7 @@ 
 		$this->cachedObjects = [];
 		$extraData = $this->getDenormalizedData($calendarData);
 
-		return $this->atomic(function () use ($calendarId, $objectUri, $calendarData, $extraData, $calendarType) {
+		return $this->atomic(function() use ($calendarId, $objectUri, $calendarData, $extraData, $calendarType) {
 			// Try to detect duplicates
 			$qb = $this->db->getQueryBuilder();
 			$qb->select($qb->func()->count('*'))
@@ -1363,7 +1363,7 @@ 
 				->andWhere($qb->expr()->eq('calendartype', $qb->createNamedParameter($calendarType)))
 				->andWhere($qb->expr()->isNull('deleted_at'));
 			$result = $qb->executeQuery();
-			$count = (int)$result->fetchOne();
+			$count = (int) $result->fetchOne();
 			$result->closeCursor();
 
 			if ($count !== 0) {
@@ -1423,7 +1423,7 @@ 
 				// TODO: implement custom event for federated calendars
 			}
 
-			return '"' . $extraData['etag'] . '"';
+			return '"'.$extraData['etag'].'"';
 		}, $this->db);
 	}
 
@@ -1450,7 +1450,7 @@ 
 		$this->cachedObjects = [];
 		$extraData = $this->getDenormalizedData($calendarData);
 
-		return $this->atomic(function () use ($calendarId, $objectUri, $calendarData, $extraData, $calendarType) {
+		return $this->atomic(function() use ($calendarId, $objectUri, $calendarData, $extraData, $calendarType) {
 			$query = $this->db->getQueryBuilder();
 			$query->update('calendarobjects')
 				->set('calendardata', $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB))
@@ -1486,7 +1486,7 @@ 
 				}
 			}
 
-			return '"' . $extraData['etag'] . '"';
+			return '"'.$extraData['etag'].'"';
 		}, $this->db);
 	}
 
@@ -1504,7 +1504,7 @@ 
 	 */
 	public function moveCalendarObject(string $sourcePrincipalUri, int $sourceObjectId, string $targetPrincipalUri, int $targetCalendarId, string $tragetObjectUri, int $calendarType = self::CALENDAR_TYPE_CALENDAR): bool {
 		$this->cachedObjects = [];
-		return $this->atomic(function () use ($sourcePrincipalUri, $sourceObjectId, $targetPrincipalUri, $targetCalendarId, $tragetObjectUri, $calendarType) {
+		return $this->atomic(function() use ($sourcePrincipalUri, $sourceObjectId, $targetPrincipalUri, $targetCalendarId, $tragetObjectUri, $calendarType) {
 			$object = $this->getCalendarObjectById($sourcePrincipalUri, $sourceObjectId);
 			if (empty($object)) {
 				return false;
@@ -1561,7 +1561,7 @@ 
 	 */
 	public function deleteCalendarObject($calendarId, $objectUri, $calendarType = self::CALENDAR_TYPE_CALENDAR, bool $forceDeletePermanently = false) {
 		$this->cachedObjects = [];
-		$this->atomic(function () use ($calendarId, $objectUri, $calendarType, $forceDeletePermanently): void {
+		$this->atomic(function() use ($calendarId, $objectUri, $calendarType, $forceDeletePermanently): void {
 			$data = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
 
 			if ($data === null) {
@@ -1645,8 +1645,8 @@ 
 	 */
 	public function restoreCalendarObject(array $objectData): void {
 		$this->cachedObjects = [];
-		$this->atomic(function () use ($objectData): void {
-			$id = (int)$objectData['id'];
+		$this->atomic(function() use ($objectData): void {
+			$id = (int) $objectData['id'];
 			$restoreUri = str_replace('-deleted.ics', '.ics', $objectData['uri']);
 			$targetObject = $this->getCalendarObject(
 				$objectData['calendarid'],
@@ -1676,17 +1676,17 @@ 
 				// Welp, this should possibly not have happened, but let's ignore
 				return;
 			}
-			$this->addChanges($row['calendarid'], [$row['uri']], 1, (int)$row['calendartype']);
+			$this->addChanges($row['calendarid'], [$row['uri']], 1, (int) $row['calendartype']);
 
-			$calendarRow = $this->getCalendarById((int)$row['calendarid']);
+			$calendarRow = $this->getCalendarById((int) $row['calendarid']);
 			if ($calendarRow === null) {
 				throw new RuntimeException('Calendar object data that was just written can\'t be read back. Check your database configuration.');
 			}
 			$this->dispatcher->dispatchTyped(
 				new CalendarObjectRestoredEvent(
-					(int)$objectData['calendarid'],
+					(int) $objectData['calendarid'],
 					$calendarRow,
-					$this->getShares((int)$row['calendarid']),
+					$this->getShares((int) $row['calendarid']),
 					$row
 				)
 			);
@@ -1805,19 +1805,19 @@ 
 				try {
 					$matches = $this->validateFilterForObject($row, $filters);
 				} catch (ParseException $ex) {
-					$this->logger->error('Caught parsing exception for calendar data. This usually indicates invalid calendar data. calendar-id:' . $calendarId . ' uri:' . $row['uri'], [
+					$this->logger->error('Caught parsing exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$calendarId.' uri:'.$row['uri'], [
 						'app' => 'dav',
 						'exception' => $ex,
 					]);
 					continue;
 				} catch (InvalidDataException $ex) {
-					$this->logger->error('Caught invalid data exception for calendar data. This usually indicates invalid calendar data. calendar-id:' . $calendarId . ' uri:' . $row['uri'], [
+					$this->logger->error('Caught invalid data exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$calendarId.' uri:'.$row['uri'], [
 						'app' => 'dav',
 						'exception' => $ex,
 					]);
 					continue;
 				} catch (MaxInstancesExceededException $ex) {
-					$this->logger->warning('Caught max instances exceeded exception for calendar data. This usually indicates too much recurring (more than 3500) event in calendar data. Object uri: ' . $row['uri'], [
+					$this->logger->warning('Caught max instances exceeded exception for calendar data. This usually indicates too much recurring (more than 3500) event in calendar data. Object uri: '.$row['uri'], [
 						'app' => 'dav',
 						'exception' => $ex,
 					]);
@@ -1829,7 +1829,7 @@ 
 				}
 			}
 			$result[] = $row['uri'];
-			$key = $calendarId . '::' . $row['uri'] . '::' . $calendarType;
+			$key = $calendarId.'::'.$row['uri'].'::'.$calendarType;
 			$this->cachedObjects[$key] = $this->rowToCalendarObject($row);
 		}
 
@@ -1848,7 +1848,7 @@ 
 	 * @return array
 	 */
 	public function calendarSearch($principalUri, array $filters, $limit = null, $offset = null) {
-		return $this->atomic(function () use ($principalUri, $filters, $limit, $offset) {
+		return $this->atomic(function() use ($principalUri, $filters, $limit, $offset) {
 			$calendars = $this->getCalendarsForUser($principalUri);
 			$ownCalendars = [];
 			$sharedCalendars = [];
@@ -1940,7 +1940,7 @@ 
 				->andWhere($compExpr)
 				->andWhere($propParamExpr)
 				->andWhere($query->expr()->iLike('i.value',
-					$query->createNamedParameter('%' . $this->db->escapeLikeParameter($filters['search-term']) . '%')))
+					$query->createNamedParameter('%'.$this->db->escapeLikeParameter($filters['search-term']).'%')))
 				->andWhere($query->expr()->isNull('deleted_at'));
 
 			if ($offset) {
@@ -1954,7 +1954,7 @@ 
 
 			$result = [];
 			while ($row = $stmt->fetchAssociative()) {
-				$path = $uriMapper[$row['calendarid']] . '/' . $row['uri'];
+				$path = $uriMapper[$row['calendarid']].'/'.$row['uri'];
 				if (!in_array($path, $result)) {
 					$result[] = $path;
 				}
@@ -2024,7 +2024,7 @@ 
 		if ($pattern !== '') {
 			$innerQuery->andWhere($innerQuery->expr()->iLike('op.value',
 				$outerQuery->createNamedParameter('%'
-					. $this->db->escapeLikeParameter($pattern) . '%')));
+					. $this->db->escapeLikeParameter($pattern).'%')));
 		}
 
 		$start = null;
@@ -2076,7 +2076,7 @@ 
 		// For the pagination with hasLimit and hasTimeRange, a stable ordering is helpful.
 		$outerQuery->addOrderBy('id');
 
-		$offset = (int)$offset;
+		$offset = (int) $offset;
 		$outerQuery->setFirstResult($offset);
 
 		$calendarObjects = [];
@@ -2097,7 +2097,7 @@ 
 			 *
 			 * 25 rows and 3 retries is entirely arbitrary.
 			 */
-			$maxResults = (int)max($limit, 25);
+			$maxResults = (int) max($limit, 25);
 			$outerQuery->setMaxResults($maxResults);
 
 			for ($attempt = $objectsCount = 0; $attempt < 3 && $objectsCount < $limit; $attempt++) {
@@ -2111,7 +2111,7 @@ 
 			$calendarObjects = $this->searchCalendarObjects($outerQuery, $start, $end);
 		}
 
-		$calendarObjects = array_map(function ($o) use ($options) {
+		$calendarObjects = array_map(function($o) use ($options) {
 			$calendarData = Reader::read($o['calendardata']);
 
 			// Expand recurrences if an explicit time range is requested
@@ -2139,16 +2139,16 @@ 
 				'type' => $o['componenttype'],
 				'uid' => $o['uid'],
 				'uri' => $o['uri'],
-				'objects' => array_map(function ($c) {
+				'objects' => array_map(function($c) {
 					return $this->transformSearchData($c);
 				}, $objects),
-				'timezones' => array_map(function ($c) {
+				'timezones' => array_map(function($c) {
 					return $this->transformSearchData($c);
 				}, $timezones),
 			];
 		}, $calendarObjects);
 
-		usort($calendarObjects, function (array $a, array $b) {
+		usort($calendarObjects, function(array $a, array $b) {
 			/** @var DateTimeImmutable $startA */
 			$startA = $a['objects'][0]['DTSTART'][0] ?? new DateTimeImmutable(self::MAX_DATE);
 			/** @var DateTimeImmutable $startB */
@@ -2193,7 +2193,7 @@ 
 					'time-range' => null,
 				]);
 			} catch (MaxInstancesExceededException $ex) {
-				$this->logger->warning('Caught max instances exceeded exception for calendar data. This usually indicates too much recurring (more than 3500) event in calendar data. Object uri: ' . $row['uri'], [
+				$this->logger->warning('Caught max instances exceeded exception for calendar data. This usually indicates too much recurring (more than 3500) event in calendar data. Object uri: '.$row['uri'], [
 					'app' => 'dav',
 					'exception' => $ex,
 				]);
@@ -2224,7 +2224,7 @@ 
 		/** @var Component[] $subComponents */
 		$subComponents = $comp->getComponents();
 		/** @var Property[] $properties */
-		$properties = array_filter($comp->children(), function ($c) {
+		$properties = array_filter($comp->children(), function($c) {
 			return $c instanceof Property;
 		});
 		$validationRules = $comp->getValidationRules();
@@ -2292,7 +2292,7 @@ 
 		array $searchParameters,
 		array $options = [],
 	): array {
-		return $this->atomic(function () use ($principalUri, $pattern, $componentTypes, $searchProperties, $searchParameters, $options) {
+		return $this->atomic(function() use ($principalUri, $pattern, $componentTypes, $searchProperties, $searchParameters, $options) {
 			$escapePattern = !\array_key_exists('escape_like_param', $options) || $options['escape_like_param'] !== false;
 
 			$calendarObjectIdQuery = $this->db->getQueryBuilder();
@@ -2304,7 +2304,7 @@ 
 			$subscriptions = $this->getSubscriptionsForUser($principalUri);
 			foreach ($calendars as $calendar) {
 				$calendarAnd = $calendarObjectIdQuery->expr()->andX(
-					$calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int)$calendar['id'])),
+					$calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int) $calendar['id'])),
 					$calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)),
 				);
 
@@ -2318,7 +2318,7 @@ 
 			}
 			foreach ($subscriptions as $subscription) {
 				$subscriptionAnd = $calendarObjectIdQuery->expr()->andX(
-					$calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int)$subscription['id'])),
+					$calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int) $subscription['id'])),
 					$calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)),
 				);
 
@@ -2367,7 +2367,7 @@ 
 				if (!$escapePattern) {
 					$calendarObjectIdQuery->andWhere($calendarObjectIdQuery->expr()->ilike('cob.value', $calendarObjectIdQuery->createNamedParameter($pattern)));
 				} else {
-					$calendarObjectIdQuery->andWhere($calendarObjectIdQuery->expr()->ilike('cob.value', $calendarObjectIdQuery->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
+					$calendarObjectIdQuery->andWhere($calendarObjectIdQuery->expr()->ilike('cob.value', $calendarObjectIdQuery->createNamedParameter('%'.$this->db->escapeLikeParameter($pattern).'%')));
 				}
 			}
 
@@ -2395,7 +2395,7 @@ 
 			$result = $calendarObjectIdQuery->executeQuery();
 			$matches = [];
 			while (($row = $result->fetchAssociative()) !== false) {
-				$matches[] = (int)$row['objectid'];
+				$matches[] = (int) $row['objectid'];
 			}
 			$result->closeCursor();
 
@@ -2407,8 +2407,8 @@ 
 			$result = $query->executeQuery();
 			$calendarObjects = [];
 			while (($array = $result->fetchAssociative()) !== false) {
-				$array['calendarid'] = (int)$array['calendarid'];
-				$array['calendartype'] = (int)$array['calendartype'];
+				$array['calendarid'] = (int) $array['calendarid'];
+				$array['calendartype'] = (int) $array['calendartype'];
 				$array['calendardata'] = $this->readBlob($array['calendardata']);
 
 				$calendarObjects[] = $array;
@@ -2454,7 +2454,7 @@ 
 		$row = $stmt->fetchAssociative();
 		$stmt->closeCursor();
 		if ($row) {
-			return $row['calendaruri'] . '/' . $row['objecturi'];
+			return $row['calendaruri'].'/'.$row['objecturi'];
 		}
 
 		return null;
@@ -2480,14 +2480,14 @@ 
 			'id' => $row['id'],
 			'uri' => $row['uri'],
 			'lastmodified' => $row['lastmodified'],
-			'etag' => '"' . $row['etag'] . '"',
+			'etag' => '"'.$row['etag'].'"',
 			'calendarid' => $row['calendarid'],
 			'calendaruri' => $row['calendaruri'],
-			'size' => (int)$row['size'],
+			'size' => (int) $row['size'],
 			'calendardata' => $this->readBlob($row['calendardata']),
 			'component' => strtolower($row['componenttype']),
-			'classification' => (int)$row['classification'],
-			'deleted_at' => isset($row['deleted_at']) ? ((int)$row['deleted_at']) : null,
+			'classification' => (int) $row['classification'],
+			'deleted_at' => isset($row['deleted_at']) ? ((int) $row['deleted_at']) : null,
 		];
 	}
 
@@ -2549,9 +2549,9 @@ 
 	 * @return ?array
 	 */
 	public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
-		$table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars': 'calendarsubscriptions';
+		$table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars' : 'calendarsubscriptions';
 
-		return $this->atomic(function () use ($calendarId, $syncToken, $syncLevel, $limit, $calendarType, $table) {
+		return $this->atomic(function() use ($calendarId, $syncToken, $syncLevel, $limit, $calendarType, $table) {
 			// Current synctoken
 			$qb = $this->db->getQueryBuilder();
 			$qb->select('synctoken')
@@ -2602,7 +2602,7 @@ 
 				while ($entry = $stmt->fetchNumeric()) {
 					// assign uri (column 0) to appropriate mutation based on operation (column 1)
 					// forced (int) is needed as doctrine with OCI returns the operation field as string not integer
-					match ((int)$entry[1]) {
+					match ((int) $entry[1]) {
 						1 => $result['added'][] = $entry[0],
 						2 => $result['modified'][] = $entry[0],
 						3 => $result['deleted'][] = $entry[0],
@@ -2673,7 +2673,7 @@ 
 				'source' => $row['source'],
 				'lastmodified' => $row['lastmodified'],
 
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
 				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 			];
 
@@ -2717,7 +2717,7 @@ 
 			}
 		}
 
-		[$subscriptionId, $subscriptionRow] = $this->atomic(function () use ($values) {
+		[$subscriptionId, $subscriptionRow] = $this->atomic(function() use ($values) {
 			$valuesToInsert = [];
 			$query = $this->db->getQueryBuilder();
 			foreach (array_keys($values) as $name) {
@@ -2758,7 +2758,7 @@ 
 		$supportedProperties = array_keys($this->subscriptionPropertyMap);
 		$supportedProperties[] = '{http://calendarserver.org/ns/}source';
 
-		$propPatch->handle($supportedProperties, function ($mutations) use ($subscriptionId) {
+		$propPatch->handle($supportedProperties, function($mutations) use ($subscriptionId) {
 			$newValues = [];
 
 			foreach ($mutations as $propertyName => $propertyValue) {
@@ -2770,7 +2770,7 @@ 
 				}
 			}
 
-			$subscriptionRow = $this->atomic(function () use ($subscriptionId, $newValues) {
+			$subscriptionRow = $this->atomic(function() use ($subscriptionId, $newValues) {
 				$query = $this->db->getQueryBuilder();
 				$query->update('calendarsubscriptions')
 					->set('lastmodified', $query->createNamedParameter(time()));
@@ -2783,7 +2783,7 @@ 
 				return $this->getSubscriptionById($subscriptionId);
 			}, $this->db);
 
-			$this->dispatcher->dispatchTyped(new SubscriptionUpdatedEvent((int)$subscriptionId, $subscriptionRow, [], $mutations));
+			$this->dispatcher->dispatchTyped(new SubscriptionUpdatedEvent((int) $subscriptionId, $subscriptionRow, [], $mutations));
 
 			return true;
 		});
@@ -2796,7 +2796,7 @@ 
 	 * @return void
 	 */
 	public function deleteSubscription($subscriptionId) {
-		$this->atomic(function () use ($subscriptionId): void {
+		$this->atomic(function() use ($subscriptionId): void {
 			$subscriptionRow = $this->getSubscriptionById($subscriptionId);
 
 			$query = $this->db->getQueryBuilder();
@@ -2821,7 +2821,7 @@ 
 				->executeStatement();
 
 			if ($subscriptionRow) {
-				$this->dispatcher->dispatchTyped(new SubscriptionDeletedEvent((int)$subscriptionId, $subscriptionRow, []));
+				$this->dispatcher->dispatchTyped(new SubscriptionDeletedEvent((int) $subscriptionId, $subscriptionRow, []));
 			}
 		}, $this->db);
 	}
@@ -2860,8 +2860,8 @@ 
 			'uri' => $row['uri'],
 			'calendardata' => $row['calendardata'],
 			'lastmodified' => $row['lastmodified'],
-			'etag' => '"' . $row['etag'] . '"',
-			'size' => (int)$row['size'],
+			'etag' => '"'.$row['etag'].'"',
+			'size' => (int) $row['size'],
 		];
 	}
 
@@ -2889,8 +2889,8 @@ 
 				'calendardata' => $row['calendardata'],
 				'uri' => $row['uri'],
 				'lastmodified' => $row['lastmodified'],
-				'etag' => '"' . $row['etag'] . '"',
-				'size' => (int)$row['size'],
+				'etag' => '"'.$row['etag'].'"',
+				'size' => (int) $row['size'],
 			];
 		}
 		$stmt->closeCursor();
@@ -2932,8 +2932,8 @@ 
 		if ($count === 0) {
 			return;
 		}
-		$ids = array_map(static function (array $id) {
-			return (int)$id[0];
+		$ids = array_map(static function(array $id) {
+			return (int) $id[0];
 		}, $result->fetchAllNumeric());
 		$result->closeCursor();
 
@@ -2986,15 +2986,15 @@ 
 	 */
 	protected function addChanges(int $calendarId, array $objectUris, int $operation, int $calendarType = self::CALENDAR_TYPE_CALENDAR): void {
 		$this->cachedObjects = [];
-		$table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars': 'calendarsubscriptions';
+		$table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars' : 'calendarsubscriptions';
 
-		$this->atomic(function () use ($calendarId, $objectUris, $operation, $calendarType, $table): void {
+		$this->atomic(function() use ($calendarId, $objectUris, $operation, $calendarType, $table): void {
 			$query = $this->db->getQueryBuilder();
 			$query->select('synctoken')
 				->from($table)
 				->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
 			$result = $query->executeQuery();
-			$syncToken = (int)$result->fetchOne();
+			$syncToken = (int) $result->fetchOne();
 			$result->closeCursor();
 
 			$query = $this->db->getQueryBuilder();
@@ -3023,7 +3023,7 @@ 
 	public function restoreChanges(int $calendarId, int $calendarType = self::CALENDAR_TYPE_CALENDAR): void {
 		$this->cachedObjects = [];
 
-		$this->atomic(function () use ($calendarId, $calendarType): void {
+		$this->atomic(function() use ($calendarId, $calendarType): void {
 			$qbAdded = $this->db->getQueryBuilder();
 			$qbAdded->select('uri')
 				->from('calendarobjects')
@@ -3053,7 +3053,7 @@ 
 					)
 				);
 			$resultDeleted = $qbDeleted->executeQuery();
-			$deletedUris = array_map(function (string $uri) {
+			$deletedUris = array_map(function(string $uri) {
 				return str_replace('-deleted.ics', '.ics', $uri);
 			}, $resultDeleted->fetchFirstColumn());
 			$resultDeleted->closeCursor();
@@ -3098,7 +3098,7 @@ 
 				// Track first component type and uid
 				if ($uid === null) {
 					$componentType = $component->name;
-					$uid = (string)$component->UID;
+					$uid = (string) $component->UID;
 				}
 			}
 		}
@@ -3189,11 +3189,11 @@ 
 	 * @param list<string> $remove
 	 */
 	public function updateShares(IShareable $shareable, array $add, array $remove): void {
-		$this->atomic(function () use ($shareable, $add, $remove): void {
+		$this->atomic(function() use ($shareable, $add, $remove): void {
 			$calendarId = $shareable->getResourceId();
 			$calendarRow = $this->getCalendarById($calendarId);
 			if ($calendarRow === null) {
-				throw new \RuntimeException('Trying to update shares for non-existing calendar: ' . $calendarId);
+				throw new \RuntimeException('Trying to update shares for non-existing calendar: '.$calendarId);
 			}
 			$oldShares = $this->getShares($calendarId);
 
@@ -3224,7 +3224,7 @@ 
 	 * @return string|null
 	 */
 	public function setPublishStatus($value, $calendar) {
-		$publishStatus = $this->atomic(function () use ($value, $calendar) {
+		$publishStatus = $this->atomic(function() use ($value, $calendar) {
 			$calendarId = $calendar->getResourceId();
 			$calendarData = $this->getCalendarById($calendarId);
 
@@ -3253,7 +3253,7 @@ 
 			return null;
 		}, $this->db);
 
-		$this->publishStatusCache->set((string)$calendar->getResourceId(), $publishStatus ?? false);
+		$this->publishStatusCache->set((string) $calendar->getResourceId(), $publishStatus ?? false);
 		return $publishStatus;
 	}
 
@@ -3262,7 +3262,7 @@ 
 	 * @return string|false
 	 */
 	public function getPublishStatus($calendar) {
-		$cached = $this->publishStatusCache->get((string)$calendar->getResourceId());
+		$cached = $this->publishStatusCache->get((string) $calendar->getResourceId());
 		if ($cached !== null) {
 			return $cached;
 		}
@@ -3277,7 +3277,7 @@ 
 		$publishStatus = $result->fetchOne();
 		$result->closeCursor();
 
-		$this->publishStatusCache->set((string)$calendar->getResourceId(), $publishStatus);
+		$this->publishStatusCache->set((string) $calendar->getResourceId(), $publishStatus);
 		return $publishStatus;
 	}
 
@@ -3302,14 +3302,14 @@ 
 
 		$hasPublishStatuses = [];
 		while ($row = $result->fetchAssociative()) {
-			$this->publishStatusCache->set((string)$row['resourceid'], $row['publicuri']);
-			$hasPublishStatuses[(int)$row['resourceid']] = true;
+			$this->publishStatusCache->set((string) $row['resourceid'], $row['publicuri']);
+			$hasPublishStatuses[(int) $row['resourceid']] = true;
 		}
 
 		// Also remember resources with no publish status
 		foreach ($resourceIds as $resourceId) {
 			if (!isset($hasPublishStatuses[$resourceId])) {
-				$this->publishStatusCache->set((string)$resourceId, false);
+				$this->publishStatusCache->set((string) $resourceId, false);
 			}
 		}
 
@@ -3336,7 +3336,7 @@ 
 	 */
 	public function updateProperties($calendarId, $objectUri, $calendarData, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
 		$this->cachedObjects = [];
-		$this->atomic(function () use ($calendarId, $objectUri, $calendarData, $calendarType): void {
+		$this->atomic(function() use ($calendarId, $objectUri, $calendarData, $calendarType): void {
 			$objectId = $this->getCalendarObjectId($calendarId, $objectUri, $calendarType);
 
 			try {
@@ -3408,7 +3408,7 @@ 
 	 * deletes all birthday calendars
 	 */
 	public function deleteAllBirthdayCalendars() {
-		$this->atomic(function (): void {
+		$this->atomic(function(): void {
 			$query = $this->db->getQueryBuilder();
 			$result = $query->select(['id'])->from('calendars')
 				->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)))
@@ -3428,7 +3428,7 @@ 
 	 * @param $subscriptionId
 	 */
 	public function purgeAllCachedEventsForSubscription($subscriptionId) {
-		$this->atomic(function () use ($subscriptionId): void {
+		$this->atomic(function() use ($subscriptionId): void {
 			$query = $this->db->getQueryBuilder();
 			$query->select('uri')
 				->from('calendarobjects')
@@ -3474,7 +3474,7 @@ 
 			return;
 		}
 
-		$this->atomic(function () use ($subscriptionId, $calendarObjectIds, $calendarObjectUris): void {
+		$this->atomic(function() use ($subscriptionId, $calendarObjectIds, $calendarObjectUris): void {
 			foreach (array_chunk($calendarObjectIds, 1000) as $chunk) {
 				$query = $this->db->getQueryBuilder();
 				$query->delete($this->dbObjectPropertiesTable)
@@ -3567,10 +3567,10 @@ 
 		$result->closeCursor();
 
 		if (!isset($objectIds['id'])) {
-			throw new \InvalidArgumentException('Calendarobject does not exists: ' . $uri);
+			throw new \InvalidArgumentException('Calendarobject does not exists: '.$uri);
 		}
 
-		return (int)$objectIds['id'];
+		return (int) $objectIds['id'];
 	}
 
 	/**
@@ -3586,7 +3586,7 @@ 
 			->from('calendarchanges');
 
 		$result = $query->executeQuery();
-		$maxId = (int)$result->fetchOne();
+		$maxId = (int) $result->fetchOne();
 		$result->closeCursor();
 		if (!$maxId || $maxId < $keep) {
 			return 0;
@@ -3624,8 +3624,8 @@ 
 	 *
 	 */
 	private function addOwnerPrincipalToCalendar(array $calendarInfo): array {
-		$ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
-		$displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
+		$ownerPrincipalKey = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal';
+		$displaynameKey = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD.'}owner-displayname';
 		if (isset($calendarInfo[$ownerPrincipalKey])) {
 			$uri = $calendarInfo[$ownerPrincipalKey];
 		} else {
@@ -3736,10 +3736,10 @@ 
 	}
 
 	public function unshare(IShareable $shareable, string $principal): void {
-		$this->atomic(function () use ($shareable, $principal): void {
+		$this->atomic(function() use ($shareable, $principal): void {
 			$calendarData = $this->getCalendarById($shareable->getResourceId());
 			if ($calendarData === null) {
-				throw new \RuntimeException('Trying to update shares for non-existing calendar: ' . $shareable->getResourceId());
+				throw new \RuntimeException('Trying to update shares for non-existing calendar: '.$shareable->getResourceId());
 			}
 
 			$oldShares = $this->getShares($shareable->getResourceId());

apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php

Spacing +4 added lines, -4 removed lines

@@ -66,7 +66,7 @@ 
 		$stripAttachments = ($subscription[self::STRIP_ATTACHMENTS] ?? 1) === 1;
 
 		try {
-			$existingObjects = $this->calDavBackend->getLimitedCalendarObjects((int)$subscription['id'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION, ['id', 'uid', 'etag', 'uri']);
+			$existingObjects = $this->calDavBackend->getLimitedCalendarObjects((int) $subscription['id'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION, ['id', 'uid', 'etag', 'uri']);
 
 			$generator = match ($format) {
 				'xcal' => $this->importService->importXml(...),
@@ -118,7 +118,7 @@ 
 					try {
 						$this->calDavBackend->createCalendarObject(
 							$subscription['id'],
-							UUIDUtil::getUUID() . '.ics',
+							UUIDUtil::getUUID().'.ics',
 							$sObject,
 							CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION
 						);
@@ -149,7 +149,7 @@ 
 			if (!empty($existingObjects)) {
 				$ids = array_map('intval', array_column($existingObjects, 'id'));
 				$uris = array_column($existingObjects, 'uri');
-				$this->calDavBackend->purgeCachedEventsForSubscription((int)$subscription['id'], $ids, $uris);
+				$this->calDavBackend->purgeCachedEventsForSubscription((int) $subscription['id'], $ids, $uris);
 			}
 
 			// Update refresh rate from the last processed object
@@ -172,7 +172,7 @@ 
 	public function getSubscription(string $principalUri, string $uri): ?array {
 		$subscriptions = array_values(array_filter(
 			$this->calDavBackend->getSubscriptionsForUser($principalUri),
-			function ($sub) use ($uri) {
+			function($sub) use ($uri) {
 				return $sub['uri'] === $uri;
 			}
 		));

apps/dav/tests/unit/CalDAV/WebcalCaching/RefreshWebcalServiceTest.php

Spacing +8 added lines, -8 removed lines

@@ -99,7 +99,7 @@ 
 		// Create a VCalendar object that will be yielded by the import service
 		$vCalendar = VObject\Reader::read($result);
 
-		$generator = function () use ($vCalendar) {
+		$generator = function() use ($vCalendar) {
 			yield $vCalendar;
 		};
 
@@ -168,7 +168,7 @@ 
 		// Create a VCalendar object that will be yielded by the import service
 		$vCalendar = VObject\Reader::read($result);
 
-		$generator = function () use ($vCalendar) {
+		$generator = function() use ($vCalendar) {
 			yield $vCalendar;
 		};
 
@@ -283,7 +283,7 @@ 
 			]);
 
 		$vCalendar = VObject\Reader::read($body);
-		$generator = function () use ($vCalendar) {
+		$generator = function() use ($vCalendar) {
 			yield $vCalendar;
 		};
 
@@ -339,7 +339,7 @@ 
 			->willReturn([]);
 
 		$vCalendar = VObject\Reader::read($body);
-		$generator = function () use ($vCalendar) {
+		$generator = function() use ($vCalendar) {
 			yield $vCalendar;
 		};
 
@@ -387,7 +387,7 @@ 
 		// Create a VCalendar object that will be yielded by the import service
 		$vCalendar = VObject\Reader::read($result);
 
-		$generator = function () use ($vCalendar) {
+		$generator = function() use ($vCalendar) {
 			yield $vCalendar;
 		};
 
@@ -440,7 +440,7 @@ 
 		// Create a VCalendar object that will be yielded by the import service
 		$vCalendar = VObject\Reader::read($result);
 
-		$generator = function () use ($vCalendar) {
+		$generator = function() use ($vCalendar) {
 			yield $vCalendar;
 		};
 
@@ -461,7 +461,7 @@ 
 	}
 
 	public static function identicalDataProvider(): array {
-		$icalBody = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject " . VObject\Version::VERSION . "//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:12345\r\nDTSTAMP:20160218T133704Z\r\nDTSTART;VALUE=DATE:19000101\r\nDTEND;VALUE=DATE:19000102\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:12345's Birthday (1900)\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
+		$icalBody = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject ".VObject\Version::VERSION."//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:12345\r\nDTSTAMP:20160218T133704Z\r\nDTSTART;VALUE=DATE:19000101\r\nDTEND;VALUE=DATE:19000102\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:12345's Birthday (1900)\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
 		$etag = md5($icalBody);
 
 		return [
@@ -486,7 +486,7 @@ 
 			[
 				"BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:12345\r\nDTSTAMP:20160218T133704Z\r\nDTSTART;VALUE=DATE:19000101\r\nDTEND;VALUE=DATE:19000102\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:12345's Birthday (1900)\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n",
 				'ical',
-				"BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject " . VObject\Version::VERSION . "//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:12345\r\nDTSTAMP:20160218T133704Z\r\nDTSTART;VALUE=DATE:19000101\r\nDTEND;VALUE=DATE:19000102\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:12345's Birthday (1900)\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n",
+				"BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject ".VObject\Version::VERSION."//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:12345\r\nDTSTAMP:20160218T133704Z\r\nDTSTART;VALUE=DATE:19000101\r\nDTEND;VALUE=DATE:19000102\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:12345's Birthday (1900)\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n",
 			],
 		];
 	}