nextcloud / circles

lib/Command/CirclesCheck.php

Spacing +21 added lines, -21 removed lines

@@ -173,7 +173,7 @@ 
 			throw new Exception('Please specify a --type for the test');
 		}
 		if ($test !== '' && !in_array($type, self::$checks)) {
-			throw new Exception('Unknown type: ' . implode(', ', self::$checks));
+			throw new Exception('Unknown type: '.implode(', ', self::$checks));
 		}
 
 //		$this->configService->setAppValue(ConfigService::TEST_NC_BASE, $test);
@@ -278,7 +278,7 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('* testing current address: ' . $test);
+		$output->writeln('* testing current address: '.$test);
 
 		try {
 			$this->setupLoopback($input, $output, $test);
@@ -314,8 +314,8 @@ 
 				continue;
 			}
 
-			$loopback = $scheme . '://' . $cloudId;
-			$output->write('* testing address: ' . $loopback . ' ');
+			$loopback = $scheme.'://'.$cloudId;
+			$output->write('* testing address: '.$loopback.' ');
 
 			if ($this->testLoopback($input, $output, $loopback)) {
 				$output->writeln('* <info>Loopback</info> address looks good');
@@ -385,9 +385,9 @@ 
 		$test = new FederatedEvent(LoopbackTest::class);
 		$this->federatedEventService->newEvent($test);
 
-		$output->writeln('<info>' . $test->getWrapperToken() . '</info>');
+		$output->writeln('<info>'.$test->getWrapperToken().'</info>');
 
-		$output->writeln('- Waiting for async process to finish (' . $this->delay . 's)');
+		$output->writeln('- Waiting for async process to finish ('.$this->delay.'s)');
 		sleep($this->delay);
 
 		$output->write('- Checking status on FederatedEvent ');
@@ -401,18 +401,18 @@ 
 
 		$checkVerify = $wrapper->getEvent()->getData()->gInt('verify');
 		if ($checkVerify === LoopbackTest::VERIFY) {
-			$output->write('<info>verify=' . $checkVerify . '</info> ');
+			$output->write('<info>verify='.$checkVerify.'</info> ');
 		} else {
-			$output->writeln('<error>verify=' . $checkVerify . '</error>');
+			$output->writeln('<error>verify='.$checkVerify.'</error>');
 
 			return false;
 		}
 
 		$checkManage = $wrapper->getResult()->gInt('manage');
 		if ($checkManage === LoopbackTest::MANAGE) {
-			$output->write('<info>manage=' . $checkManage . '</info> ');
+			$output->write('<info>manage='.$checkManage.'</info> ');
 		} else {
-			$output->writeln('<error>manage=' . $checkManage . '</error>');
+			$output->writeln('<error>manage='.$checkManage.'</error>');
 
 			return false;
 		}
@@ -434,7 +434,7 @@ 
 		[$scheme, $cloudId] = $this->parseAddress($loopback);
 
 		$question = new ConfirmationQuestion(
-			'- Do you want to save <info>'. $loopback . '</info> as your <info>loopback</info> address ? (y/N) ', false, '/^(y|Y)/i'
+			'- Do you want to save <info>'.$loopback.'</info> as your <info>loopback</info> address ? (y/N) ', false, '/^(y|Y)/i'
 		);
 
 		$helper = $this->getHelper('question');
@@ -447,7 +447,7 @@ 
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_SCHEME, $scheme);
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_ID, $cloudId);
 		$output->writeln(
-			'- Address <info>' . $loopback . '</info> is now used as <info>loopback</info>'
+			'- Address <info>'.$loopback.'</info> is now used as <info>loopback</info>'
 		);
 
 	}
@@ -518,7 +518,7 @@ 
 				continue;
 			}
 
-			$frontal = $scheme . '://' . $cloudId;
+			$frontal = $scheme.'://'.$cloudId;
 			break;
 		}
 
@@ -532,13 +532,13 @@ 
 				'You will need to run this <info>curl</info> command from a remote terminal and paste its result: '
 			);
 			$output->writeln(
-				'     curl ' . $frontal . '/.well-known/webfinger?resource=http://nextcloud.com/'
+				'     curl '.$frontal.'/.well-known/webfinger?resource=http://nextcloud.com/'
 			);
 
 			$question = new Question('result: ', '');
 			$pasteWebfinger = $helper->ask($input, $output, $question);
 
