nextcloud / circles

lib/Service/MembershipService.php

Spacing +3 added lines, -3 removed lines

@@ -250,7 +250,7 @@ 
 	 */
 	private function getChildrenMembers(string $id, array &$knownIds = []): array {
 		$singleIds = array_map(
-			function (Member $item): string {
+			function(Member $item): string {
 				return $item->getSingleId();
 			}, $this->memberRequest->getMembers($id)
 		);
@@ -274,7 +274,7 @@ 
 	 */
 	private function getChildrenMemberships(string $id, array &$knownIds = []): array {
 		$singleIds = array_map(
-			function (Membership $item): string {
+			function(Membership $item): string {
 				return $item->getSingleId();
 			}, $this->membershipRequest->getInherited($id)
 		);
@@ -320,7 +320,7 @@ 
 	 */
 	private function removeDeprecatedMemberships(array $memberships, array $known): array {
 		$circleIds = array_map(
-			function (Membership $membership): string {
+			function(Membership $membership): string {
 				return $membership->getCircleId();
 			}, $memberships
 		);

lib/Command/CirclesMemberships.php

Spacing +20 added lines, -20 removed lines

@@ -212,10 +212,10 @@ 
 //			return 0;
 //		}
 
-		$output->writeln('Id: <info>' . $federatedUser->getUserId() . '</info>');
-		$output->writeln('Instance: <info>' . $federatedUser->getInstance() . '</info>');
-		$output->writeln('Type: <info>' . Member::$TYPE[$federatedUser->getUserType()] . '</info>');
-		$output->writeln('SingleId: <info>' . $federatedUser->getSingleId() . '</info>');
+		$output->writeln('Id: <info>'.$federatedUser->getUserId().'</info>');
+		$output->writeln('Instance: <info>'.$federatedUser->getInstance().'</info>');
+		$output->writeln('Type: <info>'.Member::$TYPE[$federatedUser->getUserType()].'</info>');
+		$output->writeln('SingleId: <info>'.$federatedUser->getSingleId().'</info>');
 
 		$output->writeln('');
 		$output->writeln('Memberships:');
@@ -224,14 +224,14 @@ 
 		if ($count === 0) {
 			$output->writeln('(database not updated)');
 		} else {
-			$output->writeln('(' . $count . ' entries generated/updated in the database)');
+			$output->writeln('('.$count.' entries generated/updated in the database)');
 		}
 
 		foreach ($federatedUser->getMemberships() as $membership) {
 			$this->memberships[$membership->getCircleId()] = $membership;
 			$output->writeln(
-				'- <info>' . $membership->getCircleId() . '</info> ('
-				. Member::$DEF_LEVEL[$membership->getLevel()] . ')'
+				'- <info>'.$membership->getCircleId().'</info> ('
+				. Member::$DEF_LEVEL[$membership->getLevel()].')'
 			);
 		}
 
@@ -305,9 +305,9 @@ 
 				if ($lineNumber === 2) {
 					return '';
 				}
-				$line .= '<info>' . $federatedUser->getSingleId() . '</info>';
+				$line .= '<info>'.$federatedUser->getSingleId().'</info>';
 				if (!$this->configService->isLocalInstance($federatedUser->getInstance())) {
-					$line .= '@' . $federatedUser->getInstance();
+					$line .= '@'.$federatedUser->getInstance();
 				}
 
 				return $line;
@@ -319,28 +319,28 @@ 
 				$circle = $member->getCircle();
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $circle->getSingleId() . '</info>';
+					$line .= '<info>'.$circle->getSingleId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
-					$line .= ' (' . ($this->input->getOption('display-name') ?
-							$circle->getDisplayName() : $circle->getName()) . ')';
-					$line .= ' <info>MemberId</info>: ' . $member->getId();
-					$line .= ' <info>Level</info>: ' . Member::$DEF_LEVEL[$member->getLevel()];
+					$line .= ' ('.($this->input->getOption('display-name') ?
+							$circle->getDisplayName() : $circle->getName()).')';
+					$line .= ' <info>MemberId</info>: '.$member->getId();
+					$line .= ' <info>Level</info>: '.Member::$DEF_LEVEL[$member->getLevel()];
 
 					$knownMembership = $this->memberships[$member->getCircleId()];
 					if ($member->getLevel() !== $knownMembership->getLevel()) {
-						$line .= ' (' . Member::$DEF_LEVEL[$knownMembership->getLevel()] . ')';
+						$line .= ' ('.Member::$DEF_LEVEL[$knownMembership->getLevel()].')';
 					}
 				}
 				if ($lineNumber === 2) {
 					$owner = $circle->getOwner();
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance() . ' ';
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance().' ';
 					if ($owner->hasBasedOn()) {
-						$line .= '(' . Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()] . ') ';
+						$line .= '('.Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()].') ';
 					}
 					$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
-					$line .= ($type === '') ? '' : '<info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : '<info>Config</info>: '.$type;
 				}
 
 				return $line;
@@ -399,6 +399,6 @@ 
 			);
 		}
 
-		$output->writeln($count . ' memberships updated');
+		$output->writeln($count.' memberships updated');
 	}
 }

