nextcloud / server

apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php

Spacing +13 added lines, -13 removed lines

@@ -89,9 +89,9 @@ 
 		$this->logger = $logger;
 		$this->proxyMapper = $proxyMapper;
 		$this->principalPrefix = $principalPrefix;
-		$this->dbTableName = 'calendar_' . $dbPrefix . 's';
-		$this->dbMetaDataTableName = $this->dbTableName . '_md';
-		$this->dbForeignKeyName = $dbPrefix . '_id';
+		$this->dbTableName = 'calendar_'.$dbPrefix.'s';
+		$this->dbMetaDataTableName = $this->dbTableName.'_md';
+		$this->dbForeignKeyName = $dbPrefix.'_id';
 		$this->cuType = $cuType;
 	}
 
@@ -165,7 +165,7 @@ 
 		}
 		[, $name] = \Sabre\Uri\split($path);
 
-		[$backendId, $resourceId] = explode('-',  $name, 2);
+		[$backendId, $resourceId] = explode('-', $name, 2);
 
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
@@ -198,7 +198,7 @@ 
 	 * @param int $id
 	 * @return array|null
 	 */
-	public function getPrincipalById($id):?array {
+	public function getPrincipalById($id): ?array {
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
 			->from($this->dbTableName)
@@ -261,7 +261,7 @@ 
 					$query = $this->db->getQueryBuilder();
 					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
 						->from($this->dbTableName)
-						->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+						->where($query->expr()->iLike('email', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 
 					$stmt = $query->execute();
 					$principals = [];
@@ -280,7 +280,7 @@ 
 					$query = $this->db->getQueryBuilder();
 					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
 						->from($this->dbTableName)
-						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 
 					$stmt = $query->execute();
 					$principals = [];
@@ -305,11 +305,11 @@ 
 
 				default:
 					$rowsByMetadata = $this->searchPrincipalsByMetadataKey($prop, $value);
-					$filteredRows = array_filter($rowsByMetadata, function ($row) use ($usersGroups) {
+					$filteredRows = array_filter($rowsByMetadata, function($row) use ($usersGroups) {
 						return $this->isAllowedToAccessResource($row, $usersGroups);
 					});
 
-					$results[] = array_map(function ($row): string {
+					$results[] = array_map(function($row): string {
 						return $row['uri'];
 					}, $filteredRows);
 
@@ -348,7 +348,7 @@ 
 		$query->select([$this->dbForeignKeyName])
 			->from($this->dbMetaDataTableName)
 			->where($query->expr()->eq('key', $query->createNamedParameter($key)))
-			->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+			->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 		$stmt = $query->execute();
 
 		$rows = [];
@@ -405,7 +405,7 @@ 
 			}
 
 			[, $name] = \Sabre\Uri\split($path);
-			[$backendId, $resourceId] = explode('-',  $name, 2);
+			[$backendId, $resourceId] = explode('-', $name, 2);
 
 			$query = $this->db->getQueryBuilder();
 			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
@@ -437,7 +437,7 @@ 
 	 */
 	private function rowToPrincipal(array $row, array $metadata = []):array {
 		return array_merge([
-			'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
+			'uri' => $this->principalPrefix.'/'.$row['backend_id'].'-'.$row['resource_id'],
 			'{DAV:}displayname' => $row['displayname'],
 			'{http://sabredav.org/ns}email-address' => $row['email'],
 			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => $this->cuType,
@@ -459,7 +459,7 @@ 
 		// group restrictions contains something, but not parsable, deny access and log warning
 		$json = json_decode($row['group_restrictions']);
 		if (!\is_array($json)) {
-			$this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
+			$this->logger->info('group_restrictions field could not be parsed for '.$this->dbTableName.'::'.$row['id'].', denying access to resource');
 			return false;
 		}
 

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

Spacing +29 added lines, -29 removed lines

@@ -227,11 +227,11 @@ 
 		}
 
 		$data = [
-			'attendee_name' => (string)$meetingAttendeeName ?: $defaultVal,
-			'invitee_name' => (string)$meetingInviteeName ?: $defaultVal,
-			'meeting_title' => (string)$meetingTitle ?: $defaultVal,
-			'meeting_description' => (string)$meetingDescription ?: $defaultVal,
-			'meeting_url' => (string)$meetingUrl ?: $defaultVal,
+			'attendee_name' => (string) $meetingAttendeeName ?: $defaultVal,
+			'invitee_name' => (string) $meetingInviteeName ?: $defaultVal,
+			'meeting_title' => (string) $meetingTitle ?: $defaultVal,
+			'meeting_description' => (string) $meetingDescription ?: $defaultVal,
+			'meeting_url' => (string) $meetingUrl ?: $defaultVal,
 		];
 
 		$fromEMail = Util::getDefaultEmailAddress('invitations-noreply');
@@ -245,7 +245,7 @@ 
 			$message->setReplyTo([$sender => $senderName]);
 		}
 
-		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
+		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.'.$method, $data);
 		$template->addHeader();
 
 		$summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event');
@@ -292,8 +292,8 @@ 
 
 		$attachment = $this->mailer->createAttachment(
 			$iTipMessage->message->serialize(),
-			'event.ics',// TODO(leon): Make file name unique, e.g. add event id
-			'text/calendar; method=' . $iTipMessage->method
+			'event.ics', // TODO(leon): Make file name unique, e.g. add event id
+			'text/calendar; method='.$iTipMessage->method
 		);
 		$message->attach($attachment);
 
@@ -340,7 +340,7 @@ 
 				$lastOccurrence = $firstOccurrence;
 			}
 		} else {
-			$it = new EventIterator($vObject, (string)$component->UID);
+			$it = new EventIterator($vObject, (string) $component->UID);
 			$maxDate = new \DateTime(self::MAX_DATE);
 			if ($it->isInfinite()) {
 				$lastOccurrence = $maxDate->getTimestamp();
@@ -456,7 +456,7 @@ 
 			$localeStart = $l10n->l('date', $dtstartDt, ['width' => 'medium']);
 			$localeEnd = $l10n->l('date', $dtendDt, ['width' => 'medium']);
 
-			return $localeStart . ' - ' . $localeEnd;
+			return $localeStart.' - '.$localeEnd;
 		}
 
 		/** @var Property\ICalendar\DateTime $dtstart */
@@ -475,26 +475,26 @@ 
 			}
 		}
 
-		$localeStart = $l10n->l('weekdayName', $dtstartDt, ['width' => 'abbreviated']) . ', ' .
+		$localeStart = $l10n->l('weekdayName', $dtstartDt, ['width' => 'abbreviated']).', '.
 			$l10n->l('datetime', $dtstartDt, ['width' => 'medium|short']);
 
 		// always show full date with timezone if timezones are different
 		if ($startTimezone !== $endTimezone) {
 			$localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium|short']);
 
-			return $localeStart . ' (' . $startTimezone . ') - ' .
-				$localeEnd . ' (' . $endTimezone . ')';
+			return $localeStart.' ('.$startTimezone.') - '.
+				$localeEnd.' ('.$endTimezone.')';
 		}
 
 		// show only end time if date is the same
 		if ($this->isDayEqual($dtstartDt, $dtendDt)) {
 			$localeEnd = $l10n->l('time', $dtendDt, ['width' => 'short']);
 		} else {
-			$localeEnd = $l10n->l('weekdayName', $dtendDt, ['width' => 'abbreviated']) . ', ' .
+			$localeEnd = $l10n->l('weekdayName', $dtendDt, ['width' => 'abbreviated']).', '.
 				$l10n->l('datetime', $dtendDt, ['width' => 'medium|short']);
 		}
 
-		return  $localeStart . ' - ' . $localeEnd . ' (' . $startTimezone . ')';
+		return  $localeStart.' - '.$localeEnd.' ('.$startTimezone.')';
 	}
 
 	/**
@@ -515,13 +515,13 @@ 
 	private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
 										  $method, $summary) {
 		if ($method === self::METHOD_CANCEL) {
-			$template->setSubject('Canceled: ' . $summary);
+			$template->setSubject('Canceled: '.$summary);
 			$template->addHeading($l10n->t('Invitation canceled'));
 		} elseif ($method === self::METHOD_REPLY) {
-			$template->setSubject('Re: ' . $summary);
+			$template->setSubject('Re: '.$summary);
 			$template->addHeading($l10n->t('Invitation updated'));
 		} else {
-			$template->setSubject('Invitation: ' . $summary);
+			$template->setSubject('Invitation: '.$summary);
 			$template->addHeading($l10n->t('Invitation'));
 		}
 	}
@@ -534,16 +534,16 @@ 
 	private function addBulletList(IEMailTemplate $template, IL10N $l10n, $vevent) {
 		if ($vevent->SUMMARY) {
 			$template->addBodyListItem($vevent->SUMMARY, $l10n->t('Title:'),
-				$this->getAbsoluteImagePath('caldav/title.svg'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/title.svg'), '', '', self::IMIP_INDENT);
 		}
 		$meetingWhen = $this->generateWhenString($l10n, $vevent);
 		if ($meetingWhen) {
 			$template->addBodyListItem($meetingWhen, $l10n->t('Time:'),
-				$this->getAbsoluteImagePath('caldav/time.svg'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/time.svg'), '', '', self::IMIP_INDENT);
 		}
 		if ($vevent->LOCATION) {
 			$template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'),
-				$this->getAbsoluteImagePath('caldav/location.svg'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/location.svg'), '', '', self::IMIP_INDENT);
 		}
 		if ($vevent->URL) {
 			$url = $vevent->URL->getValue();
@@ -552,7 +552,7 @@ 
 					htmlspecialchars($url)),
 				$l10n->t('Link:'),
 				$this->getAbsoluteImagePath('caldav/link.svg'),
-				$url,'',self::IMIP_INDENT);
+				$url, '', self::IMIP_INDENT);
 		}
 
 		$this->addAttendees($template, $l10n, $vevent);
@@ -560,7 +560,7 @@ 
 		/* Put description last, like an email body, since it can be arbitrarily long */
 		if ($vevent->DESCRIPTION) {
 			$template->addBodyListItem($vevent->DESCRIPTION->getValue(), $l10n->t('Description:'),
-				$this->getAbsoluteImagePath('caldav/description.svg'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/description.svg'), '', '', self::IMIP_INDENT);
 		}
 	}
 
@@ -590,7 +590,7 @@ 
 			/** @var Property\ICalendar\CalAddress $organizer */
 			$organizer = $vevent->ORGANIZER;
 			$organizerURI = $organizer->getNormalizedValue();
-			[$scheme,$organizerEmail] = explode(':',$organizerURI,2); # strip off scheme mailto:
+			[$scheme, $organizerEmail] = explode(':', $organizerURI, 2); # strip off scheme mailto:
 			/** @var string|null $organizerName */
 			$organizerName = isset($organizer['CN']) ? $organizer['CN'] : null;
 			$organizerHTML = sprintf('<a href="%s">%s</a>',
@@ -607,7 +607,7 @@ 
 			}
 			$template->addBodyListItem($organizerHTML, $l10n->t('Organizer:'),
 				$this->getAbsoluteImagePath('caldav/organizer.svg'),
-				$organizerText,'',self::IMIP_INDENT);
+				$organizerText, '', self::IMIP_INDENT);
 		}
 
 		$attendees = $vevent->select('ATTENDEE');
@@ -619,7 +619,7 @@ 
 		$attendeesText = [];
 		foreach ($attendees as $attendee) {
 			$attendeeURI = $attendee->getNormalizedValue();
-			[$scheme,$attendeeEmail] = explode(':',$attendeeURI,2); # strip off scheme mailto:
+			[$scheme, $attendeeEmail] = explode(':', $attendeeURI, 2); # strip off scheme mailto:
 			$attendeeName = isset($attendee['CN']) ? $attendee['CN'] : null;
 			$attendeeHTML = sprintf('<a href="%s">%s</a>',
 				htmlspecialchars($attendeeURI),
@@ -634,9 +634,9 @@ 
 			array_push($attendeesText, $attendeeText);
 		}
 
-		$template->addBodyListItem(implode('<br/>',$attendeesHTML), $l10n->t('Attendees:'),
+		$template->addBodyListItem(implode('<br/>', $attendeesHTML), $l10n->t('Attendees:'),
 			$this->getAbsoluteImagePath('caldav/attendees.svg'),
-			implode("\n",$attendeesText),'',self::IMIP_INDENT);
+			implode("\n", $attendeesText), '', self::IMIP_INDENT);
 	}
 
 	/**
@@ -687,7 +687,7 @@ 
 	 * @return string
 	 */
 	private function createInvitationToken(Message $iTipMessage, $lastOccurrence):string {
-		$token = $this->random->generate(60, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
+		$token = $this->random->generate(60, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
 
 		/** @var VEvent $vevent */
 		$vevent = $iTipMessage->message->VEVENT;

apps/dav/lib/CalDAV/CalDavBackend.php

Spacing +112 added lines, -112 removed lines

@@ -256,7 +256,7 @@ 
 		}
 
 		$result = $query->execute();
-		$column = (int)$result->fetchOne();
+		$column = (int) $result->fetchOne();
 		$result->closeCursor();
 		return $column;
 	}
@@ -316,18 +316,18 @@ 
 			$row['principaluri'] = (string) $row['principaluri'];
 			$components = [];
 			if ($row['components']) {
-				$components = explode(',',$row['components']);
+				$components = explode(',', $row['components']);
 			}
 
 			$calendar = [
 				'id' => $row['id'],
 				'uri' => $row['uri'],
 				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$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_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $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),
 			];
 
 			foreach ($this->propertyMap as $xmlName => $dbName) {
@@ -367,7 +367,7 @@ 
 
 		$result = $query->execute();
 
-		$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+		$readOnlyPropertyName = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only';
 		while ($row = $result->fetch()) {
 			$row['principaluri'] = (string) $row['principaluri'];
 			if ($row['principaluri'] === $principalUri) {
@@ -388,21 +388,21 @@ 
 			}
 
 			[, $name] = Uri\split($row['principaluri']);
-			$uri = $row['uri'] . '_shared_by_' . $name;
-			$row['displayname'] = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
+			$uri = $row['uri'].'_shared_by_'.$name;
+			$row['displayname'] = $row['displayname'].' ('.$this->getUserDisplayName($name).')';
 			$components = [];
 			if ($row['components']) {
-				$components = explode(',',$row['components']);
+				$components = explode(',', $row['components']);
 			}
 			$calendar = [
 				'id' => $row['id'],
 				'uri' => $uri,
 				'principaluri' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$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_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $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),
 				$readOnlyPropertyName => $readOnly,
 			];
 
@@ -443,16 +443,16 @@ 
 			$row['principaluri'] = (string) $row['principaluri'];
 			$components = [];
 			if ($row['components']) {
-				$components = explode(',',$row['components']);
+				$components = explode(',', $row['components']);
 			}
 			$calendar = [
 				'id' => $row['id'],
 				'uri' => $row['uri'],
 				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$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_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $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'),
 			];
 			foreach ($this->propertyMap as $xmlName => $dbName) {
 				$calendar[$xmlName] = $row[$dbName];
@@ -512,22 +512,22 @@ 
 		while ($row = $result->fetch()) {
 			$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']);
+				$components = explode(',', $row['components']);
 			}
 			$calendar = [
 				'id' => $row['id'],
 				'uri' => $row['publicuri'],
 				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$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' => (int)$row['access'] === Backend::ACCESS_READ,
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
+				'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $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' => (int) $row['access'] === Backend::ACCESS_READ,
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}public' => (int) $row['access'] === self::ACCESS_PUBLIC,
 			];
 
 			foreach ($this->propertyMap as $xmlName => $dbName) {
@@ -574,27 +574,27 @@ 
 		$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'];
 		[, $name] = Uri\split($row['principaluri']);
-		$row['displayname'] = $row['displayname'] . ' ' . "($name)";
+		$row['displayname'] = $row['displayname'].' '."($name)";
 		$components = [];
 		if ($row['components']) {
-			$components = explode(',',$row['components']);
+			$components = explode(',', $row['components']);
 		}
 		$calendar = [
 			'id' => $row['id'],
 			'uri' => $row['publicuri'],
 			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$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' => (int)$row['access'] === Backend::ACCESS_READ,
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
+			'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $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' => (int) $row['access'] === Backend::ACCESS_READ,
+			'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}public' => (int) $row['access'] === self::ACCESS_PUBLIC,
 		];
 
 		foreach ($this->propertyMap as $xmlName => $dbName) {
@@ -637,17 +637,17 @@ 
 		$row['principaluri'] = (string) $row['principaluri'];
 		$components = [];
 		if ($row['components']) {
-			$components = explode(',',$row['components']);
+			$components = explode(',', $row['components']);
 		}
 
 		$calendar = [
 			'id' => $row['id'],
 			'uri' => $row['uri'],
 			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$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_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $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'),
 		];
 
 		foreach ($this->propertyMap as $xmlName => $dbName) {
@@ -688,17 +688,17 @@ 
 		$row['principaluri'] = (string) $row['principaluri'];
 		$components = [];
 		if ($row['components']) {
-			$components = explode(',',$row['components']);
+			$components = explode(',', $row['components']);
 		}
 
 		$calendar = [
 			'id' => $row['id'],
 			'uri' => $row['uri'],
 			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$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_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $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'),
 		];
 
 		foreach ($this->propertyMap as $xmlName => $dbName) {
@@ -742,8 +742,8 @@ 
 			'principaluri' => $row['principaluri'],
 			'source' => $row['source'],
 			'lastmodified' => $row['lastmodified'],
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
 		];
 
 		foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
@@ -780,16 +780,16 @@ 
 		$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());
+			$values['components'] = implode(',', $properties[$sccs]->getValue());
 		} elseif (isset($properties['components'])) {
 			// Allow to provide components internally without having
 			// to create a SupportedCalendarComponentSet object
 			$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');
 		}
@@ -809,7 +809,7 @@ 
 		$calendarId = $query->getLastInsertId();
 
 		$calendarData = $this->getCalendarById($calendarId);
-		$this->dispatcher->dispatchTyped(new CalendarCreatedEvent((int)$calendarId, $calendarData));
+		$this->dispatcher->dispatchTyped(new CalendarCreatedEvent((int) $calendarId, $calendarData));
 		$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', new GenericEvent(
 			'\OCA\DAV\CalDAV\CalDavBackend::createCalendar',
 			[
@@ -838,13 +838,13 @@ 
 	 */
 	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');
 						break;
@@ -866,7 +866,7 @@ 
 
 			$calendarData = $this->getCalendarById($calendarId);
 			$shares = $this->getShares($calendarId);
-			$this->dispatcher->dispatchTyped(new CalendarUpdatedEvent((int)$calendarId, $calendarData, $shares, $mutations));
+			$this->dispatcher->dispatchTyped(new CalendarUpdatedEvent((int) $calendarId, $calendarData, $shares, $mutations));
 			$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', new GenericEvent(
 				'\OCA\DAV\CalDAV\CalDavBackend::updateCalendar',
 				[
@@ -916,7 +916,7 @@ 
 			->execute();
 
 		if ($calendarData) {
-			$this->dispatcher->dispatchTyped(new CalendarDeletedEvent((int)$calendarId, $calendarData, $shares));
+			$this->dispatcher->dispatchTyped(new CalendarDeletedEvent((int) $calendarId, $calendarData, $shares));
 		}
 	}
 
@@ -976,11 +976,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();
@@ -1024,12 +1024,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']
 		];
 	}
 
@@ -1070,12 +1070,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();
@@ -1147,7 +1147,7 @@ 
 			$calendarRow = $this->getCalendarById($calendarId);
 			$shares = $this->getShares($calendarId);
 
-			$this->dispatcher->dispatchTyped(new CalendarObjectCreatedEvent((int)$calendarId, $calendarRow, $shares, $objectRow));
+			$this->dispatcher->dispatchTyped(new CalendarObjectCreatedEvent((int) $calendarId, $calendarRow, $shares, $objectRow));
 			$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', new GenericEvent(
 				'\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject',
 				[
@@ -1160,7 +1160,7 @@ 
 		} else {
 			$subscriptionRow = $this->getSubscriptionById($calendarId);
 
-			$this->dispatcher->dispatchTyped(new CachedCalendarObjectCreatedEvent((int)$calendarId, $subscriptionRow, [], $objectRow));
+			$this->dispatcher->dispatchTyped(new CachedCalendarObjectCreatedEvent((int) $calendarId, $subscriptionRow, [], $objectRow));
 			$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCachedCalendarObject', new GenericEvent(
 				'\OCA\DAV\CalDAV\CalDavBackend::createCachedCalendarObject',
 				[
@@ -1172,7 +1172,7 @@ 
 			));
 		}
 
-		return '"' . $extraData['etag'] . '"';
+		return '"'.$extraData['etag'].'"';
 	}
 
 	/**
@@ -1221,7 +1221,7 @@ 
 				$calendarRow = $this->getCalendarById($calendarId);
 				$shares = $this->getShares($calendarId);
 
-				$this->dispatcher->dispatchTyped(new CalendarObjectUpdatedEvent((int)$calendarId, $calendarRow, $shares, $objectRow));
+				$this->dispatcher->dispatchTyped(new CalendarObjectUpdatedEvent((int) $calendarId, $calendarRow, $shares, $objectRow));
 				$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', new GenericEvent(
 					'\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject',
 					[
@@ -1234,7 +1234,7 @@ 
 			} else {
 				$subscriptionRow = $this->getSubscriptionById($calendarId);
 
-				$this->dispatcher->dispatchTyped(new CachedCalendarObjectUpdatedEvent((int)$calendarId, $subscriptionRow, [], $objectRow));
+				$this->dispatcher->dispatchTyped(new CachedCalendarObjectUpdatedEvent((int) $calendarId, $subscriptionRow, [], $objectRow));
 				$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject', new GenericEvent(
 					'\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject',
 					[
@@ -1247,7 +1247,7 @@ 
 			}
 		}
 
-		return '"' . $extraData['etag'] . '"';
+		return '"'.$extraData['etag'].'"';
 	}
 
 	/**
@@ -1284,7 +1284,7 @@ 
 				$calendarRow = $this->getCalendarById($calendarId);
 				$shares = $this->getShares($calendarId);
 
-				$this->dispatcher->dispatchTyped(new CalendarObjectDeletedEvent((int)$calendarId, $calendarRow, $shares, $data));
+				$this->dispatcher->dispatchTyped(new CalendarObjectDeletedEvent((int) $calendarId, $calendarRow, $shares, $data));
 				$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', new GenericEvent(
 					'\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject',
 					[
@@ -1297,7 +1297,7 @@ 
 			} else {
 				$subscriptionRow = $this->getSubscriptionById($calendarId);
 
-				$this->dispatcher->dispatchTyped(new CachedCalendarObjectDeletedEvent((int)$calendarId, $subscriptionRow, [], $data));
+				$this->dispatcher->dispatchTyped(new CachedCalendarObjectDeletedEvent((int) $calendarId, $subscriptionRow, [], $data));
 				$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject', new GenericEvent(
 					'\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject',
 					[
@@ -1569,7 +1569,7 @@ 
 
 		$result = [];
 		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			$path = $uriMapper[$row['calendarid']] . '/' . $row['uri'];
+			$path = $uriMapper[$row['calendarid']].'/'.$row['uri'];
 			if (!in_array($path, $result)) {
 				$result[] = $path;
 			}
@@ -1617,8 +1617,8 @@ 
 
 		if ($pattern !== '') {
 			$innerQuery->andWhere($innerQuery->expr()->iLike('op.value',
-				$outerQuery->createNamedParameter('%' .
-					$this->db->escapeLikeParameter($pattern) . '%')));
+				$outerQuery->createNamedParameter('%'.
+					$this->db->escapeLikeParameter($pattern).'%')));
 		}
 
 		$outerQuery->select('c.id', 'c.calendardata', 'c.componenttype', 'c.uid', 'c.uri')
@@ -1657,7 +1657,7 @@ 
 		$result = $outerQuery->execute();
 		$calendarObjects = $result->fetchAll();
 
-		return array_map(function ($o) {
+		return array_map(function($o) {
 			$calendarData = Reader::read($o['calendardata']);
 			$comps = $calendarData->getComponents();
 			$objects = [];
@@ -1675,10 +1675,10 @@ 
 				'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),
 			];
@@ -1694,7 +1694,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();
@@ -1772,7 +1772,7 @@ 
 		$subscriptions = $this->getSubscriptionsForUser($principalUri);
 		foreach ($calendars as $calendar) {
 			$calendarAnd = $calendarObjectIdQuery->expr()->andX();
-			$calendarAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int)$calendar['id'])));
+			$calendarAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int) $calendar['id'])));
 			$calendarAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
 
 			// If it's shared, limit search to public events
@@ -1785,7 +1785,7 @@ 
 		}
 		foreach ($subscriptions as $subscription) {
 			$subscriptionAnd = $calendarObjectIdQuery->expr()->andX();
-			$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int)$subscription['id'])));
+			$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int) $subscription['id'])));
 			$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)));
 
 			// If it's shared, limit search to public events
@@ -1830,7 +1830,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).'%')));
 			}
 		}
 
@@ -1844,7 +1844,7 @@ 
 		$result = $calendarObjectIdQuery->execute();
 		$matches = $result->fetchAll();
 		$result->closeCursor();
-		$matches = array_map(static function (array $match):int {
+		$matches = array_map(static function(array $match):int {
 			return (int) $match['objectid'];
 		}, $matches);
 
@@ -1857,9 +1857,9 @@ 
 		$calendarObjects = $result->fetchAll();
 		$result->closeCursor();
 
-		return array_map(function (array $array): array {
-			$array['calendarid'] = (int)$array['calendarid'];
-			$array['calendartype'] = (int)$array['calendartype'];
+		return array_map(function(array $array): array {
+			$array['calendarid'] = (int) $array['calendarid'];
+			$array['calendartype'] = (int) $array['calendartype'];
 			$array['calendardata'] = $this->readBlob($array['calendardata']);
 
 			return $array;
@@ -1896,7 +1896,7 @@ 
 		$stmt = $query->execute();
 
 		if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			return $row['calendaruri'] . '/' . $row['objecturi'];
+			return $row['calendaruri'].'/'.$row['objecturi'];
 		}
 
 		return null;
@@ -2096,8 +2096,8 @@ 
 				'source' => $row['source'],
 				'lastmodified' => $row['lastmodified'],
 
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
 			];
 
 			foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
@@ -2192,7 +2192,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) {
@@ -2214,7 +2214,7 @@ 
 				->execute();
 
 			$subscriptionRow = $this->getSubscriptionById($subscriptionId);
-			$this->dispatcher->dispatchTyped(new SubscriptionUpdatedEvent((int)$subscriptionId, $subscriptionRow, [], $mutations));
+			$this->dispatcher->dispatchTyped(new SubscriptionUpdatedEvent((int) $subscriptionId, $subscriptionRow, [], $mutations));
 			$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateSubscription', new GenericEvent(
 				'\OCA\DAV\CalDAV\CalDavBackend::updateSubscription',
 				[
@@ -2265,7 +2265,7 @@ 
 			->execute();
 
 		if ($subscriptionRow) {
-			$this->dispatcher->dispatchTyped(new SubscriptionDeletedEvent((int)$subscriptionId, $subscriptionRow, []));
+			$this->dispatcher->dispatchTyped(new SubscriptionDeletedEvent((int) $subscriptionId, $subscriptionRow, []));
 		}
 	}
 
@@ -2303,8 +2303,8 @@ 
 			'uri' => $row['uri'],
 			'calendardata' => $row['calendardata'],
 			'lastmodified' => $row['lastmodified'],
-			'etag' => '"' . $row['etag'] . '"',
-			'size' => (int)$row['size'],
+			'etag' => '"'.$row['etag'].'"',
+			'size' => (int) $row['size'],
 		];
 	}
 
@@ -2332,8 +2332,8 @@ 
 				'calendardata' => $row['calendardata'],
 				'uri' => $row['uri'],
 				'lastmodified' => $row['lastmodified'],
-				'etag' => '"' . $row['etag'] . '"',
-				'size' => (int)$row['size'],
+				'etag' => '"'.$row['etag'].'"',
+				'size' => (int) $row['size'],
 			];
 		}
 
@@ -2387,14 +2387,14 @@ 
 	 * @return void
 	 */
 	protected function addChange($calendarId, $objectUri, $operation, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
-		$table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars': 'calendarsubscriptions';
+		$table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars' : 'calendarsubscriptions';
 
 		$query = $this->db->getQueryBuilder();
 		$query->select('synctoken')
 			->from($table)
 			->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
 		$result = $query->execute();
-		$syncToken = (int)$result->fetchOne();
+		$syncToken = (int) $result->fetchOne();
 		$result->closeCursor();
 
 		$query = $this->db->getQueryBuilder();
@@ -2451,7 +2451,7 @@ 
 				// Track first component type and uid
 				if ($uid === null) {
 					$componentType = $component->name;
-					$uid = (string)$component->UID;
+					$uid = (string) $component->UID;
 				}
 			}
 		}
@@ -2550,7 +2550,7 @@ 
 			]));
 		$this->calendarSharingBackend->updateShares($shareable, $add, $remove);
 
