nextcloud / circles

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/Db/MemberRequest.php

Spacing +6 added lines, -6 removed lines

@@ -239,8 +239,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);
 	}
@@ -265,8 +265,8 @@ 
 		$qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId, $level);
 
 		$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');
 
 		return $this->getItemsFromRequest($qb);
 	}
@@ -308,7 +308,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 {
@@ -361,7 +361,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/Command/MembersList.php

Unused Use Statements -1 removed lines

@@ -32,7 +32,6 @@
 namespace OCA\Circles\Command;
 
 use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException;
 use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException;
 use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException;
 use ArtificialOwl\MySmallPhpTools\Exceptions\UnknownTypeException;

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]));
@@ -255,8 +255,7 @@ 
 						$member, $this->input->getOption('display-name')
 					),
 					$this->configService->displayInstance($member->getInstance()),
-					($level > 0) ? Member::$DEF_LEVEL[$level] :
-						'(' . strtolower($member->getStatus()) . ')',
+					($level > 0) ? Member::$DEF_LEVEL[$level] : '('.strtolower($member->getStatus()).')',
 					($member->hasInvitedBy()) ? $this->configService->displayFederatedUser(
 						$member->getInvitedBy(), $this->input->getOption('display-name')
 					) : 'Unknown'
@@ -418,19 +417,19 @@ 
 				$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>Name</info>: ' . $this->configService->displayFederatedUser(
+					$line .= ' <info>MemberId</info>: '.$member->getId();
+					$line .= ' <info>Name</info>: '.$this->configService->displayFederatedUser(
 							$member,
 							$this->input->getOption('display-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) {
@@ -442,16 +441,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/Handlers/WebfingerHandler.php

Unused Use Statements -2 removed lines

@@ -33,11 +33,9 @@
 
 
 use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\SignatureException;
 use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use OC\URLGenerator;
 use OCA\Circles\AppInfo\Application;
-use OCA\Circles\Exceptions\UnknownInterfaceException;
 use OCA\Circles\Service\ConfigService;
 use OCA\Circles\Service\InterfaceService;
 use OCA\Circles\Service\RemoteStreamService;

lib/Model/Federated/EventWrapper.php

Unused Use Statements -1 removed lines

@@ -37,7 +37,6 @@
 use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore;
 use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use JsonSerializable;
-use OCA\Circles\Exceptions\UnknownInterfaceException;
 
 
 /**

lib/Service/ConfigService.php

Spacing +6 added lines, -6 removed lines

@@ -186,7 +186,7 @@ 
 			return $value;
 		}
 
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
 			return $value;
 		}
 
@@ -440,7 +440,7 @@ 
 		}
 
 		if (array_key_exists('port', $loopback)) {
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
 		} else {
 			$loopbackCloudId = $loopback['host'];
 		}
@@ -469,12 +469,12 @@ 
 			$scheme = $this->getAppValue(self::LOOPBACK_CLOUD_SCHEME);
 		}
 
-		$base = $scheme . '://' . $instance;
+		$base = $scheme.'://'.$instance;
 		if ($route === '') {
 			return $base;
 		}
 
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
 	}
 
 
@@ -574,7 +574,7 @@ 
 	public function displayFederatedUser(IFederatedUser $federatedUser, bool $displayName = false): string {
 		$name = ($displayName) ? $federatedUser->getDisplayName() : $federatedUser->getUserId();
 
-		return $name . $this->displayInstance($federatedUser->getInstance(), true);
+		return $name.$this->displayInstance($federatedUser->getInstance(), true);
 	}
 
 	/**
@@ -588,7 +588,7 @@ 
 			return '';
 		}
 
-		return (($showAt) ? '@' : '') . $instance;
+		return (($showAt) ? '@' : '').$instance;
 	}
 
 

lib/Command/CirclesList.php

Spacing +1 added lines, -1 removed lines

@@ -224,7 +224,7 @@
 					Circle::$DEF_SOURCE[$circle->getSource()],
 					$displayName ? $owner->getDisplayName() : $owner->getUserId(),
 					$this->configService->displayInstance($owner->getInstance()),
-					$circle->getPopulation() . '/' . $this->getInt('members_limit', $circle->getSettings(), -1),
+					$circle->getPopulation().'/'.$this->getInt('members_limit', $circle->getSettings(), -1),
 					substr(str_replace("\n", ' ', $circle->getDescription()), 0, 30)
 				]
 			);

lib/Service/SyncService.php

Unused Use Statements -2 removed lines

@@ -50,7 +50,6 @@ 
 use OCA\Circles\Exceptions\GroupNotFoundException;
 use OCA\Circles\Exceptions\InitiatorNotConfirmedException;
 use OCA\Circles\Exceptions\InvalidIdException;
-use OCA\Circles\Exceptions\MemberNotFoundException;
 use OCA\Circles\Exceptions\MigrationException;
 use OCA\Circles\Exceptions\OwnerNotFoundException;
 use OCA\Circles\Exceptions\RemoteInstanceException;
@@ -59,7 +58,6 @@ 
 use OCA\Circles\Exceptions\RequestBuilderException;
 use OCA\Circles\Exceptions\SingleCircleNotFoundException;
 use OCA\Circles\Exceptions\UnknownRemoteException;
-use OCA\Circles\Exceptions\UserTypeNotFoundException;
 use OCA\Circles\FederatedItems\SingleMemberAdd;
 use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\Federated\FederatedEvent;

Spacing +5 added lines, -5 removed lines

@@ -398,7 +398,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);
 
@@ -703,7 +703,7 @@ 
 			while ($row = $cursor->fetch()) {
 				$data = new SimpleDataStore($row);
 
-				echo json_encode($data) . "\n";
+				echo json_encode($data)."\n";
 				$member = new Member();
 
 				$member->setCircleId($data->g('circle_id'))
@@ -765,14 +765,14 @@ 
 	 */
 	private 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/Migration/Migration.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 	 * @return string
 	 */
 	public function getName(): string {
-		return '(' . Application::APP_NAME . ') Migrating data from older version of the Circles App';
+		return '('.Application::APP_NAME.') Migrating data from older version of the Circles App';
 	}