nextcloud / circles

lib/Command/CirclesMemberships.php

Spacing +21 added lines, -21 removed lines

@@ -192,10 +192,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:');
@@ -204,14 +204,14 @@ 
 		if ($count === 0) {
 			$output->writeln('(database not updated)');
 		} else {
-			$output->writeln('(' . ((string)$count) . ' entries generated/updated in the database)');
+			$output->writeln('('.((string)$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()].')'
 			);
 		}
 
@@ -285,9 +285,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;
@@ -299,33 +299,33 @@ 
 				$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;
 			}
-		} catch (InvalidItemException|ItemNotFoundException|UnknownTypeException $e) {
+		} catch (InvalidItemException | ItemNotFoundException | UnknownTypeException $e) {
 		}
 
 		return '';
@@ -380,6 +380,6 @@ 
 		$table->setRows($rows);
 		$table->render();
 
-		$output->writeln(((string)$count) . ' memberships updated');
+		$output->writeln(((string)$count).' memberships updated');
 	}
 }

tests/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -14,10 +14,10 @@
 	define('PHPUNIT_RUN', 1);
 }
 
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../../../lib/base.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
-require_once __DIR__ . '/../../../tests/autoload.php';
+require_once __DIR__.'/../../../tests/autoload.php';
 
 Server::get(IAppManager::class)->loadApp('circles');
 

lib/Command/CirclesMaintenance.php

Spacing +7 added lines, -7 removed lines

@@ -106,7 +106,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'
 			);
 
@@ -122,7 +122,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>: ', ''
 			);
 
@@ -140,7 +140,7 @@ 
 				$this->coreRequestBuilder->uninstall();
 			}
 
-			$output->writeln('<info>' . $action . ' done</info>');
+			$output->writeln('<info>'.$action.' done</info>');
 
 			return 0;
 		}
@@ -153,7 +153,7 @@ 
 				$this->maintenanceService->runMaintenance($i, $input->getOption('force-refresh'));
 			} catch (MaintenanceException $e) {
 				$this->logger->warning('issue while performing maintenance', ['level' => $i, ['exception' => $e]]);
-				$output->writeln('- <error>issue while performing maintenance</error> ' . $e->getMessage() . ' (more details in logs)');
+				$output->writeln('- <error>issue while performing maintenance</error> '.$e->getMessage().' (more details in logs)');
 			}
 		}
 
@@ -173,7 +173,7 @@ 
 		$federatedUser = $this->federatedUserService->getLocalFederatedUser($userId);
 		$displayName = $this->maintenanceService->updateDisplayName($federatedUser);
 		if ($displayName !== '') {
-			$output->writeln('Display name of ' . $federatedUser->getSingleId() . ' updated to ' . $displayName);
+			$output->writeln('Display name of '.$federatedUser->getSingleId().' updated to '.$displayName);
 		}
 
 		return 0;
@@ -188,7 +188,7 @@ 
 			try {
 				$this->refreshSingleDisplayName($row['uid'], $output);
 			} catch (Exception $e) {
-				$output->writeln(get_class($e) . ' while trying to update display name of ' . $row['uid']);
+				$output->writeln(get_class($e).' while trying to update display name of '.$row['uid']);
 			}
 		}
 	}
@@ -201,7 +201,7 @@ 
 			try {
 				$this->refreshSingleDisplayName($user['name'], $output);
 			} catch (Exception $e) {
-				$output->writeln(get_class($e) . ' while trying to update display name of ' . $user['name']);
+				$output->writeln(get_class($e).' while trying to update display name of '.$user['name']);
 			}
 		}
 	}

lib/Tools/ActivityPub/NCSignature.php

Spacing +9 added lines, -9 removed lines

@@ -197,8 +197,8 @@ 
 			throw new SignatureException('missing elements in \'headers\'');
 		}
 
-		$target = strtolower($request->getMethod()) . ' ' . urldecode($request->getRequestUri());
-		$estimated = ['(request-target): ' . $target];
+		$target = strtolower($request->getMethod()).' '.urldecode($request->getRequestUri());
+		$estimated = ['(request-target): '.$target];
 
 		foreach ($headers as $key) {
 			$value = $request->getHeader($key);
@@ -209,7 +209,7 @@ 
 				throw new SignatureException('empty elements in \'headers\'');
 			}
 