-		$this->dispatcher->dispatchTyped(new CalendarShareUpdatedEvent((int)$calendarId, $calendarRow, $oldShares, $add, $remove));
+		$this->dispatcher->dispatchTyped(new CalendarShareUpdatedEvent((int) $calendarId, $calendarRow, $oldShares, $add, $remove));
 	}
 
 	/**
@@ -2591,7 +2591,7 @@ 
 				]);
 			$query->execute();
 
-			$this->dispatcher->dispatchTyped(new CalendarPublishedEvent((int)$calendarId, $calendarData, $publicUri));
+			$this->dispatcher->dispatchTyped(new CalendarPublishedEvent((int) $calendarId, $calendarData, $publicUri));
 			return $publicUri;
 		}
 		$query->delete('dav_shares')
@@ -2599,7 +2599,7 @@ 
 			->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)));
 		$query->execute();
 
-		$this->dispatcher->dispatchTyped(new CalendarUnpublishedEvent((int)$calendarId, $calendarData));
+		$this->dispatcher->dispatchTyped(new CalendarUnpublishedEvent((int) $calendarId, $calendarData));
 		return null;
 	}
 
@@ -2822,10 +2822,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'];
 	}
 
 	/**
@@ -2852,8 +2852,8 @@ 
 	 * @param $calendarInfo
 	 */
 	private function addOwnerPrincipal(&$calendarInfo) {
-		$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 {

apps/federatedfilesharing/lib/FederatedShareProvider.php

Spacing +14 added lines, -14 removed lines

@@ -219,7 +219,7 @@ 
 		if ($remoteShare) {
 			try {
 				$ownerCloudId = $this->cloudIdManager->getCloudId($remoteShare['owner'], $remoteShare['remote']);
-				$shareId = $this->addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $ownerCloudId->getId(), $permissions, 'tmp_token_' . time(), $shareType);
+				$shareId = $this->addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $ownerCloudId->getId(), $permissions, 'tmp_token_'.time(), $shareType);
 				$share->setId($shareId);
 				[$token, $remoteId] = $this->askOwnerToReShare($shareWith, $share, $shareId);
 				// remote share was create successfully if we get a valid token as return
@@ -352,7 +352,7 @@ 
 		$result = $qResult->fetchAll();
 		$qResult->closeCursor();
 
-		if (isset($result[0]) && (int)$result[0]['remote_id'] > 0) {
+		if (isset($result[0]) && (int) $result[0]['remote_id'] > 0) {
 			return $result[0];
 		}
 
@@ -395,7 +395,7 @@ 
 		$qb->execute();
 		$id = $qb->getLastInsertId();
 
-		return (int)$id;
+		return (int) $id;
 	}
 
 	/**
@@ -485,7 +485,7 @@ 
 	public function getRemoteId(IShare $share): string {
 		$query = $this->dbConnection->getQueryBuilder();
 		$query->select('remote_id')->from('federated_reshares')
-			->where($query->expr()->eq('share_id', $query->createNamedParameter((int)$share->getId())));
+			->where($query->expr()->eq('share_id', $query->createNamedParameter((int) $share->getId())));
 		$result = $query->execute();
 		$data = $result->fetch();
 		$result->closeCursor();
@@ -494,7 +494,7 @@ 
 			throw new ShareNotFound();
 		}
 
-		return (string)$data['remote_id'];
+		return (string) $data['remote_id'];
 	}
 
 	/**
@@ -652,7 +652,7 @@ 
 			);
 		}
 
-		$qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+		$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
 		$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
 
 		$qb->orderBy('id');
@@ -739,7 +739,7 @@ 
 		$cursor->closeCursor();
 
 		if ($data === false) {
-			throw new ShareNotFound('Can not find share with ID: ' . $id);
+			throw new ShareNotFound('Can not find share with ID: '.$id);
 		}
 
 		try {
@@ -883,15 +883,15 @@ 
 	 */
 	private function createShareObject($data) {
 		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
+		$share->setId((int) $data['id'])
+			->setShareType((int) $data['share_type'])
+			->setPermissions((int) $data['permissions'])
 			->setTarget($data['file_target'])
-			->setMailSend((bool)$data['mail_send'])
+			->setMailSend((bool) $data['mail_send'])
 			->setToken($data['token']);
 
 		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
+		$shareTime->setTimestamp((int) $data['stime']);
 		$share->setShareTime($shareTime);
 		$share->setSharedWith($data['share_with']);
 
@@ -901,13 +901,13 @@ 
 		} else {
 			//OLD SHARE
 			$share->setSharedBy($data['uid_owner']);
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
+			$path = $this->getNode($share->getSharedBy(), (int) $data['file_source']);
 
 			$owner = $path->getOwner();
 			$share->setShareOwner($owner->getUID());
 		}
 
-		$share->setNodeId((int)$data['file_source']);
+		$share->setNodeId((int) $data['file_source']);
 		$share->setNodeType($data['item_type']);
 
 		$share->setProviderId($this->identifier());

apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php

Spacing +20 added lines, -20 removed lines

@@ -187,7 +187,7 @@ 
 		// for backward compatibility make sure that the remote url stored in the
 		// database ends with a trailing slash
 		if (substr($remote, -1) !== '/') {
-			$remote = $remote . '/';
+			$remote = $remote.'/';
 		}
 
 		$token = $share->getShareSecret();
@@ -214,23 +214,23 @@ 
 
 			// FIXME this should be a method in the user management instead
 			if ($shareType === IShare::TYPE_USER) {
-				$this->logger->debug('shareWith before, ' . $shareWith, ['app' => 'files_sharing']);
+				$this->logger->debug('shareWith before, '.$shareWith, ['app' => 'files_sharing']);
 				Util::emitHook(
 					'\OCA\Files_Sharing\API\Server2Server',
 					'preLoginNameUsedAsUserName',
 					['uid' => &$shareWith]
 				);
-				$this->logger->debug('shareWith after, ' . $shareWith, ['app' => 'files_sharing']);
+				$this->logger->debug('shareWith after, '.$shareWith, ['app' => 'files_sharing']);
 
 				if (!$this->userManager->userExists($shareWith)) {
-					throw new ProviderCouldNotAddShareException('User does not exists', '',Http::STATUS_BAD_REQUEST);
+					throw new ProviderCouldNotAddShareException('User does not exists', '', Http::STATUS_BAD_REQUEST);
 				}
 
 				\OC_Util::setupFS($shareWith);
 			}
 
 			if ($shareType === IShare::TYPE_GROUP && !$this->groupManager->groupExists($shareWith)) {
-				throw new ProviderCouldNotAddShareException('Group does not exists', '',Http::STATUS_BAD_REQUEST);
+				throw new ProviderCouldNotAddShareException('Group does not exists', '', Http::STATUS_BAD_REQUEST);
 			}
 
 			$externalManager = new \OCA\Files_Sharing\External\Manager(
@@ -249,7 +249,7 @@ 
 			);
 
 			try {
-				$externalManager->addShare($remote, $token, '', $name, $owner, $shareType,false, $shareWith, $remoteId);
+				$externalManager->addShare($remote, $token, '', $name, $owner, $shareType, false, $shareWith, $remoteId);
 				$shareId = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*share_external');
 
 				if ($shareType === IShare::TYPE_USER) {
@@ -258,7 +258,7 @@ 
 						->setType('remote_share')
 						->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_RECEIVED, [$ownerFederatedId, trim($name, '/')])
 						->setAffectedUser($shareWith)
-						->setObject('remote_share', (int)$shareId, $name);
+						->setObject('remote_share', (int) $shareId, $name);
 					\OC::$server->getActivityManager()->publish($event);
 					$this->notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name);
 				} else {
@@ -269,7 +269,7 @@ 
 							->setType('remote_share')
 							->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_RECEIVED, [$ownerFederatedId, trim($name, '/')])
 							->setAffectedUser($user->getUID())
-							->setObject('remote_share', (int)$shareId, $name);
+							->setObject('remote_share', (int) $shareId, $name);
 						\OC::$server->getActivityManager()->publish($event);
 						$this->notifyAboutNewShare($user->getUID(), $shareId, $ownerFederatedId, $sharedByFederatedId, $name);
 					}