lib/Command/CirclesMaintenance.php

Spacing +3 added lines, -3 removed lines

@@ -117,7 +117,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'
 			);
 
@@ -132,7 +132,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>: ', ''
 			);
 
@@ -149,7 +149,7 @@ 
 				$this->coreRequestBuilder->uninstall();
 			}
 
-			$output->writeln('<info>' . $action . ' done</info>');
+			$output->writeln('<info>'.$action.' done</info>');
 
 			return 0;
 		}

tests/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 require_once __DIR__.'/../../../lib/base.php';
 require_once __DIR__.'/../vendor/autoload.php';
 
-\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT . '/tests/unit/', true);
+\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT.'/tests/unit/', true);
 
 \OC_App::loadApp('circles');
 

lib/Command/CirclesSetting.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
 				);
 			}
 

lib/Model/ShareToken.php

Spacing +8 added lines, -8 removed lines

@@ -281,17 +281,17 @@
 	 * @throws ShareTokenNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'token', $data) === '') {
+		if ($this->get($prefix.'token', $data) === '') {
 			throw new ShareTokenNotFoundException();
 		}
 
-		$this->setShareId($this->getInt($prefix . 'share_id', $data));
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setMemberId($this->get($prefix . 'member_id', $data));
-		$this->setToken($this->get($prefix . 'token', $data));
-		$this->setPassword($this->get($prefix . 'password', $data));
-		$this->setAccepted($this->getInt($prefix . 'accepted', $data, IShare::STATUS_PENDING));
+		$this->setShareId($this->getInt($prefix.'share_id', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setMemberId($this->get($prefix.'member_id', $data));
+		$this->setToken($this->get($prefix.'token', $data));
+		$this->setPassword($this->get($prefix.'password', $data));
+		$this->setAccepted($this->getInt($prefix.'accepted', $data, IShare::STATUS_PENDING));
 
 		return $this;
 	}

lib/Model/Membership.php

Spacing +9 added lines, -9 removed lines

@@ -302,18 +302,18 @@
 	 * @throws MembershipNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new MembershipNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
-		$this->setLevel($this->getInt($prefix . 'level', $data));
-		$this->setCircleConfig($this->getInt($prefix . 'circle_config', $data));
-		$this->setInheritanceFirst($this->get($prefix . 'inheritance_first', $data));
-		$this->setInheritanceLast($this->get($prefix . 'inheritance_last', $data));
-		$this->setInheritancePath($this->getArray($prefix . 'inheritance_path', $data));
-		$this->setInheritanceDepth($this->getInt($prefix . 'inheritance_depth', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
+		$this->setLevel($this->getInt($prefix.'level', $data));
+		$this->setCircleConfig($this->getInt($prefix.'circle_config', $data));
+		$this->setInheritanceFirst($this->get($prefix.'inheritance_first', $data));
+		$this->setInheritanceLast($this->get($prefix.'inheritance_last', $data));
+		$this->setInheritancePath($this->getArray($prefix.'inheritance_path', $data));
+		$this->setInheritanceDepth($this->getInt($prefix.'inheritance_depth', $data));
 
 		return $this;
 	}

lib/Model/Member.php

Spacing +19 added lines, -19 removed lines

@@ -848,29 +848,29 @@ 
 	 * @throws MemberNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		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());
 		}
@@ -961,7 +961,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;
@@ -980,7 +980,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;
@@ -1001,7 +1001,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

@@ -418,15 +418,15 @@
 	 * @throws FederatedUserNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		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);