-			$estimated[] = $key . ': ' . $value;
+			$estimated[] = $key.': '.$value;
 		}
 		$signedRequest->setClearSignature(implode("\n", $estimated));
 	}
@@ -281,7 +281,7 @@ 
 		$request = $signedRequest->getOutgoingRequest();
 
 		$data = new SimpleDataStore();
-		$data->s('(request-target)', NCRequest::method($request->getType()) . ' ' . $request->getPath())
+		$data->s('(request-target)', NCRequest::method($request->getType()).' '.$request->getPath())
 			->sInt('content-length', strlen($signedRequest->getBody()))
 			->s('date', gmdate($this->dateHeader))
 			->s('digest', $signedRequest->getDigest())
@@ -300,7 +300,7 @@ 
 		foreach ($data->keys() as $element) {
 			try {
 				$value = $data->gItem($element);
-				$signing[] = $element . ': ' . $value;
+				$signing[] = $element.': '.$value;
 				if ($element !== '(request-target)') {
 					$signedRequest->getOutgoingRequest()->addHeader($element, $value);
 				}
@@ -333,10 +333,10 @@ 
 		$headers = array_diff($signedRequest->getSignatureHeader()->keys(), ['(request-target)']);
 		$signatory = $signedRequest->getSignatory();
 		$signatureElements = [
-			'keyId="' . $signatory->getKeyId() . '"',
-			'algorithm="' . $this->getChosenEncryption($signatory) . '"',
-			'headers="' . implode(' ', $headers) . '"',
-			'signature="' . $signedRequest->getSignedSignature() . '"'
+			'keyId="'.$signatory->getKeyId().'"',
+			'algorithm="'.$this->getChosenEncryption($signatory).'"',
+			'headers="'.implode(' ', $headers).'"',
+			'signature="'.$signedRequest->getSignedSignature().'"'
 		];
 
 		$signedRequest->getOutgoingRequest()->addHeader('Signature', implode(',', $signatureElements));

lib/Service/SendMailService.php

Spacing +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
 		// also the default footer contains a "Do not reply" which needs to be adjusted.
 		if ($initiatorEmail !== null) {
 			$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+			$emailTemplate->addFooter($instanceName.($this->defaults->getSlogan() !== '' ? ' - '.$this->defaults->getSlogan() : ''));
 		} else {
 			$emailTemplate->addFooter();
 		}

lib/Controller/TeamsDashboardController.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 					);
 					$resources = $resourceService->getAllTeamResources($circle->getSingleId());
 				} catch (\Exception $e) {
-					$this->logger->warning('Failed to fetch resources for circle ' . $circle->getSingleId() . ': ' . $e->getMessage());
+					$this->logger->warning('Failed to fetch resources for circle '.$circle->getSingleId().': '.$e->getMessage());
 				}
 				
 				$teams[] = [

lib/Service/TeamResourceService.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 					];
 					
 				} catch (\Exception $e) {
-					$this->logger->warning('Failed to process team resource: ' . $e->getMessage());
+					$this->logger->warning('Failed to process team resource: '.$e->getMessage());
 					continue;
 				}
 			}
@@ -65,7 +65,7 @@ 
 			return $resources;
 			
 		} catch (\Exception $e) {
-			$this->logger->error('Failed to fetch team resources: ' . $e->getMessage());
+			$this->logger->error('Failed to fetch team resources: '.$e->getMessage());
 			return [];
 		}
 	}

lib/Model/ShareWrapper.php

Spacing +20 added lines, -20 removed lines

@@ -467,7 +467,7 @@ 
 			$l10n = Server::get(IFactory::class)->get('circles');
 			$display = $l10n->t('%s (Team owned by %s)', [$display, $circle->getOwner()->getDisplayName()]);
 		} else {
-			$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';
+			$display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')';
 		}
 
 		$share->setSharedWithDisplayName($display);
@@ -560,25 +560,25 @@ 
 
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
 		$shareTime = new DateTime();
