nextcloud / circles

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);
 			}
@@ -351,7 +351,7 @@ 
 			}
 		}
 
-		$davCard->setUserId($davCard->getOwner() . ':' . $davCard->getContactId());
+		$davCard->setUserId($davCard->getOwner().':'.$davCard->getContactId());
 
 		return DavCard::TYPE_CONTACT;
 	}
@@ -396,7 +396,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);
@@ -419,14 +419,14 @@ 
 
 			$user = $this->userManager->get($davCard->getOwner());
 			$circle = new Circle(
-				$this->configService->contactsBackendType(), $group . ' - ' . $user->getDisplayName()
+				$this->configService->contactsBackendType(), $group.' - '.$user->getDisplayName()
 			);
 			$circle->setAltName($group);
 			$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);
@@ -435,7 +435,7 @@ 
 				$member->setStatus(Member::STATUS_MEMBER);
 				$this->miscService->updateCachedName($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) {
@@ -450,7 +450,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(
@@ -460,7 +460,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);
 	}
 
 
@@ -505,12 +505,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;
 	}
@@ -527,12 +527,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']);
 			}
@@ -545,16 +545,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);
 			}
@@ -569,12 +569,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);
@@ -586,17 +586,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) {
@@ -605,7 +605,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());
@@ -627,7 +627,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);
@@ -635,7 +635,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) {
@@ -645,7 +645,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;
@@ -660,14 +660,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;
 			}
@@ -685,11 +685,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/GlobalScale/MemberAdd.php

Doc Comments +2 added lines, -2 removed lines

@@ -191,8 +191,8 @@
 
 
 	/**
-	 * @param Circle|null $circle
-	 * @param Member|null $member
+	 * @param Circle $circle
+	 * @param Member $member
 	 * @param array $links
 	 * @param string $password
 	 */

lib/GlobalScale/GlobalSync.php

Spacing +3 added lines, -3 removed lines

@@ -116,13 +116,13 @@ 
 				}
 
 				$this->miscService->log(
-					'updating member :' . json_encode($member) . ' from ' . json_encode($knownMember), 2
+					'updating member :'.json_encode($member).' from '.json_encode($knownMember), 2
 				);
 				$this->membersRequest->updateMemberLevel($member);
 			} catch (MemberDoesNotExistException $e) {
 				try {
 					$this->miscService->log(
-						'creating member :' . json_encode($member), 2
+						'creating member :'.json_encode($member), 2
 					);
 					$this->membersRequest->createMember($member);
 				} catch (MemberAlreadyExistsException $e) {
@@ -140,7 +140,7 @@ 
 			try {
 				$this->getMember($knownItem, $circle->getMembers(), $source);
 			} catch (MemberDoesNotExistException $e) {
-				$this->miscService->log('removing deprecated member :' . json_encode($knownItem), 2);
+				$this->miscService->log('removing deprecated member :'.json_encode($knownItem), 2);
 				$this->membersRequest->removeMember($knownItem);
 				$this->gsSharesRequest->removeGSSharesFromMember($knownItem);
 			}

lib/Command/CirclesTest.php

Spacing +5 added lines, -5 removed lines

@@ -134,9 +134,9 @@ 
 		$test->setAsync(true);
 		$token = $this->gsUpstreamService->newEvent($test);
 
-		$output->writeln('- Async request is sent, now waiting ' . $this->delay . ' seconds');
+		$output->writeln('- Async request is sent, now waiting '.$this->delay.' seconds');
 		sleep($this->delay);
-		$output->writeln('- Pause is over, checking results for ' . $token);
+		$output->writeln('- Pause is over, checking results for '.$token);
 
 		$wrappers = $this->gsUpstreamService->getEventsByToken($token);
 
@@ -146,7 +146,7 @@ 
 		}
 
 		foreach ($instances as $instance) {
-			$output->write($instance . ' ');
+			$output->write($instance.' ');
 			if (array_key_exists($instance, $result)
 				&& $result[$instance]->getResult()
 									 ->gInt('status') === 1) {
@@ -171,7 +171,7 @@ 
 	 */
 	private function testLocalAddress(OutputInterface $output): bool {
 		$absolute = $this->urlGenerator->linkToRouteAbsolute('core.CSRFToken.index');
-		$output->write('- Simple request on ' . $absolute . ': ');
+		$output->write('- Simple request on '.$absolute.': ');
 
 		$request = new Request('', Request::TYPE_GET);
 		$request->setAddressFromUrl($absolute);
@@ -187,7 +187,7 @@ 
 		if ($request->getResultCode() === 200) {
 			$color = 'info';
 		}
-		$output->writeln('<' . $color . '>' . $request->getResultCode() . '</' . $color . '>');
+		$output->writeln('<'.$color.'>'.$request->getResultCode().'</'.$color.'>');
 
 		if ($request->getResultCode() === 200) {
 			return true;

lib/Service/GSUpstreamService.php

Spacing +3 added lines, -3 removed lines

@@ -150,7 +150,7 @@ 
 			}
 		} catch (Exception $e) {
 			$this->miscService->log(
-				get_class($e) . ' on new event: ' . $e->getMessage() . ' - ' . json_encode($event), 1
+				get_class($e).' on new event: '.$e->getMessage().' - '.json_encode($event), 1
 			);
 			throw $e;
 		}
@@ -246,13 +246,13 @@ 
 		$request->setDataSerialize($event);
 
 		$result = $this->retrieveJson($request);
-		$this->miscService->log('result ' . json_encode($result), 0);
+		$this->miscService->log('result '.json_encode($result), 0);
 		if ($this->getInt('status', $result) === 0) {
 			throw new GlobalScaleEventException($this->get('error', $result));
 		}
 
 		$updatedData = $this->getArray('event', $result);
-		$this->miscService->log('updatedEvent: ' . json_encode($updatedData), 0);
+		$this->miscService->log('updatedEvent: '.json_encode($updatedData), 0);
 		if (!empty($updatedData)) {
 			$updated = new GSEvent();
 			try {