nextcloud / circles

lib/Service/DavService.php

Spacing +38 added lines, -38 removed lines

@@ -164,7 +164,7 @@ 
 	public function onDeleteCard(GenericEvent $event) {
 		$davCard = $this->generateDavCard($event, true);
 
-		$this->miscService->log('Deleting Card: ' . json_encode($davCard), 1);
+		$this->miscService->log('Deleting Card: '.json_encode($davCard), 1);
 		$this->membersRequest->removeMembersByContactId($davCard->getUniqueId(), DeprecatedMember::TYPE_USER);
 		$this->manageDeprecatedCircles($davCard->getAddressBookId());
 		$this->manageDeprecatedMembers($davCard);
@@ -205,7 +205,7 @@ 
 	 */
 	private function generateDavCardFromCard(int $bookId, array $card): DavCard {
 		$this->miscService->log(
-			'generating DavCard Model from book=' . $bookId . ' from ' . json_encode($card), 0
+			'generating DavCard Model from book='.$bookId.' from '.json_encode($card), 0
 		);
 
 		$davCard = new DavCard();
@@ -215,7 +215,7 @@ 
 		$davCard->setOwner($this->getOwnerFromAddressBook($bookId));
 		$davCard->importFromDav($card['carddata']);
 
-		$this->miscService->log('generated DavCard Model: ' . json_encode($davCard), 0);
+		$this->miscService->log('generated DavCard Model: '.json_encode($davCard), 0);
 
 		return $davCard;
 	}
@@ -226,7 +226,7 @@ 
 	 *
 	 */
 	private function manageDavCard(DavCard $davCard) {
-		$this->miscService->log('Updating Card: ' . json_encode($davCard), 1);
+		$this->miscService->log('Updating Card: '.json_encode($davCard), 1);
 		$this->manageCircles($davCard);
 		$this->manageContact($davCard);
 	}
@@ -260,7 +260,7 @@ 
 	 */
 	private function manageDeprecatedMembers(DavCard $davCard) {
 		$this->miscService->log(
-			'Managing deprecated circles memberships from DavCard Model: ' . json_encode($davCard), 0
+			'Managing deprecated circles memberships from DavCard Model: '.json_encode($davCard), 0
 		);
 
 		$circles = array_map(
@@ -271,13 +271,13 @@ 
 
 		$members = $this->membersRequest->getMembersByContactId($davCard->getUniqueId());
 		$this->miscService->log(
-			'Found ' . sizeof($members) . ' memberships with contactId=' . $davCard->getUniqueId(), 0
+			'Found '.sizeof($members).' memberships with contactId='.$davCard->getUniqueId(), 0
 		);
 
 		foreach ($members as $member) {
 			if (!in_array($member->getCircleId(), $circles)) {
 				$this->miscService->log(
-					'Removing membership ' . $member->getMemberId() . ' from ' . $member->getCircleId(), 0
+					'Removing membership '.$member->getMemberId().' from '.$member->getCircleId(), 0
 				);
 				$this->membersRequest->removeMember($member);
 			}
@@ -357,7 +357,7 @@ 
 			}
 		}
 
-		$davCard->setUserId($davCard->getOwner() . ':' . $davCard->getContactId());
+		$davCard->setUserId($davCard->getOwner().':'.$davCard->getContactId());
 
 		return DavCard::TYPE_CONTACT;
 	}
@@ -402,7 +402,7 @@ 
 		);
 
 		$this->miscService->log(
-			'manage Circles from DavCard: ' . json_encode($fromCard) . ' - current: ' . json_encode($current)
+			'manage Circles from DavCard: '.json_encode($fromCard).' - current: '.json_encode($current)
 		);
 
 		$this->manageNewCircles($davCard, $fromCard, $current);
@@ -425,7 +425,7 @@ 
 
 			$user = $this->userManager->get($davCard->getOwner());
 			$circle = new DeprecatedCircle(
-				$this->configService->contactsBackendType(), $group . ' - ' . $user->getDisplayName()
+				$this->configService->contactsBackendType(), $group.' - '.$user->getDisplayName()
 			);
 			$circle->setAltName($group);
 			$circle->generateUniqueId();
