nextcloud / circles

lib/Controller/AdminController.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
 					throw new OCSException('works only from local instance', 404);
 				}
 
-				$userId = $currentUser->getUserId() . '/' . $userId;
+				$userId = $currentUser->getUserId().'/'.$userId;
 			}
 
 			$federatedUser = $this->federatedUserService->generateFederatedUser($userId, $type);

lib/Model/ShareWrapper.php

Spacing +19 added lines, -19 removed lines

@@ -648,9 +648,9 @@ 
 
 		$display = $circle->getDisplayName();
 		if ($circle->getSource() === Member::TYPE_CIRCLE) {
-			$display .= ' (Circle owned by ' . $circle->getOwner()->getDisplayName() . ')';
+			$display .= ' (Circle owned by '.$circle->getOwner()->getDisplayName().')';
 		} else {
-			$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';
+			$display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')';
 		}
 
 		$share->setSharedWithDisplayName($display);
@@ -740,20 +740,20 @@ 
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
 		$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);
 
 //		if (($password = $this->get('personal_password', $data, '')) !== '') {
@@ -762,9 +762,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/Model/ShareToken.php

Spacing +7 added lines, -7 removed lines

@@ -254,13 +254,13 @@
 	 * @return INC22QueryRow
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
-		$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/Service/CirclesService.php

Spacing +5 added lines, -5 removed lines

@@ -577,24 +577,24 @@
 		switch ($type) {
 			case DeprecatedCircle::CIRCLES_PERSONAL:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_ID, 'personal' . $ext)
+					$urlGen->imagePath(Application::APP_ID, 'personal'.$ext)
 				);
 			case DeprecatedCircle::CIRCLES_CLOSED:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_ID, 'closed' . $ext)
+					$urlGen->imagePath(Application::APP_ID, 'closed'.$ext)
 				);
 			case DeprecatedCircle::CIRCLES_SECRET:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_ID, 'secret' . $ext)
+					$urlGen->imagePath(Application::APP_ID, 'secret'.$ext)
 				);
 			case DeprecatedCircle::CIRCLES_PUBLIC:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_ID, 'circles' . $ext)
+					$urlGen->imagePath(Application::APP_ID, 'circles'.$ext)
 				);
 		}
 
 		return $urlGen->getAbsoluteURL(
-			$urlGen->imagePath(Application::APP_ID, 'circles' . $ext)
+			$urlGen->imagePath(Application::APP_ID, 'circles'.$ext)
 		);
 	}
 

tests/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 require_once __DIR__.'/../../../lib/base.php';
 require_once __DIR__.'/../vendor/autoload.php';
 
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
+\OC::$loader->addValidRoot(OC::$SERVERROOT.'/tests');
 \OC_App::loadApp('circles');

tests/unit/lib/Api/CirclesTest.php

Spacing +2 added lines, -2 removed lines

@@ -327,7 +327,7 @@ 
 			} catch (Exception $e) {
 				$this->assertSame(
 					true, false,
-					'should have returned a MemberIsNotModeratorException - ' . $e->getMessage()
+					'should have returned a MemberIsNotModeratorException - '.$e->getMessage()
 				);
 			}
 
@@ -341,7 +341,7 @@ 
 			} catch (Exception $e) {
 				$this->assertSame(
 					true, false,
-					'should have returned a MemberIsNotModeratorException - ' . $e->getMessage()
+					'should have returned a MemberIsNotModeratorException - '.$e->getMessage()
 				);
 			}
 		}

lib/Command/CirclesRemote.php

Spacing +30 added lines, -30 removed lines

