nextcloud / server

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

Spacing +16 added lines, -16 removed lines

@@ -81,9 +81,9 @@ 
 	function propFind(PropFind $propFind, INode $node) {
 		if ($node instanceof IPrincipal) {
 			// overwrite Sabre/Dav's implementation
-			$propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function () use ($node) {
+			$propFind->handle('{'.self::NS_CALDAV.'}calendar-user-type', function() use ($node) {
 				if ($node instanceof IProperties) {
-					$calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
+					$calendarUserType = '{'.self::NS_CALDAV.'}calendar-user-type';
 					$props = $node->getProperties([$calendarUserType]);
 
 					if (isset($props[$calendarUserType])) {
@@ -189,7 +189,7 @@ 
 		}
 
 		$dtstart = $vevent->DTSTART;
-		$dtend =  $this->getDTEndFromVEvent($vevent);
+		$dtend = $this->getDTEndFromVEvent($vevent);
 		$uid = $vevent->UID->getValue();
 		$sequence = isset($vevent->SEQUENCE) ? $vevent->SEQUENCE->getValue() : 0;
 		$recurrenceId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->serialize() : '';
@@ -261,7 +261,7 @@ 
 	 */
 	function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
 		if ($node instanceof IPrincipal) {
-			$propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function () use ($node) {
+			$propFind->handle('{'.self::NS_CALDAV.'}schedule-default-calendar-URL', function() use ($node) {
 				/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
 				$caldavPlugin = $this->server->getPlugin('caldav');
 				$principalUrl = $node->getPrincipalUrl();
@@ -292,7 +292,7 @@ 
 					]);
 				}
 
-				$result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
+				$result = $this->server->getPropertiesForPath($calendarHomePath.'/'.$uri, [], 1);
 				if (empty($result)) {
 					return null;
 				}
@@ -308,8 +308,8 @@ 
 	 * @param string $principal
 	 * @return string?
 	 */
-	protected function getCalendarUserTypeForPrincipal($principal):?string {
-		$calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
+	protected function getCalendarUserTypeForPrincipal($principal): ?string {
+		$calendarUserType = '{'.self::NS_CALDAV.'}calendar-user-type';
 		$properties = $this->server->getProperties(
 			$principal,
 			[$calendarUserType]
@@ -327,7 +327,7 @@ 
 	 * @param ITip\Message $iTipMessage
 	 * @return null|Property
 	 */
-	private function getCurrentAttendee(ITip\Message $iTipMessage):?Property {
+	private function getCurrentAttendee(ITip\Message $iTipMessage): ?Property {
 		/** @var VEvent $vevent */
 		$vevent = $iTipMessage->message->VEVENT;
 		$attendees = $vevent->select('ATTENDEE');
@@ -405,8 +405,8 @@ 
 			['{http://sabredav.org/ns}email-address' => $this->stripOffMailTo($email)],
 			[
 				'{DAV:}principal-URL',
-				'{' . self::NS_CALDAV . '}calendar-home-set',
-				'{' . self::NS_CALDAV . '}schedule-inbox-URL',
+				'{'.self::NS_CALDAV.'}calendar-home-set',
+				'{'.self::NS_CALDAV.'}schedule-inbox-URL',
 				'{http://sabredav.org/ns}email-address',
 
 			]
@@ -418,7 +418,7 @@ 
 		$objects = [];
 		$calendarTimeZone = new DateTimeZone('UTC');
 
-		$homePath = $result[0][200]['{' . self::NS_CALDAV . '}calendar-home-set']->getHref();
+		$homePath = $result[0][200]['{'.self::NS_CALDAV.'}calendar-home-set']->getHref();
 		foreach ($this->server->tree->getNodeForPath($homePath)->getChildren() as $node) {
 			if (!$node instanceof ICalendar) {
 				continue;
@@ -469,8 +469,8 @@ 
 		}
 
 		$inboxProps = $this->server->getProperties(
-			$result[0][200]['{' . self::NS_CALDAV . '}schedule-inbox-URL']->getHref(),
-			['{' . self::NS_CALDAV . '}calendar-availability']
+			$result[0][200]['{'.self::NS_CALDAV.'}schedule-inbox-URL']->getHref(),
+			['{'.self::NS_CALDAV.'}calendar-availability']
 		);
 
 		$vcalendar = new VCalendar();
@@ -482,10 +482,10 @@ 
 		$generator->setBaseObject($vcalendar);
 		$generator->setTimeZone($calendarTimeZone);
 
-		if (isset($inboxProps['{' . self::NS_CALDAV . '}calendar-availability'])) {
+		if (isset($inboxProps['{'.self::NS_CALDAV.'}calendar-availability'])) {
 			$generator->setVAvailability(
 				Reader::read(
-					$inboxProps['{' . self::NS_CALDAV . '}calendar-availability']
+					$inboxProps['{'.self::NS_CALDAV.'}calendar-availability']
 				)
 			);
 		}
@@ -529,7 +529,7 @@ 
 	 * @return string
 	 */
 	private function stripOffMailTo(string $email): string {
-		if (stripos($email, 'mailto:')  === 0) {
+		if (stripos($email, 'mailto:') === 0) {
 			return substr($email, 7);
 		}
 

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

Spacing +17 added lines, -17 removed lines

@@ -137,7 +137,7 @@ 
 				$calendarData = $vObject->serialize();
 				try {
 					$this->calDavBackend->createCalendarObject($subscription['id'], $uri, $calendarData, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-				} catch(BadRequest $ex) {
+				} catch (BadRequest $ex) {
 					$this->logger->logException($ex);
 				}
 			}
@@ -148,7 +148,7 @@ 
 			}
 
 			$this->updateSubscription($subscription, $mutations);
-		} catch(ParseException $ex) {
+		} catch (ParseException $ex) {
 			$subscriptionId = $subscription['id'];
 
 			$this->logger->logException($ex);
@@ -166,7 +166,7 @@ 
 	public function getSubscription(string $principalUri, string $uri) {
 		$subscriptions = array_values(array_filter(
 			$this->calDavBackend->getSubscriptionsForUser($principalUri),
-			function ($sub) use ($uri) {
+			function($sub) use ($uri) {
 				return $sub['uri'] === $uri;
 			}
 		));
@@ -192,12 +192,12 @@ 
 		$latestLocation = null;
 
 		$handlerStack = HandlerStack::create();
-		$handlerStack->push(Middleware::mapRequest(function (RequestInterface $request) {
+		$handlerStack->push(Middleware::mapRequest(function(RequestInterface $request) {
 			return $request
 				->withHeader('Accept', 'text/calendar, application/calendar+json, application/calendar+xml')
 				->withHeader('User-Agent', 'Nextcloud Webcal Crawler');
 		}));
-		$handlerStack->push(Middleware::mapResponse(function (ResponseInterface $response) use (&$didBreak301Chain, &$latestLocation) {
+		$handlerStack->push(Middleware::mapResponse(function(ResponseInterface $response) use (&$didBreak301Chain, &$latestLocation) {
 			if (!$didBreak301Chain) {
 				if ($response->getStatusCode() !== 301) {
 					$didBreak301Chain = true;
@@ -234,13 +234,13 @@ 
 				return null;
 			}
 
-			if ((bool)filter_var($host, FILTER_VALIDATE_IP) && !filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+			if ((bool) filter_var($host, FILTER_VALIDATE_IP) && !filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
 				$this->logger->warning("Subscription $subscriptionId was not refreshed because it violates local access rules");
 				return null;
 			}
 
 			// Also check for IPv6 IPv4 nesting, because that's not covered by filter_var
-			if ((bool)filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && substr_count($host, '.') > 0) {
+			if ((bool) filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && substr_count($host, '.') > 0) {
 				$delimiter = strrpos($host, ':'); // Get last colon
 				$ipv4Address = substr($host, $delimiter + 1);
 
@@ -274,11 +274,11 @@ 
 
 			$contentType = $response->getHeader('Content-Type');
 			$contentType = explode(';', $contentType, 2)[0];
-			switch($contentType) {
+			switch ($contentType) {
 				case 'application/calendar+json':
 					try {
 						$jCalendar = Reader::readJson($body, Reader::OPTION_FORGIVING);
-					} catch(Exception $ex) {
+					} catch (Exception $ex) {
 						// In case of a parsing error return null
 						$this->logger->debug("Subscription $subscriptionId could not be parsed");
 						return null;
@@ -288,7 +288,7 @@ 
 				case 'application/calendar+xml':
 					try {
 						$xCalendar = Reader::readXML($body);
-					} catch(Exception $ex) {
+					} catch (Exception $ex) {
 						// In case of a parsing error return null
 						$this->logger->debug("Subscription $subscriptionId could not be parsed");
 						return null;
@@ -299,14 +299,14 @@ 
 				default:
 					try {
 						$vCalendar = Reader::read($body);
-					} catch(Exception $ex) {
+					} catch (Exception $ex) {
 						// In case of a parsing error return null
 						$this->logger->debug("Subscription $subscriptionId could not be parsed");
 						return null;
 					}
 					return $vCalendar->serialize();
 			}
-		} catch(Exception $ex) {
+		} catch (Exception $ex) {
 			$this->logger->logException($ex);
 			$this->logger->warning("Subscription $subscriptionId could not be refreshed due to a network error");
 
@@ -349,7 +349,7 @@ 
 		// check if new refresh rate is even valid
 		try {
 			DateTimeParser::parseDuration($newRefreshRate);
-		} catch(InvalidDataException $ex) {
+		} catch (InvalidDataException $ex) {
 			return null;
 		}
 
@@ -395,10 +395,10 @@ 
 		}
 
 		$host = $parsed['host'] ?? '';
-		$port = isset($parsed['port']) ? ':' . $parsed['port'] : '';
+		$port = isset($parsed['port']) ? ':'.$parsed['port'] : '';
 		$path = $parsed['path'] ?? '';
-		$query = isset($parsed['query']) ? '?' . $parsed['query'] : '';
-		$fragment = isset($parsed['fragment']) ? '#' . $parsed['fragment'] : '';
+		$query = isset($parsed['query']) ? '?'.$parsed['query'] : '';
+		$fragment = isset($parsed['fragment']) ? '#'.$parsed['fragment'] : '';
 
 		$cleanURL = "$scheme://$host$port$path$query$fragment";
 		// parse_url is giving some weird results if no url and no :// is given,
@@ -417,6 +417,6 @@ 
 	 * @return string
 	 */
 	public function getRandomCalendarObjectUri():string {
-		return UUIDUtil::getUUID() . '.ics';
+		return UUIDUtil::getUUID().'.ics';
 	}
 }

apps/dav/lib/CalDAV/Calendar.php

Spacing +13 added lines, -13 removed lines

@@ -137,7 +137,7 @@ 
 	 * @return array
 	 */
 	public function getACL() {
-		$acl =  [
+		$acl = [
 			[
 				'privilege' => '{DAV:}read',
 				'principal' => $this->getOwner(),
@@ -145,12 +145,12 @@ 
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],
 		];
@@ -163,7 +163,7 @@ 
 			];
 			$acl[] = [
 				'privilege' => '{DAV:}write',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			];
 		} else {
@@ -174,14 +174,14 @@ 
 			];
 			$acl[] = [
 				'privilege' => '{DAV:}write-properties',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			];
 		}
 
 		$acl[] = [
 			'privilege' => '{DAV:}write-properties',
-			'principal' => $this->getOwner() . '/calendar-proxy-read',
+			'principal' => $this->getOwner().'/calendar-proxy-read',
 			'protected' => true,
 		];
 
@@ -190,7 +190,7 @@ 
 		}
 
 		if ($this->getOwner() !== parent::getOwner()) {
-			$acl[] =  [
+			$acl[] = [
 				'privilege' => '{DAV:}read',
 				'principal' => parent::getOwner(),
 				'protected' => true,
@@ -220,12 +220,12 @@ 
 		$acl = $this->caldavBackend->applyShareAcl($this->getResourceId(), $acl);
 		$allowedPrincipals = [
 			$this->getOwner(),
-			$this->getOwner(). '/calendar-proxy-read',
-			$this->getOwner(). '/calendar-proxy-write',
+			$this->getOwner().'/calendar-proxy-read',
+			$this->getOwner().'/calendar-proxy-write',
 			parent::getOwner(),
 			'principals/system/public'
 		];
-		return array_filter($acl, function ($rule) use ($allowedPrincipals) {
+		return array_filter($acl, function($rule) use ($allowedPrincipals) {
 			return \in_array($rule['principal'], $allowedPrincipals, true);
 		});
 	}
@@ -244,9 +244,9 @@ 
 	public function delete() {
 		if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']) &&
 			$this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri']) {
-			$principal = 'principal:' . parent::getOwner();
+			$principal = 'principal:'.parent::getOwner();
 			$shares = $this->caldavBackend->getShares($this->getResourceId());
-			$shares = array_filter($shares, function ($share) use ($principal) {
+			$shares = array_filter($shares, function($share) use ($principal) {
 				return $share['href'] === $principal;
 			});
 			if (empty($shares)) {
@@ -343,7 +343,7 @@ 
 
 		$uris = $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters);
 		if ($this->isShared()) {
-			return array_filter($uris, function ($uri) {
+			return array_filter($uris, function($uri) {
 				return $this->childExists($uri);
 			});
 		}

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

Spacing +25 added lines, -25 removed lines

@@ -88,9 +88,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;
 	}
 
@@ -125,7 +125,7 @@ 
 			$metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
 
 			$metaDataById = [];
-			foreach($metaDataRows as $metaDataRow) {
+			foreach ($metaDataRows as $metaDataRow) {
 				if (!isset($metaDataById[$metaDataRow[$this->dbForeignKeyName]])) {
 					$metaDataById[$metaDataRow[$this->dbForeignKeyName]] = [];
 				}
@@ -134,7 +134,7 @@ 
 					$metaDataRow['value'];
 			}
 
-			while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 				$id = $row['id'];
 
 				if (isset($metaDataById[$id])) {
@@ -165,7 +165,7 @@ 
 		}
 		list(, $name) = \Sabre\Uri\split($path);
 
-		list($backendId, $resourceId) = explode('-',  $name, 2);
+		list($backendId, $resourceId) = explode('-', $name, 2);
 
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
@@ -175,7 +175,7 @@ 
 		$stmt = $query->execute();
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-		if(!$row) {
+		if (!$row) {
 			return null;
 		}
 
@@ -187,7 +187,7 @@ 
 		$metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
 		$metadata = [];
 
-		foreach($metaDataRows as $metaDataRow) {
+		foreach ($metaDataRows as $metaDataRow) {
 			$metadata[$metaDataRow['key']] = $metaDataRow['value'];
 		}
 
@@ -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)
@@ -206,7 +206,7 @@ 
 		$stmt = $query->execute();
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-		if(!$row) {
+		if (!$row) {
 			return null;
 		}
 
@@ -218,7 +218,7 @@ 
 		$metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
 		$metadata = [];
 
-		foreach($metaDataRows as $metaDataRow) {
+		foreach ($metaDataRows as $metaDataRow) {
 			$metadata[$metaDataRow['key']] = $metaDataRow['value'];
 		}
 
@@ -261,11 +261,11 @@ 
 					$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 = [];
-					while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+					while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
 							continue;
 						}
@@ -280,11 +280,11 @@ 
 					$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 = [];
-					while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+					while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
 							continue;
 						}
@@ -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) {
+					$results[] = array_map(function($row) {
 						return $row['uri'];
 					}, $filteredRows);
 
@@ -348,11 +348,11 @@ 
 		$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 = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 			$id = $row[$this->dbForeignKeyName];
 
 			$principalRow = $this->getPrincipalById($id);
@@ -388,7 +388,7 @@ 
 			$stmt = $query->execute();
 			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-			if(!$row) {
+			if (!$row) {
 				return null;
 			}
 			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
@@ -405,7 +405,7 @@ 
 			}
 
 			list(, $name) = \Sabre\Uri\split($path);
-			list($backendId, $resourceId) = explode('-',  $name, 2);
+			list($backendId, $resourceId) = explode('-', $name, 2);
 
 			$query = $this->db->getQueryBuilder();
 			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
@@ -415,7 +415,7 @@ 
 			$stmt = $query->execute();
 			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-			if(!$row) {
+			if (!$row) {
 				return null;
 			}
 			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
@@ -435,9 +435,9 @@ 
 	 * @param String[] $metadata
 	 * @return Array
 	 */
-	private function rowToPrincipal(array $row, array $metadata=[]):array {
+	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/Reminder/ReminderService.php

Spacing +24 added lines, -24 removed lines

@@ -111,7 +111,7 @@ 
 	public function processReminders():void {
 		$reminders = $this->backend->getRemindersToProcess();
 
-		foreach($reminders as $reminder) {
+		foreach ($reminders as $reminder) {
 			$calendarData = is_resource($reminder['calendardata'])
 				? stream_get_contents($reminder['calendardata'])
 				: $reminder['calendardata'];
@@ -163,7 +163,7 @@ 
 			return;
 		}
 
-		switch($action) {
+		switch ($action) {
 			case '\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject':
 				$this->onCalendarObjectCreate($objectData);
 				break;
@@ -206,14 +206,14 @@ 
 		$now = $this->timeFactory->getDateTime();
 		$isRecurring = $masterItem ? $this->isRecurring($masterItem) : false;
 
-		foreach($recurrenceExceptions as $recurrenceException) {
+		foreach ($recurrenceExceptions as $recurrenceException) {
 			$eventHash = $this->getEventHash($recurrenceException);
 
 			if (!isset($recurrenceException->VALARM)) {
 				continue;
 			}
 
-			foreach($recurrenceException->VALARM as $valarm) {
+			foreach ($recurrenceException->VALARM as $valarm) {
 				/** @var VAlarm $valarm */
 				$alarmHash = $this->getAlarmHash($valarm);
 				$triggerTime = $valarm->getEffectiveTriggerTime();
@@ -237,7 +237,7 @@ 
 				return;
 			}
 
-			foreach($masterItem->VALARM as $valarm) {
+			foreach ($masterItem->VALARM as $valarm) {
 				$masterAlarms[] = $this->getAlarmHash($valarm);
 			}
 
@@ -250,7 +250,7 @@ 
 				return;
 			}
 
-			while($iterator->valid() && count($processedAlarms) < count($masterAlarms)) {
+			while ($iterator->valid() && count($processedAlarms) < count($masterAlarms)) {
 				$event = $iterator->getEventObject();
 
 				// Recurrence-exceptions are handled separately, so just ignore them here
@@ -259,7 +259,7 @@ 
 					continue;
 				}
 
-				foreach($event->VALARM as $valarm) {
+				foreach ($event->VALARM as $valarm) {
 					/** @var VAlarm $valarm */
 					$alarmHash = $this->getAlarmHash($valarm);
 					if (\in_array($alarmHash, $processedAlarms, true)) {
@@ -329,10 +329,10 @@ 
 	 */
 	private function getRemindersForVAlarm(VAlarm $valarm,
 										   array $objectData,
-										   string $eventHash=null,
-										   string $alarmHash=null,
-										   bool $isRecurring=false,
-										   bool $isRecurrenceException=false):array {
+										   string $eventHash = null,
+										   string $alarmHash = null,
+										   bool $isRecurring = false,
+										   bool $isRecurrenceException = false):array {
 		if ($eventHash === null) {
 			$eventHash = $this->getEventHash($valarm->parent);
 		}
@@ -365,7 +365,7 @@ 
 		];
 
 		$repeat = isset($valarm->REPEAT) ? (int) $valarm->REPEAT->getValue() : 0;
-		for($i = 0; $i < $repeat; $i++) {
+		for ($i = 0; $i < $repeat; $i++) {
 			if ($valarm->DURATION === null) {
 				continue;
 			}
@@ -394,7 +394,7 @@ 
 	 * @param array $reminders
 	 */
 	private function writeRemindersToDatabase(array $reminders): void {
-		foreach($reminders as $reminder) {
+		foreach ($reminders as $reminder) {
 			$this->backend->insertReminder(
 				(int) $reminder['calendar_id'],
 				(int) $reminder['object_id'],
@@ -440,7 +440,7 @@ 
 			return;
 		}
 
-		while($iterator->valid()) {
+		while ($iterator->valid()) {
 			$event = $iterator->getEventObject();
 
 			// Recurrence-exceptions are handled separately, so just ignore them here
@@ -455,7 +455,7 @@ 
 				continue;
 			}
 
-			foreach($event->VALARM as $valarm) {
+			foreach ($event->VALARM as $valarm) {
 				/** @var VAlarm $valarm */
 				$alarmHash = $this->getAlarmHash($valarm);
 				if ($alarmHash !== $reminder['alarm_hash']) {
@@ -596,7 +596,7 @@ 
 	 */
 	private function getVEventByRecurrenceId(VObject\Component\VCalendar $vcalendar,
 											 int $recurrenceId,
-											 bool $isRecurrenceException):?VEvent {
+											 bool $isRecurrenceException): ?VEvent {
 		$vevents = $this->getAllVEventsFromVCalendar($vcalendar);
 		if (count($vevents) === 0) {
 			return null;
@@ -608,7 +608,7 @@ 
 
 		// Handle recurrence-exceptions first, because recurrence-expansion is expensive
 		if ($isRecurrenceException) {
-			foreach($recurrenceExceptions as $recurrenceException) {
+			foreach ($recurrenceExceptions as $recurrenceException) {
 				if ($this->getEffectiveRecurrenceIdOfVEvent($recurrenceException) === $recurrenceId) {
 					return $recurrenceException;
 				}
@@ -674,11 +674,11 @@ 
 	 * @param string $calendarData
 	 * @return VObject\Component\VCalendar|null
 	 */
-	private function parseCalendarData(string $calendarData):?VObject\Component\VCalendar {
+	private function parseCalendarData(string $calendarData): ?VObject\Component\VCalendar {
 		try {
 			return VObject\Reader::read($calendarData,
 				VObject\Reader::OPTION_FORGIVING);
-		} catch(ParseException $ex) {
+		} catch (ParseException $ex) {
 			return null;
 		}
 	}
@@ -687,7 +687,7 @@ 
 	 * @param string $principalUri
 	 * @return IUser|null
 	 */
-	private function getUserFromPrincipalURI(string $principalUri):?IUser {
+	private function getUserFromPrincipalURI(string $principalUri): ?IUser {
 		if (!$principalUri) {
 			return null;
 		}
@@ -707,7 +707,7 @@ 
 	private function getAllVEventsFromVCalendar(VObject\Component\VCalendar $vcalendar):array {
 		$vevents = [];
 
-		foreach($vcalendar->children() as $child) {
+		foreach ($vcalendar->children() as $child) {
 			if (!($child instanceof VObject\Component)) {
 				continue;
 			}
@@ -727,7 +727,7 @@ 
 	 * @return VObject\Component\VEvent[]
 	 */
 	private function getRecurrenceExceptionFromListOfVEvents(array $vevents):array {
-		return array_values(array_filter($vevents, function (VEvent $vevent) {
+		return array_values(array_filter($vevents, function(VEvent $vevent) {
 			return $vevent->{'RECURRENCE-ID'} !== null;
 		}));
 	}
@@ -736,8 +736,8 @@ 
 	 * @param array $vevents
 	 * @return VEvent|null
 	 */
-	private function getMasterItemFromListOfVEvents(array $vevents):?VEvent {
-		$elements = array_values(array_filter($vevents, function (VEvent $vevent) {
+	private function getMasterItemFromListOfVEvents(array $vevents): ?VEvent {
+		$elements = array_values(array_filter($vevents, function(VEvent $vevent) {
 			return $vevent->{'RECURRENCE-ID'} === null;
 		}));
 

apps/dav/lib/CalDAV/Publishing/PublishPlugin.php

Spacing +3 added lines, -3 removed lines

@@ -113,12 +113,12 @@ 
 		$this->server = $server;
 
 		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
+		$this->server->on('propFind', [$this, 'propFind']);
 	}
 
 	public function propFind(PropFind $propFind, INode $node) {
 		if ($node instanceof Calendar) {
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node) {
+			$propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function() use ($node) {
 				if ($node->getPublishStatus()) {
 					// We return the publish-url only if the calendar is published.
 					$token = $node->getPublishStatus();
@@ -128,7 +128,7 @@ 
 				}
 			});
 
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function () use ($node) {
+			$propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function() use ($node) {
 				$canShare = (!$node->isSubscription() && $node->canWrite());
 				$canPublish = (!$node->isSubscription() && $node->canWrite());
 

apps/dav/lib/Upload/UploadHome.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
 	}
 
 	public function createFile($name, $data = null) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+		throw new Forbidden('Permission denied to create file (filename '.$name.')');
 	}
 
 	public function createDirectory($name) {
@@ -59,7 +59,7 @@ 
 	}
 
 	public function getChildren(): array {
-		return array_map(function ($node) {
+		return array_map(function($node) {
 			return new UploadFolder($node, $this->cleanupService);
 		}, $this->impl()->getChildren());
 	}
@@ -92,10 +92,10 @@ 
 		$rootView = new View();
 		$user = \OC::$server->getUserSession()->getUser();
 		Filesystem::initMountPoints($user->getUID());
-		if (!$rootView->file_exists('/' . $user->getUID() . '/uploads')) {
-			$rootView->mkdir('/' . $user->getUID() . '/uploads');
+		if (!$rootView->file_exists('/'.$user->getUID().'/uploads')) {
+			$rootView->mkdir('/'.$user->getUID().'/uploads');
 		}
-		$view = new View('/' . $user->getUID() . '/uploads');
+		$view = new View('/'.$user->getUID().'/uploads');
 		$rootInfo = $view->getFileInfo('');
 		return new Directory($view, $rootInfo);
 	}

apps/dav/lib/Upload/FutureFile.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 	 */
 	function getSize() {
 		$children = $this->root->getChildren();
-		$sizes = array_map(function ($node) {
+		$sizes = array_map(function($node) {
 			/** @var IFile $node */
 			return $node->getSize();
 		}, $children);

apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php

Spacing +7 added lines, -7 removed lines

@@ -89,10 +89,10 @@ 
 	 * @return void
 	 */
 	function propFind(PropFind $propFind, INode $node) {
-		$propFind->handle('{DAV:}supportedlock', function () {
+		$propFind->handle('{DAV:}supportedlock', function() {
 			return new SupportedLock(true);
 		});
-		$propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
+		$propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) {
 			return new LockDiscovery([]);
 		});
 	}
@@ -104,11 +104,11 @@ 
 	 * @param array $conditions
 	 */
 	public function validateTokens(RequestInterface $request, &$conditions) {
-		foreach($conditions as &$fileCondition) {
-			if(isset($fileCondition['tokens'])) {
-				foreach($fileCondition['tokens'] as &$token) {
-					if(isset($token['token'])) {
-						if(substr($token['token'], 0, 16) === 'opaquelocktoken:') {
+		foreach ($conditions as &$fileCondition) {
+			if (isset($fileCondition['tokens'])) {
+				foreach ($fileCondition['tokens'] as &$token) {
+					if (isset($token['token'])) {
+						if (substr($token['token'], 0, 16) === 'opaquelocktoken:') {
 							$token['validToken'] = true;
 						}
 					}