-			echo '__ ' . $pasteWebfinger;
+			echo '__ '.$pasteWebfinger;
 
 			$output->writeln('TESTING !!');
 			$output->writeln('TESTING !!');
@@ -661,7 +661,7 @@ 
 		$this->configService->configureLoopbackRequest($request, $route, $args);
 		$request->setFollowLocation(false);
 
-		$output->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': ');
+		$output->write('- '.$type.' request on '.$request->getCompleteUrl().': ');
 
 		try {
 			$this->doRequest($request);
@@ -672,7 +672,7 @@ 
 				$color = 'info';
 			}
 
-			$output->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>');
+			$output->writeln('<'.$color.'>'.$result->getStatusCode().'</'.$color.'>');
 			if ($result->getStatusCode() === 200) {
 				return true;
 			}
@@ -696,7 +696,7 @@ 
 
 		$output->writeln('');
 		$output->writeln(
-			'The address <info>' . $address . '</info> seems to reach your local Nextcloud.'
+			'The address <info>'.$address.'</info> seems to reach your local Nextcloud.'
 		);
 
 		$helper = $this->getHelper('question');
@@ -713,8 +713,8 @@ 
 
 		$this->configService->setAppValue(ConfigService::FORCE_NC_BASE, $address);
 		$output->writeln(
-			'New configuration <info>' . Application::APP_ID . '.' . ConfigService::FORCE_NC_BASE . '=\''
-			. $address . '\'</info> stored in database'
+			'New configuration <info>'.Application::APP_ID.'.'.ConfigService::FORCE_NC_BASE.'=\''
+			. $address.'\'</info> stored in database'
 		);
 	}
 
@@ -735,7 +735,7 @@ 
 		}
 
 		if (!is_null($cloudIdPort)) {
-			$cloudId = $cloudId . ':' . $cloudIdPort;
+			$cloudId = $cloudId.':'.$cloudIdPort;
 		}
 
 		return [$scheme, $cloudId];

lib/Migration/Version0022Date20220526111723.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 		$tables = $schema->getTables();
 		foreach ($tables as $table) {
 			$tableName = $table->getName();
-			if (substr($tableName, 0, 8 + strlen($prefix)) === $prefix . 'circles_') {
+			if (substr($tableName, 0, 8 + strlen($prefix)) === $prefix.'circles_') {
 				$tableName = substr($tableName, strlen($prefix));
 				$schema->dropTable($tableName);
 			}

lib/Listeners/Examples/ExampleMembershipsRemoved.php

Spacing +5 added lines, -5 removed lines

@@ -104,16 +104,16 @@
 				} catch (Exception $e) {
 					$this->e($e);
 
-					return $membership->getSingleId() . ' is not ' . $inheritance . ' of '
-						   . $membership->getCircleId() . ' anymore';
+					return $membership->getSingleId().' is not '.$inheritance.' of '
+						   . $membership->getCircleId().' anymore';
 				}
 
-				return $federatedUser->getUserId() . ' (' . Member::$TYPE[$federatedUser->getUserType()]
-					   . ') is not ' . $inheritance . ' of ' . $membership->getCircleId() . ' anymore';
+				return $federatedUser->getUserId().' ('.Member::$TYPE[$federatedUser->getUserType()]
+					   . ') is not '.$inheritance.' of '.$membership->getCircleId().' anymore';
 			}, $event->getMemberships()
 		);
 
-		$this->log(3, $prefix . implode('. ', $memberships));
+		$this->log(3, $prefix.implode('. ', $memberships));
 	}
 
 }

lib/Listeners/Examples/ExampleMembershipsCreated.php

Spacing +4 added lines, -4 removed lines

@@ -104,16 +104,16 @@
 				} catch (Exception $e) {
 					$this->e($e);
 
-					return $membership->getSingleId() . ' is now ' . $inheritance . ' of '
+					return $membership->getSingleId().' is now '.$inheritance.' of '
 						   . $membership->getCircleId();
 				}
 