@@ -281,7 +281,7 @@ 
 					'level' => ILogger::ERROR,
 					'app' => 'files_sharing'
 				]);
-				throw new ProviderCouldNotAddShareException('internal server error, was not able to add share from ' . $remote, '', HTTP::STATUS_INTERNAL_SERVER_ERROR);
+				throw new ProviderCouldNotAddShareException('internal server error, was not able to add share from '.$remote, '', HTTP::STATUS_INTERNAL_SERVER_ERROR);
 			}
 		}
 
@@ -347,12 +347,12 @@ 
 
 		$declineAction = $notification->createAction();
 		$declineAction->setLabel('decline')
-			->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'DELETE');
+			->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/'.$shareId)), 'DELETE');
 		$notification->addAction($declineAction);
 
 		$acceptAction = $notification->createAction();
 		$acceptAction->setLabel('accept')
-			->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'POST');
+			->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/'.$shareId)), 'POST');
 		$notification->addAction($acceptAction);
 
 		$this->notificationManager->notify($notification);
@@ -410,7 +410,7 @@ 
 	 */
 	protected function executeAcceptShare(IShare $share) {
 		try {
-			$fileId = (int)$share->getNode()->getId();
+			$fileId = (int) $share->getNode()->getId();
 			[$file, $link] = $this->getFile($this->getCorrectUid($share), $fileId);
 		} catch (\Exception $e) {
 			throw new ShareNotFound();
@@ -486,7 +486,7 @@ 
 		$this->federatedShareProvider->removeShareFromTable($share);
 
 		try {
-			$fileId = (int)$share->getNode()->getId();
+			$fileId = (int) $share->getNode()->getId();
 			[$file, $link] = $this->getFile($this->getCorrectUid($share), $fileId);
 		} catch (\Exception $e) {
 			throw new ShareNotFound();
@@ -578,10 +578,10 @@ 
 			// delete all child in case of a group share
 			$qb = $this->connection->getQueryBuilder();
 			$qb->delete('share_external')
-				->where($qb->expr()->eq('parent', $qb->createNamedParameter((int)$share['id'])));
+				->where($qb->expr()->eq('parent', $qb->createNamedParameter((int) $share['id'])));
 			$qb->execute();
 
-			if ((int)$share['share_type'] === IShare::TYPE_USER) {
+			if ((int) $share['share_type'] === IShare::TYPE_USER) {
 				if ($share['accepted']) {
 					$path = trim($mountpoint, '/');
 				} else {
@@ -590,7 +590,7 @@ 
 				$notification = $this->notificationManager->createNotification();
 				$notification->setApp('files_sharing')
 					->setUser($share['user'])
-					->setObject('remote_share', (int)$share['id']);
+					->setObject('remote_share', (int) $share['id']);
 				$this->notificationManager->markProcessed($notification);
 
 				$event = $this->activityManager->generateEvent();
@@ -598,7 +598,7 @@ 
 					->setType('remote_share')
 					->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_UNSHARED, [$owner->getId(), $path])
 					->setAffectedUser($user)
-					->setObject('remote_share', (int)$share['id'], $path);
+					->setObject('remote_share', (int) $share['id'], $path);
 				\OC::$server->getActivityManager()->publish($event);
 			}
 		}
@@ -646,7 +646,7 @@ 
 			$owner = $share->getShareOwner();
 			$currentServer = $this->addressHandler->generateRemoteURL();
 			if ($this->addressHandler->compareAddresses($user, $remote, $owner, $currentServer)) {
-				throw new ProviderCouldNotAddShareException('Resharing back to the owner is not allowed: ' . $id);
+				throw new ProviderCouldNotAddShareException('Resharing back to the owner is not allowed: '.$id);
 			}
 		} catch (\Exception $e) {
 			throw new ProviderCouldNotAddShareException($e->getMessage());
@@ -660,10 +660,10 @@ 
 			$share->setSharedBy($share->getSharedWith());
 			$share->setSharedWith($shareWith);
 			$result = $this->federatedShareProvider->create($share);
-			$this->federatedShareProvider->storeRemoteId((int)$result->getId(), $senderId);
+			$this->federatedShareProvider->storeRemoteId((int) $result->getId(), $senderId);
 			return ['token' => $result->getToken(), 'providerId' => $result->getId()];
 		} else {
-			throw new ProviderCouldNotAddShareException('resharing not allowed for share: ' . $id);
+			throw new ProviderCouldNotAddShareException('resharing not allowed for share: '.$id);
 		}
 	}
 

apps/settings/lib/Controller/UsersController.php

Spacing +6 added lines, -6 removed lines

@@ -192,7 +192,7 @@ 
 		[$adminGroup, $groups] = $groupsInfo->get();
 
 		if (!$isLDAPUsed && $this->appManager->isEnabledForUser('user_ldap')) {
-			$isLDAPUsed = (bool)array_reduce($this->userManager->getBackends(), function ($ldapFound, $backend) {
+			$isLDAPUsed = (bool) array_reduce($this->userManager->getBackends(), function($ldapFound, $backend) {
 				return $ldapFound || $backend instanceof User_Proxy;
 			});
 		}
@@ -203,8 +203,8 @@ 
 		if (!$isLDAPUsed) {
 			if ($this->isAdmin) {
 				$disabledUsers = $this->userManager->countDisabledUsers();
-				$userCount = array_reduce($this->userManager->countUsers(), function ($v, $w) {
-					return $v + (int)$w;
+				$userCount = array_reduce($this->userManager->countUsers(), function($v, $w) {
+					return $v + (int) $w;
 				}, 0);
 			} else {
 				// User is subadmin !
@@ -498,11 +498,11 @@ 
 
 		$accountData = $this->accountManager->getUser($user);
 		$cloudId = $user->getCloudId();
-		$message = 'Use my Federated Cloud ID to share with me: ' . $cloudId;
+		$message = 'Use my Federated Cloud ID to share with me: '.$cloudId;
 		$signature = $this->signMessage($user, $message);
 
-		$code = $message . ' ' . $signature;
-		$codeMd5 = $message . ' ' . md5($signature);
+		$code = $message.' '.$signature;
+		$codeMd5 = $message.' '.md5($signature);
 
 		switch ($account) {
 			case 'verify-twitter':

apps/files_versions/lib/Storage.php

Spacing +56 added lines, -56 removed lines

@@ -74,17 +74,17 @@ 
 
 	private static $max_versions_per_interval = [
 		//first 10sec, one version every 2sec
-		1 => ['intervalEndsAfter' => 10,      'step' => 2],
+		1 => ['intervalEndsAfter' => 10, 'step' => 2],
 		//next minute, one version every 10sec
-		2 => ['intervalEndsAfter' => 60,      'step' => 10],
+		2 => ['intervalEndsAfter' => 60, 'step' => 10],
 		//next hour, one version every minute
-		3 => ['intervalEndsAfter' => 3600,    'step' => 60],
+		3 => ['intervalEndsAfter' => 3600, 'step' => 60],
 		//next 24h, one version every hour
-		4 => ['intervalEndsAfter' => 86400,   'step' => 3600],
+		4 => ['intervalEndsAfter' => 86400, 'step' => 3600],
 		//next 30days, one version per day
 		5 => ['intervalEndsAfter' => 2592000, 'step' => 86400],
 		//until the end one version per week
-		6 => ['intervalEndsAfter' => -1,      'step' => 604800],
+		6 => ['intervalEndsAfter' => -1, 'step' => 604800],
 	];
 
 	/** @var \OCA\Files_Versions\AppInfo\Application */
@@ -157,7 +157,7 @@ 
 	 * @return int versions size
 	 */
 	private static function getVersionsSize($user) {
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		$fileInfo = $view->getFileInfo('/files_versions');
 		return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
 	}
@@ -175,13 +175,13 @@ 
 		}
 
 		// we only handle existing files
-		if (! Filesystem::file_exists($filename) || Filesystem::is_dir($filename)) {
+		if (!Filesystem::file_exists($filename) || Filesystem::is_dir($filename)) {
 			return false;
 		}
 
 		[$uid, $filename] = self::getUidAndFilename($filename);
 
-		$files_view = new View('/'.$uid .'/files');
+		$files_view = new View('/'.$uid.'/files');
 
 		$eventDispatcher = \OC::$server->getEventDispatcher();
 		$fileInfo = $files_view->getFileInfo($filename);
@@ -246,14 +246,14 @@ 
 		$filename = $deletedFile['filename'];
 
 		if (!Filesystem::file_exists($path)) {
-			$view = new View('/' . $uid . '/files_versions');
+			$view = new View('/'.$uid.'/files_versions');
 
 			$versions = self::getVersions($uid, $filename);
 			if (!empty($versions)) {
 				foreach ($versions as $v) {
-					\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
-					self::deleteVersion($view, $filename . '.v' . $v['version']);
-					\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
+					\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path.$v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
+					self::deleteVersion($view, $filename.'.v'.$v['version']);
+					\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path.$v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
 				}
 			}
 		}
@@ -287,33 +287,33 @@ 
 		$rootView = new View('');
 
 		// did we move a directory ?
-		if ($rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
+		if ($rootView->is_dir('/'.$targetOwner.'/files/'.$targetPath)) {
 			// does the directory exists for versions too ?
-			if ($rootView->is_dir('/' . $sourceOwner . '/files_versions/' . $sourcePath)) {
+			if ($rootView->is_dir('/'.$sourceOwner.'/files_versions/'.$sourcePath)) {
 				// create missing dirs if necessary
-				self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
+				self::createMissingDirectories($targetPath, new View('/'.$targetOwner));
 
 				// move the directory containing the versions
 				$rootView->$operation(
-					'/' . $sourceOwner . '/files_versions/' . $sourcePath,
-					'/' . $targetOwner . '/files_versions/' . $targetPath
+					'/'.$sourceOwner.'/files_versions/'.$sourcePath,
+					'/'.$targetOwner.'/files_versions/'.$targetPath
 				);
 			}
-		} elseif ($versions = Storage::getVersions($sourceOwner, '/' . $sourcePath)) {
+		} elseif ($versions = Storage::getVersions($sourceOwner, '/'.$sourcePath)) {
 			// create missing dirs if necessary
-			self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
+			self::createMissingDirectories($targetPath, new View('/'.$targetOwner));
 
 			foreach ($versions as $v) {
 				// move each version one by one to the target directory
 				$rootView->$operation(
-					'/' . $sourceOwner . '/files_versions/' . $sourcePath.'.v' . $v['version'],
-					'/' . $targetOwner . '/files_versions/' . $targetPath.'.v'.$v['version']
+					'/'.$sourceOwner.'/files_versions/'.$sourcePath.'.v'.$v['version'],
+					'/'.$targetOwner.'/files_versions/'.$targetPath.'.v'.$v['version']
 				);
 			}
 		}
 
 		// if we moved versions directly for a file, schedule expiration check for that file
-		if (!$rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
+		if (!$rootView->is_dir('/'.$targetOwner.'/files/'.$targetPath)) {
 			self::scheduleExpire($targetOwner, $targetPath);
 		}
 	}
@@ -328,13 +328,13 @@ 
 	public static function rollback(string $file, int $revision, IUser $user) {
 
 		// add expected leading slash
-		$filename = '/' . ltrim($file, '/');
+		$filename = '/'.ltrim($file, '/');
 
 		// Fetch the userfolder to trigger view hooks
 		$userFolder = \OC::$server->getUserFolder($user->getUID());
 
 		$users_view = new View('/'.$user->getUID());
-		$files_view = new View('/'. $user->getUID().'/files');
+		$files_view = new View('/'.$user->getUID().'/files');
 
 		$versionCreated = false;
 
@@ -352,7 +352,7 @@ 
 			$versionCreated = true;
 		}
 
-		$fileToRestore = 'files_versions' . $filename . '.v' . $revision;
+		$fileToRestore = 'files_versions'.$filename.'.v'.$revision;
 
 		// Restore encrypted version of the old file for the newly restored file
 		// This has to happen manually here since the file is manually copied below
@@ -368,7 +368,7 @@ 
 		);
 
 		// rollback
-		if (self::copyFileContents($users_view, $fileToRestore, 'files' . $filename)) {
+		if (self::copyFileContents($users_view, $fileToRestore, 'files'.$filename)) {
 			$files_view->touch($file, $revision);
 			Storage::scheduleExpire($user->getUID(), $file);
 
@@ -440,12 +440,12 @@ 
 			return $versions;
 		}
 		// fetch for old versions
-		$view = new View('/' . $uid . '/');
+		$view = new View('/'.$uid.'/');
 
 		$pathinfo = pathinfo($filename);
 		$versionedFile = $pathinfo['basename'];
 
-		$dir = Filesystem::normalizePath(self::VERSIONS_ROOT . '/' . $pathinfo['dirname']);
+		$dir = Filesystem::normalizePath(self::VERSIONS_ROOT.'/'.$pathinfo['dirname']);
 
 		$dirContent = false;
 		if ($view->is_dir($dir)) {
@@ -465,7 +465,7 @@ 
 						$pathparts = pathinfo($entryName);
 						$timestamp = substr($pathparts['extension'], 1);
 						$filename = $pathparts['filename'];
-						$key = $timestamp . '#' . $filename;
+						$key = $timestamp.'#'.$filename;
 						$versions[$key]['version'] = $timestamp;
 						$versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($timestamp);
 						if (empty($userFullPath)) {
@@ -473,9 +473,9 @@ 
 						} else {
 							$versions[$key]['preview'] = \OC::$server->getURLGenerator('files_version.Preview.getPreview', ['file' => $userFullPath, 'version' => $timestamp]);
 						}
-						$versions[$key]['path'] = Filesystem::normalizePath($pathinfo['dirname'] . '/' . $filename);
+						$versions[$key]['path'] = Filesystem::normalizePath($pathinfo['dirname'].'/'.$filename);
 						$versions[$key]['name'] = $versionedFile;
-						$versions[$key]['size'] = $view->filesize($dir . '/' . $entryName);
+						$versions[$key]['size'] = $view->filesize($dir.'/'.$entryName);
 						$versions[$key]['mimetype'] = \OC::$server->getMimeTypeDetector()->detectPath($versionedFile);
 					}
 				}
@@ -503,7 +503,7 @@ 
 
 		$toDelete = [];
 		foreach (array_reverse($versions['all']) as $key => $version) {
-			if ((int)$version['version'] < $threshold) {
+			if ((int) $version['version'] < $threshold) {
 				$toDelete[$key] = $version;
 			} else {
 				//Versions are sorted by time - nothing mo to iterate.
@@ -511,11 +511,11 @@ 
 			}
 		}
 
-		$view = new View('/' . $uid . '/files_versions');
+		$view = new View('/'.$uid.'/files_versions');
 		if (!empty($toDelete)) {
 			foreach ($toDelete as $version) {
 				\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
-				self::deleteVersion($view, $version['path'] . '.v' . $version['version']);
+				self::deleteVersion($view, $version['path'].'.v'.$version['version']);
 				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
 			}
 		}
@@ -530,19 +530,19 @@ 
 		$diff = time() - $timestamp;
 
 		if ($diff < 60) { // first minute
-			return  $diff . " seconds ago";
+			return  $diff." seconds ago";
 		} elseif ($diff < 3600) { //first hour
-			return round($diff / 60) . " minutes ago";
+			return round($diff / 60)." minutes ago";
 		} elseif ($diff < 86400) { // first day
-			return round($diff / 3600) . " hours ago";
+			return round($diff / 3600)." hours ago";
 		} elseif ($diff < 604800) { //first week
-			return round($diff / 86400) . " days ago";
+			return round($diff / 86400)." days ago";
 		} elseif ($diff < 2419200) { //first month
-			return round($diff / 604800) . " weeks ago";
+			return round($diff / 604800)." weeks ago";
 		} elseif ($diff < 29030400) { // first year
-			return round($diff / 2419200) . " months ago";
+			return round($diff / 2419200)." months ago";
 		} else {
-			return round($diff / 29030400) . " years ago";
+			return round($diff / 29030400)." years ago";
 		}
 	}
 
@@ -552,7 +552,7 @@ 
 	 * @return array with contains two arrays 'all' which contains all versions sorted by age and 'by_file' which contains all versions sorted by filename
 	 */
 	private static function getAllVersions($uid) {
-		$view = new View('/' . $uid . '/');
+		$view = new View('/'.$uid.'/');
 		$dirs = [self::VERSIONS_ROOT];
 		$versions = [];
 
@@ -562,7 +562,7 @@ 
 
 			foreach ($files as $file) {
 				$fileData = $file->getData();
-				$filePath = $dir . '/' . $fileData['name'];
+				$filePath = $dir.'/'.$fileData['name'];
 				if ($file['type'] === 'dir') {
 					$dirs[] = $filePath;
 				} else {
@@ -570,7 +570,7 @@ 
 					$relPathStart = strlen(self::VERSIONS_ROOT);
 					$version = substr($filePath, $versionsBegin + 2);
 					$relpath = substr($filePath, $relPathStart, $versionsBegin - $relPathStart);
-					$key = $version . '#' . $relpath;
+					$key = $version.'#'.$relpath;
 					$versions[$key] = ['path' => $relpath, 'timestamp' => $version];
 				}
 			}
@@ -614,13 +614,13 @@ 
 			[$toDelete, $size] = self::getAutoExpireList($time, $versions);
 		} else {
 			$size = 0;
-			$toDelete = [];  // versions we want to delete
+			$toDelete = []; // versions we want to delete
 		}
 
 		foreach ($versions as $key => $version) {
 			if ($expiration->isExpired($version['version'], $quotaExceeded) && !isset($toDelete[$key])) {
 				$size += $version['size'];
-				$toDelete[$key] = $version['path'] . '.v' . $version['version'];
+				$toDelete[$key] = $version['path'].'.v'.$version['version'];
 			}
 		}
 
@@ -635,7 +635,7 @@ 
 	 */
 	protected static function getAutoExpireList($time, $versions) {
 		$size = 0;
-		$toDelete = [];  // versions we want to delete
+		$toDelete = []; // versions we want to delete
 
 		$interval = 1;
 		$step = Storage::$max_versions_per_interval[$interval]['step'];
@@ -662,9 +662,9 @@ 
 				if ($nextInterval === -1 || $prevTimestamp > $nextInterval) {
 					if ($version['version'] > $nextVersion) {
 						//distance between two version too small, mark to delete
-						$toDelete[$key] = $version['path'] . '.v' . $version['version'];
+						$toDelete[$key] = $version['path'].'.v'.$version['version'];
 						$size += $version['size'];
-						\OC::$server->getLogger()->info('Mark to expire '. $version['path'] .' next version should be ' . $nextVersion . " or smaller. (prevTimestamp: " . $prevTimestamp . "; step: " . $step, ['app' => 'files_versions']);
+						\OC::$server->getLogger()->info('Mark to expire '.$version['path'].' next version should be '.$nextVersion." or smaller. (prevTimestamp: ".$prevTimestamp."; step: ".$step, ['app' => 'files_versions']);
 					} else {
 						$nextVersion = $version['version'] - $step;
 						$prevTimestamp = $version['version'];
@@ -719,8 +719,8 @@ 
 			// get available disk space for user
 			$user = \OC::$server->getUserManager()->get($uid);
 			if (is_null($user)) {
-				\OC::$server->getLogger()->error('Backends provided no user object for ' . $uid, ['app' => 'files_versions']);
-				throw new \OC\User\NoUserException('Backends provided no user object for ' . $uid);
+				\OC::$server->getLogger()->error('Backends provided no user object for '.$uid, ['app' => 'files_versions']);
+				throw new \OC\User\NoUserException('Backends provided no user object for '.$uid);
 			}
 
 			\OC_Util::setupFS($uid);
@@ -803,13 +803,13 @@ 
 				self::deleteVersion($versionsFileview, $path);
 				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
 				unset($allVersions[$key]); // update array with the versions we keep
-				$logger->info('Expire: ' . $path, ['app' => 'files_versions']);
+				$logger->info('Expire: '.$path, ['app' => 'files_versions']);
 			}
 
 			// Check if enough space is available after versions are rearranged.
 			// If not we delete the oldest versions until we meet the size limit for versions,
 			// but always keep the two latest versions
-			$numOfVersions = count($allVersions) - 2 ;
+			$numOfVersions = count($allVersions) - 2;
 			$i = 0;
 			// sort oldest first and make sure that we start at the first element
 			ksort($allVersions);
@@ -817,9 +817,9 @@ 
 			while ($availableSpace < 0 && $i < $numOfVersions) {
 				$version = current($allVersions);
 				\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
-				self::deleteVersion($versionsFileview, $version['path'] . '.v' . $version['version']);
+				self::deleteVersion($versionsFileview, $version['path'].'.v'.$version['version']);
 				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
-				\OC::$server->getLogger()->info('running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'], ['app' => 'files_versions']);
+				\OC::$server->getLogger()->info('running out of space! Delete oldest version: '.$version['path'].'.v'.$version['version'], ['app' => 'files_versions']);
 				$versionsSize -= $version['size'];
 				$availableSpace += $version['size'];
 				next($allVersions);
@@ -845,7 +845,7 @@ 
 		$dirParts = explode('/', $dirname);
 		$dir = "/files_versions";
 		foreach ($dirParts as $part) {
-			$dir = $dir . '/' . $part;
+			$dir = $dir.'/'.$part;
 			if (!$view->file_exists($dir)) {
 				$view->mkdir($dir);
 			}