@@ -433,7 +433,7 @@ 
 			$circle->setContactGroupName($group);
 
 			$this->miscService->log(
-				'creating new Circle: ' . json_encode($circle) . ', with owner=' . $davCard->getOwner(), 0
+				'creating new Circle: '.json_encode($circle).', with owner='.$davCard->getOwner(), 0
 			);
 			try {
 				$this->circlesRequest->createCircle($circle);
@@ -442,7 +442,7 @@ 
 				$owner->setStatus(DeprecatedMember::STATUS_MEMBER);
 				$this->membersService->updateCachedName($owner);
 
-				$this->miscService->log('creating new Member: ' . json_encode($owner), 0);
+				$this->miscService->log('creating new Member: '.json_encode($owner), 0);
 				try {
 					$this->membersRequest->createMember($owner);
 				} catch (MemberAlreadyExistsException $e) {
@@ -457,7 +457,7 @@ 
 	 * @param DavCard $davCard
 	 */
 	private function assignCirclesToCard(DavCard $davCard) {
-		$this->miscService->log('assigning Circles to DavCard Model: ' . json_encode($davCard), 0);
+		$this->miscService->log('assigning Circles to DavCard Model: '.json_encode($davCard), 0);
 		foreach ($davCard->getGroups() as $group) {
 			try {
 				$davCard->addCircle(
@@ -467,7 +467,7 @@ 
 			}
 		}
 
-		$this->miscService->log('assigned Circles to DavCard Model: ' . json_encode($davCard), 0);
+		$this->miscService->log('assigned Circles to DavCard Model: '.json_encode($davCard), 0);
 	}
 
 
@@ -512,12 +512,12 @@ 
 	 * @return string
 	 */
 	public function getOwnerFromAddressBook(int $bookId): string {
-		$this->miscService->log('Retrieving Owner from book:' . $bookId, 0);
+		$this->miscService->log('Retrieving Owner from book:'.$bookId, 0);
 		$data = $this->cardDavBackend->getAddressBookById($bookId);
 
 		// let's assume the format is principals/users/OWNER
 		$owner = substr($data['principaluri'], 17);
-		$this->miscService->log('Retrieved Owner:' . $owner, 0);
+		$this->miscService->log('Retrieved Owner:'.$owner, 0);
 
 		return $owner;
 	}
@@ -534,12 +534,12 @@ 
 		$this->manageDeprecatedContacts();
 		$this->manageDeprecatedCircles();
 		$users = $this->userManager->search('');
-		$this->miscService->log('initiating migration for ' . sizeof($users) . ' users', 0);
+		$this->miscService->log('initiating migration for '.sizeof($users).' users', 0);
 		foreach ($users as $user) {
-			$this->miscService->log('retrieving books for user=' . $user->getUID(), 0);
-			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/' . $user->getUID());
+			$this->miscService->log('retrieving books for user='.$user->getUID(), 0);
+			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/'.$user->getUID());
 
-			$this->miscService->log('initiating migration for user=' . $user->getUID(), 0);
+			$this->miscService->log('initiating migration for user='.$user->getUID(), 0);
 			foreach ($books as $book) {
 				$this->migrateBook($book['id']);
 			}
@@ -552,16 +552,16 @@ 
 	private function manageDeprecatedContacts() {
 		$contacts = $this->membersRequest->getMembersByContactId();
 		$this->miscService->log(
-			'Managing Deprecated Contacts, checking ' . sizeof($contacts) . ' known contacts in database', 0
+			'Managing Deprecated Contacts, checking '.sizeof($contacts).' known contacts in database', 0
 		);
 
 		foreach ($contacts as $contact) {
 			try {
 				$this->getDavCardFromMember($contact);
-				$this->miscService->log('Contact is not deprecated: ' . json_encode($contact));
+				$this->miscService->log('Contact is not deprecated: '.json_encode($contact));
 			} catch (MemberDoesNotExistException $e) {
 				$this->miscService->log(
-					'Contact is deprecated and will be removed: ' . json_encode($contact)
+					'Contact is deprecated and will be removed: '.json_encode($contact)
 				);
 				$this->membersRequest->removeMember($contact);
 			}
@@ -576,12 +576,12 @@ 
 	 */
 	private function manageDeprecatedCircles(int $bookId = 0) {
 		$knownBooks = [$bookId];
-		$this->miscService->log('Managing Deprecated Circles, using bookId: ' . $bookId, 0);
+		$this->miscService->log('Managing Deprecated Circles, using bookId: '.$bookId, 0);
 
 		if ($bookId > 0) {
 			$knownBooks = [];
 			$contacts = $this->membersRequest->getMembersByContactId();
-			$this->miscService->log(sizeof($contacts) . ' known members as contacts in Circles DB', 0);
+			$this->miscService->log(sizeof($contacts).' known members as contacts in Circles DB', 0);
 
 			foreach ($contacts as $contact) {
 				list($bookId,) = explode('/', $contact->getContactId(), 2);
@@ -593,17 +593,17 @@ 
 			}
 		}
 
-		$this->miscService->log('Known books: ' . json_encode($knownBooks), 0);
+		$this->miscService->log('Known books: '.json_encode($knownBooks), 0);
 		foreach ($knownBooks as $bookId) {
-			$this->miscService->log('retrieving local Circles data for bookId=' . $bookId, 0);
+			$this->miscService->log('retrieving local Circles data for bookId='.$bookId, 0);
 			$circles = $this->circlesRequest->getFromContactBook($bookId);
 			$this->miscService->log(
-				'Known circles for bookId=' . $bookId . ': ' . json_encode($circles), 0
+				'Known circles for bookId='.$bookId.': '.json_encode($circles), 0
 			);
 
 			$fromBook = $this->getExistingCirclesFromBook($bookId);
 			$this->miscService->log(
-				'Generated circles from bookId=' . $bookId . ': ' . json_encode($fromBook), 0
+				'Generated circles from bookId='.$bookId.': '.json_encode($fromBook), 0
 			);
 
 			foreach ($circles as $circle) {
@@ -612,7 +612,7 @@ 
 				}
 
 				$this->miscService->log(
-					$circle->getUniqueId() . ' is a deprecated Circle and will be destroyed', 0
+					$circle->getUniqueId().' is a deprecated Circle and will be destroyed', 0
 				);
 
 				$this->membersRequest->removeAllFromCircle($circle->getUniqueId());
@@ -634,7 +634,7 @@ 
 		$cards = $this->cardDavBackend->getCards($bookId);
 
 		$this->miscService->log(
-			'retrieving existing circles from bookId=' . $bookId . ' in ' . sizeof($cards) . ' cards', 0
+			'retrieving existing circles from bookId='.$bookId.' in '.sizeof($cards).' cards', 0
 		);
 		foreach ($cards as $card) {
 			$davCard = $this->generateDavCardFromCard($bookId, $card);
@@ -642,7 +642,7 @@ 
 			$circles = array_merge($circles, $davCard->getCircles());
 		}
 
-		$this->miscService->log('Found ' . sizeof($circles) . ' Circles from book=' . $bookId, 0);
+		$this->miscService->log('Found '.sizeof($circles).' Circles from book='.$bookId, 0);
 		$existing = array_unique(
 			array_map(
 				function(DeprecatedCircle $circle) {
@@ -652,7 +652,7 @@ 
 		);
 
 		$this->miscService->log(
-			'retrieved existing circles from book=' . $bookId . ': ' . json_encode($existing), 0
+			'retrieved existing circles from book='.$bookId.': '.json_encode($existing), 0
 		);
 
 		return $existing;
@@ -667,14 +667,14 @@ 
 	 */
 	public function getDavCardFromMember(DeprecatedMember $contact): DavCard {
 		list($bookId, $cardUri) = explode('/', $contact->getContactId(), 2);
-		$this->miscService->log('Retrieving DavCard from book:' . $bookId . ', uri:' . $cardUri, 0);
+		$this->miscService->log('Retrieving DavCard from book:'.$bookId.', uri:'.$cardUri, 0);
 
 		$cards = $this->cardDavBackend->getCards($bookId);
-		$this->miscService->log('Book contains ' . sizeof($cards) . ' cards', 0);
+		$this->miscService->log('Book contains '.sizeof($cards).' cards', 0);
 		foreach ($cards as $card) {
 			if ($card['uri'] === $cardUri) {
 				$davCard = $this->generateDavCardFromCard($bookId, $card);
-				$this->miscService->log('Retrieved DavCard: ' . json_encode($card));
+				$this->miscService->log('Retrieved DavCard: '.json_encode($card));
 
 				return $davCard;
 			}
@@ -692,11 +692,11 @@ 
 			return;
 		}
 
-		$this->miscService->log('migrating book: ' . $bookId, 0);
+		$this->miscService->log('migrating book: '.$bookId, 0);
 		$owner = $this->getOwnerFromAddressBook($bookId);
 
 		$cards = $this->cardDavBackend->getCards($bookId);
-		$this->miscService->log('found ' . sizeof($cards) . 'cards from book=' . $bookId, 0);
+		$this->miscService->log('found '.sizeof($cards).'cards from book='.$bookId, 0);
 
 		foreach ($cards as $card) {
 			$davCard = new DavCard();

lib/Migration/ImportOwncloudCustomGroups.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 				continue;
 			}
 
-			$level = (int) $row['role'] === 1 ? DeprecatedMember::LEVEL_OWNER : DeprecatedMember::LEVEL_MEMBER;
+			$level = (int)$row['role'] === 1 ? DeprecatedMember::LEVEL_OWNER : DeprecatedMember::LEVEL_MEMBER;
 
 			if ($level === DeprecatedMember::LEVEL_OWNER) {
 				if (isset($this->circleHasAdmin[$this->circlesById[$row['group_id']]])) {

lib/Db/DeprecatedCirclesRequestBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -245,7 +245,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = '' . $this->default_select_alias . '.';
+		$pf = ''.$this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('u.user_id', 'viewer_userid')
@@ -259,7 +259,7 @@ 
 		   ->leftJoin(
 			   $this->default_select_alias, DeprecatedRequestBuilder::TABLE_MEMBERS, 'u',
 			   $expr->andX(
-				   $expr->eq('u.circle_id', $pf . 'unique_id'),
+				   $expr->eq('u.circle_id', $pf.'unique_id'),
 				   $expr->eq('u.user_id', $qb->createNamedParameter($userId)),
 				   $expr->eq('u.instance', $qb->createNamedParameter($instanceId)),
 				   $expr->eq('u.user_type', $qb->createNamedParameter($type))
@@ -281,7 +281,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('o.user_id', 'owner_userid')
@@ -294,7 +294,7 @@ 
 		   ->leftJoin(
 			   $this->default_select_alias, DeprecatedRequestBuilder::TABLE_MEMBERS, 'o',
 			   $expr->andX(
-				   $expr->eq('o.circle_id', $pf . 'unique_id'),
+				   $expr->eq('o.circle_id', $pf.'unique_id'),
 				   $expr->eq('o.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_OWNER)),
 				   $expr->eq('o.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER))
 			   )

lib/Db/DeprecatedCirclesRequest.php

Spacing +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
 		$cursor->closeCursor();
 
 		if ($data === false) {
-			throw new CircleDoesNotExistException($this->l10n->t('Circle not found ' . $circleUniqueId));
+			throw new CircleDoesNotExistException($this->l10n->t('Circle not found '.$circleUniqueId));
 		}
 
 		$circle = $this->parseCirclesSelectSql($data);

lib/Db/DeprecatedRequestBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -348,8 +348,8 @@ 
 		$expr = $qb->expr();
 
 		if ($pf === '') {
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
 
 			return;
 		}
@@ -378,7 +378,7 @@ 
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
 				continue;
 			}
-			$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
+			$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
 		}
 
 		return $orX;
@@ -393,12 +393,12 @@ 
 	protected function limitToMembersAndAlmost(IQueryBuilder $qb) {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
 		$orX = $expr->orX();
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
 
 		$qb->andWhere($orX);
 	}
@@ -411,8 +411,8 @@ 
 	 */
 	public function limitToDBField(IQueryBuilder $qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -423,8 +423,8 @@ 
 	 */
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -439,9 +439,9 @@ 
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
-		$and = $expr->andX($expr->eq($pf . 'user_id', 'ncgu.gid'));
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
 		if ($userId !== '') {
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
 		} else {
@@ -464,7 +464,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -473,7 +473,7 @@ 
 		   ->selectAlias('lc.settings', 'circle_settings')
 		   ->leftJoin(
 			   $this->default_select_alias, DeprecatedRequestBuilder::TABLE_CIRCLES, 'lc',
-			   $expr->eq($pf . 'circle_id', 'lc.unique_id')
+			   $expr->eq($pf.'circle_id', 'lc.unique_id')
 		   );
 	}
 

Doc Comments +3 added lines, -3 removed lines

@@ -176,7 +176,7 @@ 
 	 * Limit the request to the owner
 	 *
 	 * @param IQueryBuilder $qb
-	 * @param $owner
+	 * @param string $owner
 	 */
 	protected function limitToOwner(IQueryBuilder $qb, $owner) {
 		$this->limitToDBField($qb, 'owner', $owner);
@@ -342,7 +342,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 * @param int $level
-	 * @param string|array $pf
+	 * @param string[] $pf
 	 */
 	protected function limitToLevel(IQueryBuilder $qb, int $level, $pf = '') {
 		$expr = $qb->expr();
@@ -419,7 +419,7 @@ 
 	/**
 	 * @param IQueryBuilder $qb
 	 * @param string $field
-	 * @param string|integer $value
+	 * @param string $value
 	 */
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
 		$expr = $qb->expr();

lib/Model/Federated/FederatedEvent.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 	}
 
 	/**
-	 * @param mixed $class
+	 * @param string $class
 	 *
 	 * @return self
 	 */

lib/Service/FederatedEventService.php

Spacing +3 added lines, -3 removed lines

@@ -238,16 +238,16 @@
 		try {
 			$test = new ReflectionClass($class);
 		} catch (ReflectionException $e) {
-			throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage());
+			throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage());
 		}
 
 		if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) {
-			throw new FederatedEventException($class . ' does not implements IFederatedItem');
+			throw new FederatedEventException($class.' does not implements IFederatedItem');
 		}
 
 		$item = OC::$server->get($class);
 		if (!($item instanceof IFederatedItem)) {
-			throw new FederatedEventException($class . ' not an IFederatedItem');
+			throw new FederatedEventException($class.' not an IFederatedItem');
 		}
 
 		$this->setFederatedEventBypass($event, $item);

Unused Use Statements -1 removed lines

@@ -47,7 +47,6 @@
 use OCA\Circles\Exceptions\FederatedShareBelongingException;
 use OCA\Circles\Exceptions\FederatedShareNotFoundException;
 use OCA\Circles\Exceptions\InitiatorNotConfirmedException;
-use OCA\Circles\Exceptions\JsonException;
 use OCA\Circles\Exceptions\ModelException;
 use OCA\Circles\Exceptions\OwnerNotFoundException;
 use OCA\Circles\Exceptions\RemoteInstanceException;

lib/Service/RemoteService.php

Spacing +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
 			$loop++;
 			if ($loop > 10 || in_array($instance, $knownInstance)) {
 				throw new CircleNotFoundException(
-					'circle not found after browsing ' . implode(', ', $knownInstance)
+					'circle not found after browsing '.implode(', ', $knownInstance)
 				);
 			}
 			$knownInstance[] = $instance;

lib/Db/CoreRequestBuilder.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 
 
 	/**
-	 * @param array $ids
+	 * @param string[] $ids
 	 *
 	 * @throws InvalidIdException
 	 */