nextcloud / circles

lib/Command/SyncContact.php

Spacing +5 added lines, -5 removed lines

@@ -119,9 +119,9 @@ 
 		$tCards = $tBooks = 0;
 		$knownBooks = [];
 		foreach ($users as $user) {
-			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/' . $user->getUID());
+			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/'.$user->getUID());
 			$output->writeln(
-				'- User <info>' . $user->getUID() . '</info> have ' . sizeof($books) . ' address books:'
+				'- User <info>'.$user->getUID().'</info> have '.sizeof($books).' address books:'
 			);
 
 			$tBooks += sizeof($books);
@@ -137,11 +137,11 @@ 
 
 				$shared = '';
 				if ($owner !== $user->getUID()) {
-					$shared = ' (shared by <info>' . $owner . '</info>)';
+					$shared = ' (shared by <info>'.$owner.'</info>)';
 				}
 
 				$output->writeln(
-					'  <comment>*</comment> book #' . $bookId . $shared . ' contains '
+					'  <comment>*</comment> book #'.$bookId.$shared.' contains '
 					. sizeof($cards)
 					. ' entries'
 				);
@@ -151,7 +151,7 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('with a total of ' . $tBooks . ' address books and ' . $tCards . ' contact entries');
+		$output->writeln('with a total of '.$tBooks.' address books and '.$tCards.' contact entries');
 	}
 
 

lib/Service/DavService.php

Spacing +38 added lines, -38 removed lines

@@ -158,7 +158,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(), Member::TYPE_USER);
 		$this->manageDeprecatedCircles($davCard->getAddressBookId());
 		$this->manageDeprecatedMembers($davCard);
@@ -199,7 +199,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();
@@ -209,7 +209,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;
 	}
@@ -220,7 +220,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);
 	}
@@ -254,7 +254,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(
@@ -265,13 +265,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);
 			}
@@ -350,7 +350,7 @@ 
 			}
 		}
 
-		$davCard->setUserId($davCard->getOwner() . ':' . $davCard->getContactId());
+		$davCard->setUserId($davCard->getOwner().':'.$davCard->getContactId());
 
 		return DavCard::TYPE_CONTACT;
 	}
@@ -395,7 +395,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);
@@ -418,13 +418,13 @@ 
 
 			$user = $this->userManager->get($davCard->getOwner());
 			$circle = new Circle(
-				$this->configService->contactsBackendType(), $group . ' - ' . $user->getDisplayName()
+				$this->configService->contactsBackendType(), $group.' - '.$user->getDisplayName()
 			);
 			$circle->setContactAddressBook($davCard->getAddressBookId());
 			$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);
@@ -432,7 +432,7 @@ 
 				$member->setLevel(Member::LEVEL_OWNER);
 				$member->setStatus(Member::STATUS_MEMBER);
 
-				$this->miscService->log('creating new Member: ' . json_encode($member), 0);
+				$this->miscService->log('creating new Member: '.json_encode($member), 0);
 				try {
 					$this->membersRequest->createMember($member);
 				} catch (MemberAlreadyExistsException $e) {
@@ -447,7 +447,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(
@@ -457,7 +457,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);
 	}
 
 
@@ -502,12 +502,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;
 	}
@@ -524,12 +524,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']);
 			}
@@ -542,16 +542,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);
 			}
@@ -566,12 +566,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);
@@ -583,17 +583,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) {
@@ -602,7 +602,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());
@@ -624,7 +624,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);
@@ -632,7 +632,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(Circle $circle) {
@@ -642,7 +642,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;
@@ -657,14 +657,14 @@ 
 	 */
 	public function getDavCardFromMember(Member $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;
 			}
@@ -682,11 +682,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/Service/GlobalScaleService.php

Spacing +4 added lines, -4 removed lines

@@ -150,12 +150,12 @@ 
 		try {
 			$gs = OC::$server->query($class);
 			if (!$gs instanceof AGlobalScaleEvent) {
-				throw new GlobalScaleEventException($class . ' not an AGlobalScaleEvent');
+				throw new GlobalScaleEventException($class.' not an AGlobalScaleEvent');
 			}
 
 			return $gs;
 		} catch (QueryException $e) {
-			throw new GlobalScaleEventException('AGlobalScaleEvent ' . $class . ' not found');
+			throw new GlobalScaleEventException('AGlobalScaleEvent '.$class.' not found');
 		}
 	}
 
@@ -206,7 +206,7 @@ 
 			try {
 				$instances = $this->retrieveJson($request);
 			} catch (RequestContentException | RequestNetworkException | RequestResultSizeException | RequestServerException | RequestResultNotJsonException $e) {
-				$this->miscService->log('Issue while retrieving instances from lookup: ' . $e->getMessage());
+				$this->miscService->log('Issue while retrieving instances from lookup: '.$e->getMessage());
 
 				return [];
 			}
@@ -232,7 +232,7 @@ 
 		$className = $event->getType();
 		if (substr($className, 0, 25) !== '\OCA\Circles\GlobalScale\\' || strpos($className, '.')) {
 			throw new GlobalScaleEventException(
-				$className . ' does not seems to be a secured AGlobalScaleEvent'
+				$className.' does not seems to be a secured AGlobalScaleEvent'
 			);
 		}
 

lib/Search/LocalUsers.php

Doc Comments +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 
 
 	/**
-	 * @param $search
+	 * @param string $search
 	 *
 	 * @return array
 	 */

lib/Db/CirclesRequestBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -256,7 +256,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = '' . $this->default_select_alias . '.';
+		$pf = ''.$this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('u.user_id', 'viewer_userid')
@@ -267,7 +267,7 @@ 
 		   ->leftJoin(
 			   $this->default_select_alias, CoreRequestBuilder::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(Member::TYPE_USER))
@@ -289,7 +289,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('o.user_id', 'owner_userid')
@@ -299,7 +299,7 @@ 
 		   ->leftJoin(
 			   $this->default_select_alias, CoreRequestBuilder::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(Member::LEVEL_OWNER)),
 				   $expr->eq('o.user_type', $qb->createNamedParameter(Member::TYPE_USER))
 			   )

lib/Db/CirclesRequest.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/CoreRequestBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -344,8 +344,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;
 		}
@@ -373,7 +373,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;
@@ -388,12 +388,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(Member::STATUS_MEMBER)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
 
 		$qb->andWhere($orX);
 	}
@@ -406,8 +406,8 @@ 
 	 */
 	private 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)));
 	}
 
 
@@ -418,8 +418,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)));
 	}
 
 
@@ -434,9 +434,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 . 'group_id', 'ncgu.gid'));
+		$and = $expr->andX($expr->eq($pf.'group_id', 'ncgu.gid'));
 		if ($userId !== '') {
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
 		} else {
@@ -475,14 +475,14 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
 		   ->selectAlias('lc.name', 'circle_name')
 		   ->leftJoin(
 			   $this->default_select_alias, CoreRequestBuilder::TABLE_CIRCLES, 'lc',
-			   $expr->eq($pf . 'circle_id', 'lc.unique_id')
+			   $expr->eq($pf.'circle_id', 'lc.unique_id')
 		   );
 	}
 

lib/Command/CirclesTest.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$instances = $this->globalScaleService->getInstances(true);
-		$output->writeln('<info>Instances: </info>' . json_encode($instances));
+		$output->writeln('<info>Instances: </info>'.json_encode($instances));
 
 		return 0;
 	}