-				return $federatedUser->getUserId() . ' (' . Member::$TYPE[$federatedUser->getUserType()]
-					   . ') is now ' . $inheritance . ' of ' . $membership->getCircleId();
+				return $federatedUser->getUserId().' ('.Member::$TYPE[$federatedUser->getUserType()]
+					   . ') is now '.$inheritance.' of '.$membership->getCircleId();
 			}, $event->getMemberships()
 		);
 
-		$this->log(3, $prefix . implode('. ', $memberships));
+		$this->log(3, $prefix.implode('. ', $memberships));
 	}
 
 }

lib/Listeners/Examples/ExampleCircleMemberAdded.php

Spacing +11 added lines, -11 removed lines

@@ -96,13 +96,13 @@ 
 			$circle = $event->getCircle();
 			$eventType = ($event->getType() === CircleGenericEvent::INVITED) ? 'invited' : 'joined';
 
-			$info = 'A new member have been added (' . $eventType . ') to a Circle. ';
+			$info = 'A new member have been added ('.$eventType.') to a Circle. ';
 
-			$info .= 'userId: ' . $member->getUserId() . '; userType: ' . Member::$TYPE[$member->getUserType(
+			$info .= 'userId: '.$member->getUserId().'; userType: '.Member::$TYPE[$member->getUserType(
 				)]
-					 . '; singleId: ' . $member->getSingleId() . '; memberId: ' . $member->getId()
-					 . '; isLocal: ' . json_encode($member->isLocal()) . '; level: '
-					 . Member::$DEF_LEVEL[$member->getLevel()] . '; ';
+					 . '; singleId: '.$member->getSingleId().'; memberId: '.$member->getId()
+					 . '; isLocal: '.json_encode($member->isLocal()).'; level: '
+					 . Member::$DEF_LEVEL[$member->getLevel()].'; ';
 
 			$memberships = array_map(
 				function(Membership $membership) {
@@ -111,22 +111,22 @@ 
 			);
 
 			$listMemberships = (count($memberships) > 0) ? implode(', ', $memberships) : 'none';
-			$info .= 'circleName: ' . $circle->getDisplayName() . '; circleId: ' . $circle->getSingleId()
-					 . '; Circle memberships: ' . $listMemberships . '.';
+			$info .= 'circleName: '.$circle->getDisplayName().'; circleId: '.$circle->getSingleId()
+					 . '; Circle memberships: '.$listMemberships.'.';
 
 			if ($member->getUserType() === Member::TYPE_CIRCLE) {
 				$basedOn = $member->getBasedOn();
 				$members = array_map(
 					function(Member $member) {
-						return $member->getUserId() . ' (' . Member::$TYPE[$member->getUserType()] . ')';
+						return $member->getUserId().' ('.Member::$TYPE[$member->getUserType()].')';
 					}, $basedOn->getInheritedMembers()
 				);
 
-				$info .= ' Member is a Circle (singleId: ' . $basedOn->getSingleId()
-						 . ') that contains those inherited members: ' . implode(', ', $members);
+				$info .= ' Member is a Circle (singleId: '.$basedOn->getSingleId()
+						 . ') that contains those inherited members: '.implode(', ', $members);
 			}
 
-			$this->log(3, $prefix . $info);
+			$this->log(3, $prefix.$info);
 		}
 	}
 

lib/Command/MembersList.php

Spacing +14 added lines, -15 removed lines

@@ -186,11 +186,11 @@ 
 			$this->federatedUserService->commandLineInitiator($initiator, $initiatorType, $circleId, true);
 			$circle = $this->circleService->getCircle($circleId);
 
-			$output->writeln('<info>Name</info>: ' . $circle->getName());
+			$output->writeln('<info>Name</info>: '.$circle->getName());
 			$owner = $circle->getOwner();
-			$output->writeln('<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance());
+			$output->writeln('<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance());
 			$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
-			$output->writeln('<info>Config</info>: ' . $type);
+			$output->writeln('<info>Config</info>: '.$type);
 			$output->writeln(' ');
 
 			$tree = new NC22TreeNode(null, new SimpleDataStore(['circle' => $circle]));
@@ -254,8 +254,7 @@ 
 					($this->input->getOption('display-name')) ?
 						$member->getBasedOn()->getDisplayName() : $member->getUserId(),
 					$this->configService->displayInstance($member->getInstance()),
-					($level > 0) ? Member::$DEF_LEVEL[$level] :
-						'(' . strtolower($member->getStatus()) . ')'
+					($level > 0) ? Member::$DEF_LEVEL[$level] : '('.strtolower($member->getStatus()).')'
 				]
 			);
 		}
