nextcloud / server

apps/dav/lib/CardDAV/CardDavBackend.php

Spacing +63 added lines, -63 removed lines

@@ -78,7 +78,7 @@ 
 			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
 
 		$result = $query->executeQuery();
-		$column = (int)$result->fetchOne();
+		$column = (int) $result->fetchOne();
 		$result->closeCursor();
 		return $column;
 	}
@@ -101,7 +101,7 @@ 
 	 * @return array
 	 */
 	public function getAddressBooksForUser($principalUri) {
-		return $this->atomic(function () use ($principalUri) {
+		return $this->atomic(function() use ($principalUri) {
 			$principalUriOriginal = $principalUri;
 			$principalUri = $this->convertPrincipal($principalUri, true);
 			$select = $this->db->getQueryBuilder();
@@ -118,7 +118,7 @@ 
 					'uri' => $row['uri'],
 					'principaluri' => $this->convertPrincipal($row['principaluri'], false),
 					'{DAV:}displayname' => $row['displayname'],
-					'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+					'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 					'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 					'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 				];
@@ -149,13 +149,13 @@ 
 				->andWhere($select->expr()->notIn('s.id', $select->createFunction($subSelect->getSQL()), IQueryBuilder::PARAM_INT_ARRAY));
 			$result = $select->executeQuery();
 
-			$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+			$readOnlyPropertyName = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only';
 			while ($row = $result->fetch()) {
 				if ($row['principaluri'] === $principalUri) {
 					continue;
 				}
 
-				$readOnly = (int)$row['access'] === Backend::ACCESS_READ;
+				$readOnly = (int) $row['access'] === Backend::ACCESS_READ;
 				if (isset($addressBooks[$row['id']])) {
 					if ($readOnly) {
 						// New share can not have more permissions then the old one.
@@ -169,18 +169,18 @@ 
 				}
 
 				[, $name] = \Sabre\Uri\split($row['principaluri']);
-				$uri = $row['uri'] . '_shared_by_' . $name;
-				$displayName = $row['displayname'] . ' (' . ($this->userManager->getDisplayName($name) ?? $name ?? '') . ')';
+				$uri = $row['uri'].'_shared_by_'.$name;
+				$displayName = $row['displayname'].' ('.($this->userManager->getDisplayName($name) ?? $name ?? '').')';
 
 				$addressBooks[$row['id']] = [
 					'id' => $row['id'],
 					'uri' => $uri,
 					'principaluri' => $principalUriOriginal,
 					'{DAV:}displayname' => $displayName,
-					'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+					'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 					'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 					'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-					'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $row['principaluri'],
+					'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $row['principaluri'],
 					$readOnlyPropertyName => $readOnly,
 				];
 
@@ -208,7 +208,7 @@ 
 				'uri' => $row['uri'],
 				'principaluri' => $this->convertPrincipal($row['principaluri'], false),
 				'{DAV:}displayname' => $row['displayname'],
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+				'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 				'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 			];
@@ -240,7 +240,7 @@ 
 			'uri' => $row['uri'],
 			'principaluri' => $row['principaluri'],
 			'{DAV:}displayname' => $row['displayname'],
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+			'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 			'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 		];
@@ -270,7 +270,7 @@ 
 			'uri' => $row['uri'],
 			'principaluri' => $row['principaluri'],
 			'{DAV:}displayname' => $row['displayname'],
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+			'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 			'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 
@@ -278,8 +278,8 @@ 
 
 		// system address books are always read only
 		if ($principal === 'principals/system/system') {
-			$addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'] = $row['principaluri'];
-			$addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'] = true;
+			$addressBook['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal'] = $row['principaluri'];
+			$addressBook['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only'] = true;
 		}
 
 		$this->addOwnerPrincipal($addressBook);
@@ -306,22 +306,22 @@ 
 	public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
 		$supportedProperties = [
 			'{DAV:}displayname',
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description',
+			'{'.Plugin::NS_CARDDAV.'}addressbook-description',
 		];
 
-		$propPatch->handle($supportedProperties, function ($mutations) use ($addressBookId) {
+		$propPatch->handle($supportedProperties, function($mutations) use ($addressBookId) {
 			$updates = [];
 			foreach ($mutations as $property => $newValue) {
 				switch ($property) {
 					case '{DAV:}displayname':
 						$updates['displayname'] = $newValue;
 						break;
-					case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
+					case '{'.Plugin::NS_CARDDAV.'}addressbook-description':
 						$updates['description'] = $newValue;
 						break;
 				}
 			}
-			[$addressBookRow, $shares] = $this->atomic(function () use ($addressBookId, $updates) {
+			[$addressBookRow, $shares] = $this->atomic(function() use ($addressBookId, $updates) {
 				$query = $this->db->getQueryBuilder();
 				$query->update('addressbooks');
 
@@ -333,12 +333,12 @@ 
 
 				$this->addChange($addressBookId, '', 2);
 
-				$addressBookRow = $this->getAddressBookById((int)$addressBookId);
-				$shares = $this->getShares((int)$addressBookId);
+				$addressBookRow = $this->getAddressBookById((int) $addressBookId);
+				$shares = $this->getShares((int) $addressBookId);
 				return [$addressBookRow, $shares];
 			}, $this->db);
 
-			$this->dispatcher->dispatchTyped(new AddressBookUpdatedEvent((int)$addressBookId, $addressBookRow, $shares, $mutations));
+			$this->dispatcher->dispatchTyped(new AddressBookUpdatedEvent((int) $addressBookId, $addressBookRow, $shares, $mutations));
 
 			return true;
 		});
@@ -372,11 +372,11 @@ 
 				case '{DAV:}displayname':
 					$values['displayname'] = $newValue;
 					break;
-				case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
+				case '{'.Plugin::NS_CARDDAV.'}addressbook-description':
 					$values['description'] = $newValue;
 					break;
 				default:
-					throw new BadRequest('Unknown property: ' . $property);
+					throw new BadRequest('Unknown property: '.$property);
 			}
 		}
 
@@ -386,7 +386,7 @@ 
 			$values['displayname'] = $url;
 		}
 
-		[$addressBookId, $addressBookRow] = $this->atomic(function () use ($values) {
+		[$addressBookId, $addressBookRow] = $this->atomic(function() use ($values) {
 			$query = $this->db->getQueryBuilder();
 			$query->insert('addressbooks')
 				->values([
@@ -418,8 +418,8 @@ 
 	 * @return void
 	 */
 	public function deleteAddressBook($addressBookId) {
-		$this->atomic(function () use ($addressBookId): void {
-			$addressBookId = (int)$addressBookId;
+		$this->atomic(function() use ($addressBookId): void {
+			$addressBookId = (int) $addressBookId;
 			$addressBookData = $this->getAddressBookById($addressBookId);
 			$shares = $this->getShares($addressBookId);
 
@@ -483,7 +483,7 @@ 
 
 		$result = $query->executeQuery();
 		while ($row = $result->fetch()) {
-			$row['etag'] = '"' . $row['etag'] . '"';
+			$row['etag'] = '"'.$row['etag'].'"';
 
 			$modified = false;
 			$row['carddata'] = $this->readBlob($row['carddata'], $modified);
@@ -523,7 +523,7 @@ 
 		if (!$row) {
 			return false;
 		}
-		$row['etag'] = '"' . $row['etag'] . '"';
+		$row['etag'] = '"'.$row['etag'].'"';
 
 		$modified = false;
 		$row['carddata'] = $this->readBlob($row['carddata'], $modified);
@@ -565,7 +565,7 @@ 
 			$result = $query->executeQuery();
 
 			while ($row = $result->fetch()) {
-				$row['etag'] = '"' . $row['etag'] . '"';
+				$row['etag'] = '"'.$row['etag'].'"';
 
 				$modified = false;
 				$row['carddata'] = $this->readBlob($row['carddata'], $modified);
@@ -609,7 +609,7 @@ 
 	public function createCard($addressBookId, $cardUri, $cardData, bool $checkAlreadyExists = true) {
 		$etag = md5($cardData);
 		$uid = $this->getUID($cardData);
-		return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $checkAlreadyExists, $etag, $uid) {
+		return $this->atomic(function() use ($addressBookId, $cardUri, $cardData, $checkAlreadyExists, $etag, $uid) {
 			if ($checkAlreadyExists) {
 				$q = $this->db->getQueryBuilder();
 				$q->select('uid')
@@ -618,7 +618,7 @@ 
 					->andWhere($q->expr()->eq('uid', $q->createNamedParameter($uid)))
 					->setMaxResults(1);
 				$result = $q->executeQuery();
-				$count = (bool)$result->fetchOne();
+				$count = (bool) $result->fetchOne();
 				$result->closeCursor();
 				if ($count) {
 					throw new \Sabre\DAV\Exception\BadRequest('VCard object with uid already exists in this addressbook collection.');
@@ -649,7 +649,7 @@ 
 			$objectRow = $this->getCard($addressBookId, $cardUri);
 			$this->dispatcher->dispatchTyped(new CardCreatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
 
-			return '"' . $etag . '"';
+			return '"'.$etag.'"';
 		}, $this->db);
 	}
 
@@ -682,13 +682,13 @@ 
 		$uid = $this->getUID($cardData);
 		$etag = md5($cardData);
 
-		return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $uid, $etag) {
+		return $this->atomic(function() use ($addressBookId, $cardUri, $cardData, $uid, $etag) {
 			$query = $this->db->getQueryBuilder();
 
 			// check for recently stored etag and stop if it is the same
 			$etagCacheKey = "$addressBookId#$cardUri";
 			if (isset($this->etagCache[$etagCacheKey]) && $this->etagCache[$etagCacheKey] === $etag) {
-				return '"' . $etag . '"';
+				return '"'.$etag.'"';
 			}
 
 			$query->update($this->dbCardsTable)
@@ -710,7 +710,7 @@ 
 			$shares = $this->getShares($addressBookId);
 			$objectRow = $this->getCard($addressBookId, $cardUri);
 			$this->dispatcher->dispatchTyped(new CardUpdatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
-			return '"' . $etag . '"';
+			return '"'.$etag.'"';
 		}, $this->db);
 	}
 
@@ -718,12 +718,12 @@ 
 	 * @throws Exception
 	 */
 	public function moveCard(int $sourceAddressBookId, string $sourceObjectUri, int $targetAddressBookId, string $tragetObjectUri): bool {
-		return $this->atomic(function () use ($sourceAddressBookId, $sourceObjectUri, $targetAddressBookId, $tragetObjectUri) {
+		return $this->atomic(function() use ($sourceAddressBookId, $sourceObjectUri, $targetAddressBookId, $tragetObjectUri) {
 			$card = $this->getCard($sourceAddressBookId, $sourceObjectUri);
 			if (empty($card)) {
 				return false;
 			}
-			$sourceObjectId = (int)$card['id'];
+			$sourceObjectId = (int) $card['id'];
 
 			$query = $this->db->getQueryBuilder();
 			$query->update('cards')
@@ -766,7 +766,7 @@ 
 	 * @return bool
 	 */
 	public function deleteCard($addressBookId, $cardUri) {
-		return $this->atomic(function () use ($addressBookId, $cardUri) {
+		return $this->atomic(function() use ($addressBookId, $cardUri) {
 			$addressBookData = $this->getAddressBookById($addressBookId);
 			$shares = $this->getShares($addressBookId);
 			$objectRow = $this->getCard($addressBookId, $cardUri);
@@ -856,7 +856,7 @@ 
 		$maxLimit = $this->config->getSystemValueInt('carddav_sync_request_truncation', 2500);
 		$limit = ($limit === null) ? $maxLimit : min($limit, $maxLimit);
 		// Current synctoken
-		return $this->atomic(function () use ($addressBookId, $syncToken, $syncLevel, $limit) {
+		return $this->atomic(function() use ($addressBookId, $syncToken, $syncLevel, $limit) {
 			$qb = $this->db->getQueryBuilder();
 			$qb->select('synctoken')
 				->from('addressbooks')
@@ -900,7 +900,7 @@ 
 				} else {
 					$lastID = $values[array_key_last($values)]['id'];
 					$result['added'] = array_column($values, 'uri');
-					$result['syncToken'] = count($result['added']) >= $limit ? "init_{$lastID}_$initialSyncToken" : $initialSyncToken ;
+					$result['syncToken'] = count($result['added']) >= $limit ? "init_{$lastID}_$initialSyncToken" : $initialSyncToken;
 					$result['result_truncated'] = count($result['added']) >= $limit;
 				}
 			} elseif ($syncToken) {
@@ -984,7 +984,7 @@ 
 				}
 				$lastID = $values[array_key_last($values)]['id'];
 				if (count($values) >= $limit) {
-					$result['syncToken'] = 'init_' . $lastID . '_' . $currentToken;
+					$result['syncToken'] = 'init_'.$lastID.'_'.$currentToken;
 					$result['result_truncated'] = true;
 				}
 
@@ -1005,13 +1005,13 @@ 
 	 * @return void
 	 */
 	protected function addChange(int $addressBookId, string $objectUri, int $operation): void {
-		$this->atomic(function () use ($addressBookId, $objectUri, $operation): void {
+		$this->atomic(function() use ($addressBookId, $objectUri, $operation): void {
 			$query = $this->db->getQueryBuilder();
 			$query->select('synctoken')
 				->from('addressbooks')
 				->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)));
 			$result = $query->executeQuery();
-			$syncToken = (int)$result->fetchOne();
+			$syncToken = (int) $result->fetchOne();
 			$result->closeCursor();
 
 			$query = $this->db->getQueryBuilder();
@@ -1080,7 +1080,7 @@ 
 	 * @param list<string> $remove
 	 */
 	public function updateShares(IShareable $shareable, array $add, array $remove): void {
-		$this->atomic(function () use ($shareable, $add, $remove): void {
+		$this->atomic(function() use ($shareable, $add, $remove): void {
 			$addressBookId = $shareable->getResourceId();
 			$addressBookData = $this->getAddressBookById($addressBookId);
 			$oldShares = $this->getShares($addressBookId);
@@ -1107,7 +1107,7 @@ 
 	 * @return array an array of contacts which are arrays of key-value-pairs
 	 */
 	public function search($addressBookId, $pattern, $searchProperties, $options = []): array {
-		return $this->atomic(function () use ($addressBookId, $pattern, $searchProperties, $options) {
+		return $this->atomic(function() use ($addressBookId, $pattern, $searchProperties, $options) {
 			return $this->searchByAddressBookIds([$addressBookId], $pattern, $searchProperties, $options);
 		}, $this->db);
 	}
@@ -1125,9 +1125,9 @@ 
 		string $pattern,
 		array $searchProperties,
 		array $options = []): array {
-		return $this->atomic(function () use ($principalUri, $pattern, $searchProperties, $options) {
-			$addressBookIds = array_map(static function ($row):int {
-				return (int)$row['id'];
+		return $this->atomic(function() use ($principalUri, $pattern, $searchProperties, $options) {
+			$addressBookIds = array_map(static function($row):int {
+				return (int) $row['id'];
 			}, $this->getAddressBooksForUser($principalUri));
 
 			return $this->searchByAddressBookIds($addressBookIds, $pattern, $searchProperties, $options);
@@ -1162,7 +1162,7 @@ 
 		$useWildcards = !\array_key_exists('wildcard', $options) || $options['wildcard'] !== false;
 
 		if ($escapePattern) {
-			$searchProperties = array_filter($searchProperties, function ($property) use ($pattern) {
+			$searchProperties = array_filter($searchProperties, function($property) use ($pattern) {
 				if ($property === 'EMAIL' && str_contains($pattern, ' ')) {
 					// There can be no spaces in emails
 					return false;
@@ -1195,7 +1195,7 @@ 
 			} elseif (!$escapePattern) {
 				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter($pattern)));
 			} else {
-				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
+				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%'.$this->db->escapeLikeParameter($pattern).'%')));
 			}
 		}
 		if (isset($options['limit'])) {
@@ -1206,7 +1206,7 @@ 
 		}
 
 		if (isset($options['person'])) {
-			$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($options['person']) . '%')));
+			$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%'.$this->db->escapeLikeParameter($options['person']).'%')));
 		}
 		if (isset($options['since']) || isset($options['until'])) {
 			$query2->join('cp', $this->dbCardsPropertiesTable, 'cp_bday', 'cp.cardid = cp_bday.cardid');
@@ -1234,8 +1234,8 @@ 
 		$result = $query2->executeQuery();
 		$matches = $result->fetchAll();
 		$result->closeCursor();
-		$matches = array_map(function ($match) {
-			return (int)$match['cardid'];
+		$matches = array_map(function($match) {
+			return (int) $match['cardid'];
 		}, $matches);
 
 		$cardResults = [];
@@ -1252,8 +1252,8 @@ 
 		}
 
 		$cards = array_merge(...$cardResults);
-		return array_map(function ($array) {
-			$array['addressbookid'] = (int)$array['addressbookid'];
+		return array_map(function($array) {
+			$array['addressbookid'] = (int) $array['addressbookid'];
 			$modified = false;
 			$array['carddata'] = $this->readBlob($array['carddata'], $modified);
 			if ($modified) {
@@ -1299,7 +1299,7 @@ 
 		$result->closeCursor();
 
 		if (!isset($uri['uri'])) {
-			throw new \InvalidArgumentException('Card does not exists: ' . $id);
+			throw new \InvalidArgumentException('Card does not exists: '.$id);
 		}
 
 		return $uri['uri'];
@@ -1324,7 +1324,7 @@ 
 
 		if (is_array($contact)) {
 			$modified = false;
-			$contact['etag'] = '"' . $contact['etag'] . '"';
+			$contact['etag'] = '"'.$contact['etag'].'"';
 			$contact['carddata'] = $this->readBlob($contact['carddata'], $modified);
 			if ($modified) {
 				$contact['size'] = strlen($contact['carddata']);
@@ -1359,7 +1359,7 @@ 
 	 * @param string $vCardSerialized
 	 */
 	protected function updateProperties($addressBookId, $cardUri, $vCardSerialized) {
-		$this->atomic(function () use ($addressBookId, $cardUri, $vCardSerialized): void {
+		$this->atomic(function() use ($addressBookId, $cardUri, $vCardSerialized): void {
 			$cardId = $this->getCardId($addressBookId, $cardUri);
 			$vCard = $this->readCard($vCardSerialized);
 
@@ -1434,10 +1434,10 @@ 
 		$result->closeCursor();
 
 		if (!isset($cardIds['id'])) {
-			throw new \InvalidArgumentException('Card does not exists: ' . $uri);
+			throw new \InvalidArgumentException('Card does not exists: '.$uri);
 		}
 
-		return (int)$cardIds['id'];
+		return (int) $cardIds['id'];
 	}
 
 	/**
@@ -1465,7 +1465,7 @@ 
 			->from('addressbookchanges');
 
 		$result = $query->executeQuery();
-		$maxId = (int)$result->fetchOne();
+		$maxId = (int) $result->fetchOne();
 		$result->closeCursor();
 		if (!$maxId || $maxId < $keep) {
 			return 0;
@@ -1492,8 +1492,8 @@ 
 	}
 
 	private function addOwnerPrincipal(array &$addressbookInfo): void {
-		$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($addressbookInfo[$ownerPrincipalKey])) {
 			$uri = $addressbookInfo[$ownerPrincipalKey];
 		} else {