-		$shareTime->setTimestamp($this->getInt($prefix . 'stime', $data));
-
-		$this->setId($this->get($prefix . 'id', $data))
-			->setShareType($this->getInt($prefix . 'share_type', $data))
-			->setPermissions($this->getInt($prefix . 'permissions', $data))
-			->setItemType($this->get($prefix . 'item_type', $data))
-			->setItemSource($this->getInt($prefix . 'item_source', $data))
-			->setItemTarget($this->get($prefix . 'item_target', $data))
-			->setFileSource($this->getInt($prefix . 'file_source', $data))
-			->setFileTarget($this->get($prefix . 'file_target', $data))
-			->setSharedWith($this->get($prefix . 'share_with', $data))
-			->setSharedBy($this->get($prefix . 'uid_initiator', $data))
-			->setShareOwner($this->get($prefix . 'uid_owner', $data))
-			->setToken($this->get($prefix . 'token', $data))
+		$shareTime->setTimestamp($this->getInt($prefix.'stime', $data));
+
+		$this->setId($this->get($prefix.'id', $data))
+			->setShareType($this->getInt($prefix.'share_type', $data))
+			->setPermissions($this->getInt($prefix.'permissions', $data))
+			->setItemType($this->get($prefix.'item_type', $data))
+			->setItemSource($this->getInt($prefix.'item_source', $data))
+			->setItemTarget($this->get($prefix.'item_target', $data))
+			->setFileSource($this->getInt($prefix.'file_source', $data))
+			->setFileTarget($this->get($prefix.'file_target', $data))
+			->setSharedWith($this->get($prefix.'share_with', $data))
+			->setSharedBy($this->get($prefix.'uid_initiator', $data))
+			->setShareOwner($this->get($prefix.'uid_owner', $data))
+			->setToken($this->get($prefix.'token', $data))
 			->setShareTime($shareTime)
-			->setShareNote($this->get($prefix . 'note', $data));
+			->setShareNote($this->get($prefix.'note', $data));
 
 		try {
-			$expirationDate = $this->get($prefix . 'expiration', $data);
+			$expirationDate = $this->get($prefix.'expiration', $data);
 			if ($expirationDate !== '') {
 				$this->setExpirationDate(new DateTime($expirationDate));
 			}
@@ -594,9 +594,9 @@ 
 		//			$share->setPassword($this->get('password', $data, ''));
 		//		}
 
-		$this->setChildId($this->getInt($prefix . 'child_id', $data))
-			->setChildFileTarget($this->get($prefix . 'child_file_target', $data))
-			->setChildPermissions($this->getInt($prefix . 'child_permissions', $data))
+		$this->setChildId($this->getInt($prefix.'child_id', $data))
+			->setChildFileTarget($this->get($prefix.'child_file_target', $data))
+			->setChildPermissions($this->getInt($prefix.'child_permissions', $data))
 			->setProviderId(ShareByCircleProvider::IDENTIFIER)
 			->setStatus(Ishare::STATUS_ACCEPTED);
 

lib/Service/FederatedUserService.php

Spacing +6 added lines, -6 removed lines

@@ -511,7 +511,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');
 			}
 			$displayName = $this->userManager->getDisplayName($userId);
 		} else {
@@ -552,7 +552,7 @@ 
 		$federatedUser->setBasedOn(
 			(new Circle())->import([
 				'id' => $userSingleId,
-				'name' => 'user:' . $federatedUser->getUserId() . ':' . $userSingleId,
+				'name' => 'user:'.$federatedUser->getUserId().':'.$userSingleId,
 				'displayName' => $federatedUser->getDisplayName(),
 				'source' => 1,
 				'config' => 1,
@@ -1065,7 +1065,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);
@@ -1269,7 +1269,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);
@@ -1337,8 +1337,8 @@ 
 	 * @return string
 	 */
 	private function generateCacheKey(FederatedUser $federatedUser): string {
-		return $federatedUser->getInstance() . '#'
-			   . $federatedUser->getUserType() . '#'
+		return $federatedUser->getInstance().'#'
+			   . $federatedUser->getUserType().'#'
 			   . $federatedUser->getUserId();
 	}
 }