@@ -414,18 +413,18 @@ 
 				$member = $data->gObj('member', Member::class);
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $member->getSingleId() . '</info>';
+					$line .= '<info>'.$member->getSingleId().'</info>';
 					if (!$this->configService->isLocalInstance($member->getInstance())) {
-						$line .= '@' . $member->getInstance();
+						$line .= '@'.$member->getInstance();
 					}
-					$line .= ' (' . Member::$DEF_LEVEL[$member->getLevel()] . ')';
+					$line .= ' ('.Member::$DEF_LEVEL[$member->getLevel()].')';
 
-					$line .= ' <info>MemberId</info>: ' . $member->getId();
+					$line .= ' <info>MemberId</info>: '.$member->getId();
 					$name = ($this->input->getOption('display-name')) ?
 						$member->getBasedOn()->getDisplayName() : $member->getUserId();
-					$line .= ' <info>Name</info>: ' . $name;
+					$line .= ' <info>Name</info>: '.$name;
 					$source = ($member->hasBasedOn()) ? $member->getBasedOn()->getSource() : '';
-					$line .= ' <info>Source</info>: ' . Circle::$DEF_SOURCE[$source];
+					$line .= ' <info>Source</info>: '.Circle::$DEF_SOURCE[$source];
 				}
 
 				if ($lineNumber === 2) {
@@ -437,16 +436,16 @@ 
 						return $line;
 					}
 					$owner = $circle->getOwner();
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance();
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance();
 					$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
-					$line .= ($type === '') ? '' : ' <info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : ' <info>Config</info>: '.$type;
 				}
 
 			} else {
 				if ($lineNumber === 1 && !is_null($circle)) {
-					$line .= '<info>' . $circle->getSingleId() . '</info>';
+					$line .= '<info>'.$circle->getSingleId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
 				}
 			}

lib/Model/Member.php

Spacing +19 added lines, -19 removed lines

@@ -717,29 +717,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->setNote($this->get($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->setNote($this->get($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());
 		}
@@ -813,7 +813,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;
@@ -832,7 +832,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;
@@ -853,7 +853,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/Db/MemberRequest.php

Spacing +6 added lines, -6 removed lines

@@ -221,8 +221,8 @@ 
 			$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $filter);
 		}
 
-		$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
-		$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');
+		$qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc');
+		$qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc');
 
 		return $this->getItemsFromRequest($qb);
 	}
@@ -246,8 +246,8 @@ 
 		$qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId);
 
 		$aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS);
-		$qb->orderBy($aliasMembership . '.inheritance_depth', 'asc')
-		   ->addGroupBy($aliasMembership . '.inheritance_depth');
+		$qb->orderBy($aliasMembership.'.inheritance_depth', 'asc')
+		   ->addGroupBy($aliasMembership.'.inheritance_depth');
 
 //		$qb->groupBy(CoreQueryBuilder::MEMBER . '.single_id');
 
@@ -285,7 +285,7 @@ 
 		$qb = $this->getMemberSelectSql();
 		$qb->limitToCircleId($circleId);
 
-		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance'));
+		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance'));
 
 		return array_map(
 			function(Member $member): string {
@@ -341,7 +341,7 @@ 
 	 */
 	public function searchFederatedUsers(string $needle): array {
 		$qb = $this->getMemberSelectSql();
-		$qb->searchInDBField('user_id', '%' . $needle . '%');
+		$qb->searchInDBField('user_id', '%'.$needle.'%');
 
 		return $this->getItemsFromRequest($qb, true);
 	}

lib/CirclesQueryHelper.php

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 		$circle = new Circle();
 		$circle->importFromDatabase(
 			$data,
-			CoreQueryBuilder::HELPER . '_' . CoreQueryBuilder::CIRCLE . '_'
+			CoreQueryBuilder::HELPER.'_'.CoreQueryBuilder::CIRCLE.'_'
 		);
 
 		return $circle;