nextcloud / circles

lib/Command/CirclesConfig.php

Spacing +4 added lines, -4 removed lines

@@ -155,7 +155,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()
 				);
 			}
 
@@ -189,8 +189,8 @@ 
 			$value = array_search(strtoupper($item), $valid);
 			if (!$value) {
 				throw new InvalidArgumentException(
-					'Invalid config \'' . $item . '\'. Available values: '
-					. implode(', ', array_values($valid)) . '. '
+					'Invalid config \''.$item.'\'. Available values: '
+					. implode(', ', array_values($valid)).'. '
 					. 'To disable a config, start the value with an underscore'
 				);
 			}
@@ -219,7 +219,7 @@ 
 
 		array_walk(
 			$listing,
-			function (string &$v): void {
+			function(string &$v): void {
 				[, $long] = explode('|', $v);
 				$v = strtoupper(str_replace(' ', '', $long));
 			}

lib/Service/FederatedEventService.php

Spacing +5 added lines, -5 removed lines

@@ -245,16 +245,16 @@ 
 		try {
 			$test = new ReflectionClass($class);
 		} catch (ReflectionException $e) {
-			throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage());
+			throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage());
 		}
 
 		if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) {
-			throw new FederatedEventException($class . ' does not implements IFederatedItem');
+			throw new FederatedEventException($class.' does not implements IFederatedItem');
 		}
 
 		$item = OC::$server->get($class);
 		if (!($item instanceof IFederatedItem)) {
-			throw new FederatedEventException($class . ' not an IFederatedItem');
+			throw new FederatedEventException($class.' not an IFederatedItem');
 		}
 
 		if ($item instanceof IFederatedItemHighSeverity) {
@@ -450,7 +450,7 @@ 
 			$knownInstances = $this->memberRequest->getMemberInstances($circle->getSingleId());
 			$instances = array_filter(
 				array_map(
-					function (RemoteInstance $instance) use ($knownInstances) {
+					function(RemoteInstance $instance) use ($knownInstances) {
 						if (!in_array($instance->getInstance(), $knownInstances)) {
 							return null;
 						}
@@ -465,7 +465,7 @@ 
 		if ($event->hasMember()
 			&& !$this->configService->isLocalInstance($event->getMember()->getInstance())) {
 			$currentInstances = array_map(
-				function (RemoteInstance $instance): string {
+				function(RemoteInstance $instance): string {
 					return $instance->getInstance();
 				}, $instances
 			);

lib/Service/MemberService.php

Spacing +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 		}
 
 		$members = array_map(
-			function (FederatedUser $federatedUser) use ($patron) {
+			function(FederatedUser $federatedUser) use ($patron) {
 				$member = new Member();
 				$member->importFromIFederatedUser($federatedUser);
 				$member->setInvitedBy($patron);

lib/Service/EventWrapperService.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
 	 */
 	private function getFailedEvents(array $retryRange): array {
 		$token = array_map(
-			function (EventWrapper $event): string {
+			function(EventWrapper $event): string {
 				return $event->getToken();
 			}, $this->eventWrapperRequest->getFailedEvents($retryRange)
 		);

lib/Circles/FileSharingBroadcaster.php

Spacing +13 added lines, -13 removed lines

@@ -136,7 +136,7 @@ 
 			$this->miscService = OC::$server->query(MiscService::class);
 		} catch (QueryException $e) {
 			OC::$server->getLogger()
-					   ->log(1, 'Circles: cannot init FileSharingBroadcaster - ' . $e->getMessage());
+					   ->log(1, 'Circles: cannot init FileSharingBroadcaster - '.$e->getMessage());
 		}
 
 		try {
@@ -281,7 +281,7 @@ 
 
 		$allShares = $this->fileSharesRequest->getSharesForCircle($member->getCircleId());
 		$knownShares = array_map(
-			function (SharesToken $shareToken) {
+			function(SharesToken $shareToken) {
 				return $shareToken->getShareId();
 			},
 			$this->tokensRequest->getTokensFromMember($member)
@@ -328,7 +328,7 @@ 
 	 * @throws IllegalIDChangeException
 	 */
 	private function generateShare($data): IShare {
-		$this->logger->log(0, 'Regenerate shares from payload: ' . json_encode($data));
+		$this->logger->log(0, 'Regenerate shares from payload: '.json_encode($data));
 
 		$share = new Share($this->rootFolder, $this->userManager);
 		$share->setId($data['id']);
@@ -421,7 +421,7 @@ 
 			$this->sendPasswordByMail($share, $displayName, $email, $password);
 		} catch (Exception $e) {
 			OC::$server->getLogger()
-					   ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
+					   ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
 		}
 	}
 
@@ -439,8 +439,8 @@ 
 		$message = $this->mailer->createMessage();
 
 		$this->logger->log(
-			0, "Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
-			   . ' - link: ' . $link
+			0, "Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
+			   . ' - link: '.$link
 		);
 
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -479,7 +479,7 @@ 
 
 		$message = $this->mailer->createMessage();
 
-		$this->logger->log(0, "Sending password mail to circle '" . $circleName . "': " . $email);
+		$this->logger->log(0, "Sending password mail to circle '".$circleName."': ".$email);
 
 		$filename = $share->getNode()
 						  ->getName();
@@ -534,7 +534,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($initiatorEmailAddress !== null) {
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}
@@ -569,7 +569,7 @@ 
 		$emailTemplate->addHeader();
 		$emailTemplate->addHeading($subject, false);
 		$emailTemplate->addBodyText(
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
 				$this->l10n->t('Click the button below to open it.')
 			), $text
 		);
@@ -615,7 +615,7 @@ 
 			$this->sendMailExistingShares($template, $author->getCachedName(), $recipient);
 			$this->sendPasswordExistingShares($author, $recipient, $password);
 		} catch (Exception $e) {
-			$this->logger->log(2, 'Failed to send mail about existing share ' . $e->getMessage());
+			$this->logger->log(2, 'Failed to send mail about existing share '.$e->getMessage());
 		}
 	}
 
@@ -638,7 +638,7 @@ 
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
 
-		$this->logger->log(0, "Sending password mail about existing files to '" . $email . "'");
+		$this->logger->log(0, "Sending password mail about existing files to '".$email."'");
 
 		$plainBodyPart = $this->l10n->t(
 			"%1\$s shared multiple files with you.\nYou should have already received a separate email with a link to access them.\n",
@@ -680,7 +680,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($authorEmail !== null) {
 			$message->setReplyTo([$authorEmail => $authorName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}
@@ -725,7 +725,7 @@ 
 	 */
 	protected function generateMailExitingShares($author, $circleName) {
 		$this->logger->log(
-			0, "Generating mail about existing share mail from '" . $author . "' in "
+			0, "Generating mail about existing share mail from '".$author."' in "
 			   . $circleName
 		);
 

lib/Listeners/Examples/ExampleAddingCircleMember.php

Spacing +13 added lines, -13 removed lines

@@ -85,35 +85,35 @@
 
 		$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()]
-				 . '; singleId: ' . $member->getSingleId() . '; memberId: ' . $member->getId()
-				 . '; isLocal: ' . json_encode($member->isLocal()) . '; level: '
-				 . Member::$DEF_LEVEL[$member->getLevel()] . '; ';
+		$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()].'; ';
 
 		$memberships = array_map(
-			function (Membership $membership) {
+			function(Membership $membership) {
 				return $membership->getCircleId();
 			}, $circle->getMemberships()
 		);
 
 		$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()] . ')';
+				function(Member $member) {
+					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/Listeners/Examples/ExampleMembershipsRemoved.php

Spacing +6 added lines, -6 removed lines

@@ -92,7 +92,7 @@ 
 		$prefix = '[Example Event] (ExampleMembershipsRemoved) ';
 
 		$memberships = array_map(
-			function (Membership $membership) {
+			function(Membership $membership) {
 				$inheritance = ($membership->getInheritanceDepth() > 1) ?
 					'an inherited member' : 'a direct member';
 				try {
@@ -100,15 +100,15 @@ 
 				} 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 +5 added lines, -5 removed lines

@@ -92,7 +92,7 @@ 
 		$prefix = '[Example Event] (ExampleMembershipsCreated) ';
 
 		$memberships = array_map(
-			function (Membership $membership) {
+			function(Membership $membership) {
 				$inheritance = ($membership->getInheritanceDepth() > 1) ?
 					'an inherited member' : 'a direct member';
 				try {
@@ -100,15 +100,15 @@ 
 				} 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/Model/GlobalScale/GSShare.php

Spacing +2 added lines, -2 removed lines

@@ -152,7 +152,7 @@ 
 			return $mountPoint;
 		}
 
-		return '/' . $userId . '/files/' . ltrim($mountPoint, '/');
+		return '/'.$userId.'/files/'.ltrim($mountPoint, '/');
 	}
 
 	/**
@@ -291,7 +291,7 @@ 
 	public function toMount(string $userId, string $protocol = 'https'): array {
 		return [
 			'owner' => $this->getOwner(),
-			'remote' => $protocol . '://' . $this->getInstance(),
+			'remote' => $protocol.'://'.$this->getInstance(),
 			'token' => $this->getToken(),
 			'share_token' => $this->getToken(),
 			'password' => $this->getPassword(),