@@ -173,19 +173,19 @@ 
 
 		$webfinger = $this->getWebfinger($host, Application::APP_SUBJECT);
 		if ($this->input->getOption('all')) {
-			$this->output->writeln('- Webfinger on <info>' . $host . '</info>');
+			$this->output->writeln('- Webfinger on <info>'.$host.'</info>');
 			$this->output->writeln(json_encode($webfinger, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 			$this->output->writeln('');
 		}
 
 		if ($this->input->getOption('all')) {
 			$circleLink = $this->extractLink(Application::APP_REL, $webfinger);
-			$this->output->writeln('- Information about Circles app on <info>' . $host . '</info>');
+			$this->output->writeln('- Information about Circles app on <info>'.$host.'</info>');
 			$this->output->writeln(json_encode($circleLink, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 			$this->output->writeln('');
 		}
 
-		$this->output->writeln('- Available services on <info>' . $host . '</info>');
+		$this->output->writeln('- Available services on <info>'.$host.'</info>');
 		foreach ($webfinger->getLinks() as $link) {
 			$app = $link->getProperty('name');
 			$ver = $link->getProperty('version');
@@ -193,14 +193,14 @@ 
 				$app .= ' ';
 			}
 			if ($ver !== '') {
-				$ver = 'v' . $ver;
+				$ver = 'v'.$ver;
 			}
 
-			$this->output->writeln(' * ' . $link->getRel() . ' ' . $app . $ver);
+			$this->output->writeln(' * '.$link->getRel().' '.$app.$ver);
 		}
 		$this->output->writeln('');
 
-		$this->output->writeln('- Resources related to Circles on <info>' . $host . '</info>');
+		$this->output->writeln('- Resources related to Circles on <info>'.$host.'</info>');
 		$resource = $this->getResourceData($host, Application::APP_SUBJECT, Application::APP_REL);
 		$this->output->writeln(json_encode($resource, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 		$this->output->writeln('');
@@ -208,7 +208,7 @@ 
 
 		$tempUid = $resource->g('uid');
 		$this->output->writeln(
-			'- Confirming UID=' . $tempUid . ' from parsed Signatory at <info>' . $host . '</info>'
+			'- Confirming UID='.$tempUid.' from parsed Signatory at <info>'.$host.'</info>'
 		);
 
 		try {
@@ -217,15 +217,15 @@ 
 			$this->output->writeln(' * No SignatureException: <info>Identity authed</info>');
 		} catch (SignatureException $e) {
 			$this->output->writeln(
-				'<error>' . $host . ' cannot auth its identity: ' . $e->getMessage() . '</error>'
+				'<error>'.$host.' cannot auth its identity: '.$e->getMessage().'</error>'
 			);
 
 			return;
 		}
 
-		$this->output->writeln(' * Found <info>' . $remoteSignatory->getUid() . '</info>');
+		$this->output->writeln(' * Found <info>'.$remoteSignatory->getUid().'</info>');
 		if ($remoteSignatory->getUid(true) !== $tempUid) {
-			$this->output->writeln('<error>looks like ' . $host . ' is faking its identity');
+			$this->output->writeln('<error>looks like '.$host.' is faking its identity');
 
 			return;
 		}
@@ -233,7 +233,7 @@ 
 		$this->output->writeln('');
 
 		$testUrl = $resource->g('test');
-		$this->output->writeln('- Testing signed payload on <info>' . $testUrl . '</info>');
+		$this->output->writeln('- Testing signed payload on <info>'.$testUrl.'</info>');
 
 		try {
 			$localSignatory = $this->remoteStreamService->getAppSignatory();
@@ -255,18 +255,18 @@ 
 		$this->output->writeln('');
 
 		$this->output->writeln(' * Clear Signature: ');
-		$this->output->writeln('<comment>' . $signedRequest->getClearSignature() . '</comment>');
+		$this->output->writeln('<comment>'.$signedRequest->getClearSignature().'</comment>');
 		$this->output->writeln('');
 
 		$this->output->writeln(' * Signed Signature (base64 encoded): ');
 		$this->output->writeln(
-			'<comment>' . base64_encode($signedRequest->getSignedSignature()) . '</comment>'
+			'<comment>'.base64_encode($signedRequest->getSignedSignature()).'</comment>'
 		);
 		$this->output->writeln('');
 
 		$result = $signedRequest->getOutgoingRequest()->getResult();
 		$code = $result->getStatusCode();
-		$this->output->writeln(' * Result: ' . (($code === 200) ? '<info>' . $code . '</info>' : $code));
+		$this->output->writeln(' * Result: '.(($code === 200) ? '<info>'.$code.'</info>' : $code));
 		$this->output->writeln(
 			json_encode(json_decode($result->getContent(), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
 		);
@@ -288,7 +288,7 @@ 
 				$stored = new RemoteInstance();
 				$this->remoteStreamService->confirmValidRemote($remoteSignatory, $stored);
 				$this->output->writeln(
-					'<info>The remote instance ' . $host
+					'<info>The remote instance '.$host
 					. ' is already known with this current identity</info>'
 				);
 
@@ -298,7 +298,7 @@ 
 
 				if ($remoteSignatory->getType() !== $stored->getType()) {
 					$this->output->writeln(
-						'- updating type from ' . $stored->getType() . ' to '
+						'- updating type from '.$stored->getType().' to '
 						. $remoteSignatory->getType()
 					);
 					$this->remoteStreamService->update(
@@ -308,7 +308,7 @@ 
 
 				if ($remoteSignatory->getInstance() !== $stored->getInstance()) {
 					$this->output->writeln(
-						'- updating host from ' . $stored->getInstance() . ' to '
+						'- updating host from '.$stored->getInstance().' to '
 						. $remoteSignatory->getInstance()
 					);
 					$this->remoteStreamService->update(
@@ -317,7 +317,7 @@ 
 				}
 				if ($remoteSignatory->getId() !== $stored->getId()) {
 					$this->output->writeln(
-						'- updating href/Id from ' . $stored->getId() . ' to '
+						'- updating href/Id from '.$stored->getId().' to '
 						. $remoteSignatory->getId()
 					);
 					$this->remoteStreamService->update($remoteSignatory, RemoteStreamService::UPDATE_HREF);
@@ -341,10 +341,10 @@ 
 		$helper = $this->getHelper('question');
 
 		$this->output->writeln(
-			'The remote instance <info>' . $remoteSignatory->getInstance() . '</info> looks good.'
+			'The remote instance <info>'.$remoteSignatory->getInstance().'</info> looks good.'
 		);
 		$question = new ConfirmationQuestion(
-			'Would you like to identify this remote instance as \'<comment>' . $remoteSignatory->getType()
+			'Would you like to identify this remote instance as \'<comment>'.$remoteSignatory->getType()
 			. '</comment>\' using interface \'<comment>'
 			. InterfaceService::$LIST_IFACE[$remoteSignatory->getInterface()]
 			. '</comment>\' ? (y/N) ',
@@ -372,7 +372,7 @@ 
 		$helper = $this->getHelper('question');
 
 		$this->output->writeln(
-			'The remote instance <info>' . $remoteSignatory->getInstance()
+			'The remote instance <info>'.$remoteSignatory->getInstance()
 			. '</info> is known but <error>its identity has changed.</error>'
 		);
 		$this->output->writeln(
@@ -430,7 +430,7 @@ 
 	private function verifyGSInstances(): void {
 		$instances = $this->globalScaleService->getGlobalScaleInstances();
 		$known = array_map(
-			function (RemoteInstance $instance): string {
+			function(RemoteInstance $instance): string {
 				return $instance->getInstance();
 			}, $this->remoteRequest->getFromType(RemoteInstance::TYPE_GLOBALSCALE)
 		);
@@ -450,7 +450,7 @@ 
 			return;
 		}
 
-		$this->output->write('Adding <comment>' . $instance . '</comment>: ');
+		$this->output->write('Adding <comment>'.$instance.'</comment>: ');
 		try {
 			$this->remoteStreamService->addRemoteInstance(
 				$instance,
@@ -460,8 +460,8 @@ 
 			);
 			$this->output->writeln('<info>ok</info>');
 		} catch (Exception $e) {
-			$msg = ($e->getMessage() === '') ? '' : ' (' . $e->getMessage() . ')';
-			$this->output->writeln('<error>' . get_class($e) . $msg . '</error>');
+			$msg = ($e->getMessage() === '') ? '' : ' ('.$e->getMessage().')';
+			$this->output->writeln('<error>'.get_class($e).$msg.'</error>');
 		}
 	}
 
@@ -479,12 +479,12 @@ 
 			try {
 				$current = $this->remoteStreamService->retrieveRemoteInstance($instance->getInstance());
 				if ($current->getUid(true) === $instance->getUid(true)) {
-					$currentUid = '<info>' . $current->getUid(true) . '</info>';
+					$currentUid = '<info>'.$current->getUid(true).'</info>';
 				} else {
-					$currentUid = '<error>' . $current->getUid(true) . '</error>';
+					$currentUid = '<error>'.$current->getUid(true).'</error>';
 				}
 			} catch (Exception $e) {
-				$currentUid = '<error>' . $e->getMessage() . '</error>';
+				$currentUid = '<error>'.$e->getMessage().'</error>';
 			}
 
 			$table->appendRow(
@@ -511,7 +511,7 @@ 
 			}
 		}
 
-		throw new Exception('Unknown type: ' . implode(', ', RemoteInstance::$LIST_TYPE));
+		throw new Exception('Unknown type: '.implode(', ', RemoteInstance::$LIST_TYPE));
 	}
 
 	/**
@@ -524,6 +524,6 @@ 
 			}
 		}
 
-		throw new Exception('Unknown interface: ' . implode(', ', InterfaceService::$LIST_IFACE));
+		throw new Exception('Unknown interface: '.implode(', ', InterfaceService::$LIST_IFACE));
 	}
 }

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/Command/SharesFiles.php

Spacing +5 added lines, -5 removed lines

@@ -219,7 +219,7 @@ 
 				$recipient = $share->getInitiator();
 				$sharedTo = $recipient->getDisplayName();
 				if (!$this->configService->isLocalInstance($recipient->getInstance())) {
-					$sharedTo .= '@' . $recipient->getInstance();
+					$sharedTo .= '@'.$recipient->getInstance();
 				}
 			}
 			$circle = $share->getCircle();
@@ -229,15 +229,15 @@ 
 				$share->getShareOwner(),
 				$share->getFileTarget(),
 				$share->getSharedBy(),
-				$circle->getDisplayName() . ' (' . $share->getSharedWith()
-				. ', ' . Circle::$DEF_SOURCE[$circle->getSource()] . ')'
+				$circle->getDisplayName().' ('.$share->getSharedWith()
+				. ', '.Circle::$DEF_SOURCE[$circle->getSource()].')'
 			];
 
 			if (!$filterRecipient) {
 				$row = array_merge(
 					$row, [
-						$sharedTo . ' (' . $recipient->getSingleId() . ', '
-						. Circle::$DEF_SOURCE[$recipient->getBasedOn()->getSource()] . ')',
+						$sharedTo.' ('.$recipient->getSingleId().', '
+						. Circle::$DEF_SOURCE[$recipient->getBasedOn()->getSource()].')',
 						(($share->getChildId() > 0) ? $share->getChildFileTarget(
 						) : $share->getFileTarget()),
 					]