nextcloud / circles

lib/Model/Member.php

Spacing +19 added lines, -19 removed lines

@@ -811,29 +811,29 @@ 
 	 * @throws MemberNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new MemberNotFoundException();
 		}
 
-		$this->setId($this->get($prefix . 'member_id', $data));
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setUserId($this->get($prefix . 'user_id', $data));
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
-		$this->setLevel($this->getInt($prefix . 'level', $data));
-		$this->setStatus($this->get($prefix . 'status', $data));
-		$this->setDisplayName($this->get($prefix . 'cached_name', $data));
-		$this->setNotes($this->getArray($prefix . 'note', $data));
-		$this->setContactId($this->get($prefix . 'contact_id', $data));
-		$this->setContactMeta($this->get($prefix . 'contact_meta', $data));
-
-		$cachedUpdate = $this->get($prefix . 'cached_update', $data);
+		$this->setId($this->get($prefix.'member_id', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setUserId($this->get($prefix.'user_id', $data));
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
+		$this->setLevel($this->getInt($prefix.'level', $data));
+		$this->setStatus($this->get($prefix.'status', $data));
+		$this->setDisplayName($this->get($prefix.'cached_name', $data));
+		$this->setNotes($this->getArray($prefix.'note', $data));
+		$this->setContactId($this->get($prefix.'contact_id', $data));
+		$this->setContactMeta($this->get($prefix.'contact_meta', $data));
+
+		$cachedUpdate = $this->get($prefix.'cached_update', $data);
 		if ($cachedUpdate !== '') {
 			$this->setDisplayUpdate(DateTime::createFromFormat('Y-m-d H:i:s', $cachedUpdate)->getTimestamp());
 		}
 
-		$joined = $this->get($prefix . 'joined', $data);
+		$joined = $this->get($prefix.'joined', $data);
 		if ($joined !== '') {
 			$this->setJoined(DateTime::createFromFormat('Y-m-d H:i:s', $joined)->getTimestamp());
 		}
@@ -924,7 +924,7 @@ 
 	public static function parseLevelInt(int $level): int {
 		if (!array_key_exists($level, self::$DEF_LEVEL)) {
 			$all = implode(', ', array_keys(self::$DEF_LEVEL));
-			throw new ParseMemberLevelException('Available levels: ' . $all, 121);
+			throw new ParseMemberLevelException('Available levels: '.$all, 121);
 		}
 
 		return $level;
@@ -943,7 +943,7 @@ 
 
 		if (!$level) {
 			$all = implode(', ', array_values(self::$DEF_LEVEL));
-			throw new ParseMemberLevelException('Available levels: ' . $all, 121);
+			throw new ParseMemberLevelException('Available levels: '.$all, 121);
 		}
 
 		return (int)$level;
@@ -964,7 +964,7 @@ 
 		$type = array_search($typeString, Member::$TYPE);
 		if ($type === false) {
 			$all = implode(', ', array_values(self::$TYPE));
-			throw new UserTypeNotFoundException('Available types: ' . $all);
+			throw new UserTypeNotFoundException('Available types: '.$all);
 		}
 
 		return (int)$type;

lib/Model/FederatedUser.php

Spacing +6 added lines, -6 removed lines

@@ -400,15 +400,15 @@
 	 * @throws FederatedUserNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new FederatedUserNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setUserId($this->get($prefix . 'user_id', $data));
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
-		$this->setDisplayName($this->get($prefix . 'cached_name', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setUserId($this->get($prefix.'user_id', $data));
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
+		$this->setDisplayName($this->get($prefix.'cached_name', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
 
 		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);
 

lib/Service/FederatedUserService.php

Spacing +3 added lines, -3 removed lines

@@ -394,7 +394,7 @@ 
 		if ($check) {
 			$user = $this->userManager->get($userId);
 			if ($user === null) {
-				throw new FederatedUserNotFoundException('user ' . $userId . ' not found');
+				throw new FederatedUserNotFoundException('user '.$userId.' not found');
 			}
 			$userId = $user->getUID();
 			$displayName = $user->getDisplayName();
@@ -852,7 +852,7 @@ 
 			$prefix = ($federatedUser->getUserType() === Member::TYPE_APP) ? 'app'
 				: Member::$TYPE[$federatedUser->getUserType()];
 
-			$circle->setName($prefix . ':' . $federatedUser->getUserId() . ':' . $id)
+			$circle->setName($prefix.':'.$federatedUser->getUserId().':'.$id)
 				   ->setDisplayName($federatedUser->getDisplayName())
 				   ->setSingleId($id)
 				   ->setSource($source);
@@ -976,7 +976,7 @@ 
 		$owner = $this->getCurrentApp();
 
 		$circle = new Circle();
-		$circle->setName('group:' . $groupId)
+		$circle->setName('group:'.$groupId)
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
 			   ->setSingleId($this->token(ManagedModel::ID_LENGTH))
 			   ->setSource(Member::TYPE_GROUP);

lib/Service/CircleService.php

Spacing +2 added lines, -2 removed lines

@@ -496,7 +496,7 @@ 
 
 		$i = 1;
 		while (true) {
-			$testDisplayName = $baseDisplayName . (($i > 1) ? ' (' . $i . ')' : '');
+			$testDisplayName = $baseDisplayName.(($i > 1) ? ' ('.$i.')' : '');
 			$test = new Circle();
 			$test->setDisplayName($testDisplayName);
 
@@ -529,7 +529,7 @@ 
 
 		$i = 1;
 		while (true) {
-			$testSanitizedName = $baseSanitizedName . (($i > 1) ? ' (' . $i . ')' : '');
+			$testSanitizedName = $baseSanitizedName.(($i > 1) ? ' ('.$i.')' : '');
 
 			$test = new Circle();
 			$test->setSanitizedName($testSanitizedName);

lib/Listeners/Examples/ExampleRequestingCircleMember.php

Spacing +4 added lines, -4 removed lines

@@ -91,11 +91,11 @@
 
 		$circle = $event->getCircle();
 		$member = $event->getMember();
-		$info .= 'circleId: ' . $circle->getSingleId() . '; userId: ' . $member->getUserId() . '; userType: '
-				 . Member::$TYPE[$member->getUserType()] . '; singleId: ' . $member->getSingleId()
-				 . '; memberId: ' . $member->getId() . '; isLocal: ' . json_encode($member->isLocal()) . '; ';
+		$info .= 'circleId: '.$circle->getSingleId().'; userId: '.$member->getUserId().'; userType: '
+				 . Member::$TYPE[$member->getUserType()].'; singleId: '.$member->getSingleId()
+				 . '; memberId: '.$member->getId().'; isLocal: '.json_encode($member->isLocal()).'; ';
 
-		$this->log(3, $prefix . $info);
+		$this->log(3, $prefix.$info);
 	}
 
 }

lib/Service/SyncService.php

Spacing +3 added lines, -3 removed lines

@@ -250,7 +250,7 @@ 
 	 * @throws SingleCircleNotFoundException
 	 */
 	public function syncNextcloudUser(string $userId): FederatedUser {
-		$this->outputService->output('Syncing Nextcloud User \'' . $userId . '\'', true);
+		$this->outputService->output('Syncing Nextcloud User \''.$userId.'\'', true);
 
 		return $this->federatedUserService->getLocalFederatedUser($userId);
 	}
@@ -294,7 +294,7 @@ 
 	 * @throws RequestBuilderException
 	 */
 	public function syncNextcloudGroup(string $groupId): Circle {
-		$this->outputService->output('Syncing Nextcloud Group \'' . $groupId . '\'', true);
+		$this->outputService->output('Syncing Nextcloud Group \''.$groupId.'\'', true);
 
 		$circle = $this->federatedUserService->getGroupCircle($groupId);
 		$group = $this->groupManager->get($groupId);
@@ -363,7 +363,7 @@ 
 	 */
 	public function groupDeleted(string $groupId): void {
 		$circle = new Circle();
-		$circle->setName('group:' . $groupId)
+		$circle->setName('group:'.$groupId)
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
 			   ->setSource(Member::TYPE_GROUP);
 

lib/Service/OutputService.php

Spacing +3 added lines, -3 removed lines

@@ -82,14 +82,14 @@
 	 */
 	public function output(string $message, bool $advance = false): void {
 		if (!is_null($this->occOutput)) {
-			$this->occOutput->writeln((($advance) ? '+' : '-') . ' ' . $message);
+			$this->occOutput->writeln((($advance) ? '+' : '-').' '.$message);
 		}
 
 		if (!is_null($this->migrationOutput)) {
 			if ($advance) {
-				$this->migrationOutput->advance(1, '(Circles) ' . $message);
+				$this->migrationOutput->advance(1, '(Circles) '.$message);
 			} else {
-				$this->migrationOutput->info('(Circles) ' . $message);
+				$this->migrationOutput->info('(Circles) '.$message);
 			}
 		}
 	}

lib/Command/CirclesList.php

Spacing +1 added lines, -1 removed lines

@@ -226,7 +226,7 @@
 					Circle::$DEF_SOURCE[$circle->getSource()],
 					$this->cut($displayName ? $owner->getDisplayName() : $owner->getUserId(), 40),
 					$this->configService->displayInstance($owner->getInstance()),
-					$circle->getPopulation() . '/' . $this->getInt(
+					$circle->getPopulation().'/'.$this->getInt(
 						'members_limit', $circle->getSettings(), -1
 					)
 				]

lib/Command/CirclesMaintenance.php

Spacing +3 added lines, -3 removed lines

@@ -118,7 +118,7 @@ 
 				'<error>WARNING! You are about to delete all data related to the Circles App!</error>'
 			);
 			$question = new ConfirmationQuestion(
-				'<comment>Do you really want to ' . $action . ' Circles ?</comment> (y/N) ', false,
+				'<comment>Do you really want to '.$action.' Circles ?</comment> (y/N) ', false,
 				'/^(y|Y)/i'
 			);
 
@@ -133,7 +133,7 @@ 
 			$output->writeln('<error>WARNING! This operation is not reversible.</error>');
 			
 			$question = new Question(
-				'<comment>Please confirm this destructive operation by typing \'' . $action
+				'<comment>Please confirm this destructive operation by typing \''.$action
 				. '\'</comment>: ', ''
 			);
 
@@ -150,7 +150,7 @@ 
 				$this->coreQueryBuilder->uninstall();
 			}
 
-			$output->writeln('<info>' . $action . ' done</info>');
+			$output->writeln('<info>'.$action.' done</info>');
 
 			return 0;
 		}