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

Spacing +29 added lines, -29 removed lines

@@ -177,7 +177,7 @@ 
 			throw new Exception('Please specify a --type for the test');
 		}
 		if ($test !== '' && !in_array($type, self::$checks)) {
-			throw new Exception('Unknown type: ' . implode(', ', self::$checks));
+			throw new Exception('Unknown type: '.implode(', ', self::$checks));
 		}
 
 //		$this->configService->setAppValue(ConfigService::TEST_NC_BASE, $test);
@@ -235,7 +235,7 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('* testing current address: ' . $test);
+		$output->writeln('* testing current address: '.$test);
 
 		try {
 			$this->setupLoopback($input, $output, $test);
@@ -271,8 +271,8 @@ 
 				continue;
 			}
 
-			$loopback = rtrim($scheme . '://' . $cloudId . $path, '/');
-			$output->writeln('* testing address: ' . $loopback . ' ');
+			$loopback = rtrim($scheme.'://'.$cloudId.$path, '/');
+			$output->writeln('* testing address: '.$loopback.' ');
 
 			try {
 				$this->setupLoopback($input, $output, $loopback);
@@ -345,8 +345,8 @@ 
 		$test = new FederatedEvent(LoopbackTest::class);
 		$this->federatedEventService->newEvent($test);
 		$output->writeln(
-			'<info>' . $test->getWrapperToken() . '</info> ' .
-			'(took ' . (round(microtime(true) * 1000) - $timer) . 'ms)'
+			'<info>'.$test->getWrapperToken().'</info> '.
+			'(took '.(round(microtime(true) * 1000) - $timer).'ms)'
 		);
 
 		$output->writeln('- Waiting for async process to finish (5s)');
@@ -365,18 +365,18 @@ 
 
 		$checkVerify = $wrapper->getEvent()->getData()->gInt('verify');
 		if ($checkVerify === LoopbackTest::VERIFY) {
-			$output->write('<info>verify=' . $checkVerify . '</info> ');
+			$output->write('<info>verify='.$checkVerify.'</info> ');
 		} else {
-			$output->writeln('<error>verify=' . $checkVerify . '</error>');
+			$output->writeln('<error>verify='.$checkVerify.'</error>');
 
 			return false;
 		}
 
 		$checkManage = $wrapper->getResult()->gInt('manage');
 		if ($checkManage === LoopbackTest::MANAGE) {
-			$output->write('<info>manage=' . $checkManage . '</info> ');
+			$output->write('<info>manage='.$checkManage.'</info> ');
 		} else {
-			$output->writeln('<error>manage=' . $checkManage . '</error>');
+			$output->writeln('<error>manage='.$checkManage.'</error>');
 
 			return false;
 		}
@@ -415,7 +415,7 @@ 
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_ID, $cloudId);
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_PATH, $path);
 		$output->writeln(
-			'- Address <info>' . $loopback . '</info> is now used as <info>loopback</info>'
+			'- Address <info>'.$loopback.'</info> is now used as <info>loopback</info>'
 		);
 	}
 
@@ -467,8 +467,8 @@ 
 				continue;
 			}
 
-			$internal = rtrim($scheme . '://' . $cloudId, '/');
-			$fullInternal = rtrim($scheme . '://' . $cloudId . $path, '/');
+			$internal = rtrim($scheme.'://'.$cloudId, '/');
+			$fullInternal = rtrim($scheme.'://'.$cloudId.$path, '/');
 
 			$question = new ConfirmationQuestion(
 				'<comment>Do you want to check the validity of this internal address?</comment> (Y/n) ', true,
@@ -487,9 +487,9 @@ 
 					'You will need to run this <info>curl</info> command from a terminal on your local network and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $internal
+					'     curl -L "'.$internal
 					. '/.well-known/webfinger?resource=http://nextcloud.com/&test='
-					. $testToken . '"'
+					. $testToken.'"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -523,7 +523,7 @@ 
 
 				if ($pastedHref !== $href) {
 					$output->writeln(
-						'<error>The returned data (' . $pastedHref . ') are not the one expected: </error>'
+						'<error>The returned data ('.$pastedHref.') are not the one expected: </error>'
 						. $href
 					);
 					continue;
@@ -535,7 +535,7 @@ 
 					'Now, please run this <info>curl</info> command from a terminal on your local network and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $pastedHref . '?test=' . $testToken . '" -H "Accept: application/json"'
+					'     curl -L "'.$pastedHref.'?test='.$testToken.'" -H "Accept: application/json"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -552,9 +552,9 @@ 
 					|| $appSignatory->getRoot() !== $pastedSignatory->g('root')) {
 					$output->writeln(
 						'<error>The returned data ('
-						. $pastedSignatory->g('uid') . '/' . $pastedSignatory->g('root')
+						. $pastedSignatory->g('uid').'/'.$pastedSignatory->g('root')
 						. ') are not the one expected: </error>'
-						. $appSignatory->getUid(true) . '/' . $appSignatory->getRoot()
+						. $appSignatory->getUid(true).'/'.$appSignatory->getRoot()
 					);
 					continue;
 				}
@@ -599,7 +599,7 @@ 
 		$this->configService->setAppValue(ConfigService::INTERNAL_CLOUD_PATH, $path);
 
 		$output->writeln(
-			'- Address <info>' . $internal . '</info> is now used as <info>internal</info>'
+			'- Address <info>'.$internal.'</info> is now used as <info>internal</info>'
 		);
 	}
 
@@ -652,7 +652,7 @@ 
 				continue;
 			}
 
-			$frontal = rtrim($scheme . '://' . $cloudId . $path, '/');
+			$frontal = rtrim($scheme.'://'.$cloudId.$path, '/');
 			break;
 		}
 
@@ -666,13 +666,13 @@ 
 				'You will need to run this <info>curl</info> command from a remote terminal and paste its result: '
 			);
 			$output->writeln(
-				'     curl ' . $frontal . '/.well-known/webfinger?resource=http://nextcloud.com/'
+				'     curl '.$frontal.'/.well-known/webfinger?resource=http://nextcloud.com/'
 			);
 
 			$question = new Question('result: ', '');
 			$pasteWebfinger = $helper->ask($input, $output, $question);
 
-			echo '__ ' . $pasteWebfinger;
+			echo '__ '.$pasteWebfinger;
 
 			$output->writeln('TESTING !!');
 			$output->writeln('TESTING !!');
@@ -799,7 +799,7 @@ 
 			$request->setDataSerialize(new SimpleDataStore(['empty' => 1]));
 		}
 
-		$output->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': ');
+		$output->write('- '.$type.' request on '.$request->getCompleteUrl().': ');
 
 		try {
 			$this->doRequest($request);
@@ -810,7 +810,7 @@ 
 				$color = 'info';
 			}
 
-			$output->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>');
+			$output->writeln('<'.$color.'>'.$result->getStatusCode().'</'.$color.'>');
 			if ($result->getStatusCode() === 200) {
 				return true;
 			}
@@ -834,7 +834,7 @@ 
 
 		$output->writeln('');
 		$output->writeln(
-			'The address <info>' . $address . '</info> seems to reach your local Nextcloud.'
+			'The address <info>'.$address.'</info> seems to reach your local Nextcloud.'
 		);
 
 		$helper = $this->getHelper('question');
@@ -851,8 +851,8 @@ 
 
 		$this->configService->setAppValue(ConfigService::FORCE_NC_BASE, $address);
 		$output->writeln(
-			'New configuration <info>' . Application::APP_ID . '.' . ConfigService::FORCE_NC_BASE . '=\''
-			. $address . '\'</info> stored in database'
+			'New configuration <info>'.Application::APP_ID.'.'.ConfigService::FORCE_NC_BASE.'=\''
+			. $address.'\'</info> stored in database'
 		);
 	}
 
@@ -880,7 +880,7 @@ 
 		$path = rtrim($path, '/');
 
 		if (!is_null($cloudIdPort)) {
-			$cloudId = $cloudId . ':' . $cloudIdPort;
+			$cloudId = $cloudId.':'.$cloudIdPort;
 		}
 
 		return [$scheme, $cloudId, $path];

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/FileCacheWrapper.php

Spacing +18 added lines, -18 removed lines

@@ -501,29 +501,29 @@
 	 * @throws FileCacheNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->getInt($prefix . 'fileid', $data) === 0) {
+		if ($this->getInt($prefix.'fileid', $data) === 0) {
 			throw new FileCacheNotFoundException();
 		}
 
-		$this->setId($this->getInt($prefix . 'fileid', $data));
-		$this->setPath($this->get($prefix . 'path', $data));
-		$this->setPermissions($this->getInt($prefix . 'permissions', $data));
-		$this->setStorageId($this->getInt($prefix . 'storage', $data));
-		$this->setPathHash($this->get($prefix . 'path_hash', $data));
-		$this->setParent($this->getInt($prefix . 'parent', $data));
-		$this->setName($this->get($prefix . 'name', $data));
-		$this->setMimeType($this->getInt($prefix . 'mimetype', $data));
-		$this->setMimePart($this->getInt($prefix . 'mimepart', $data));
-		$this->setSize($this->getInt($prefix . 'size', $data));
-		$this->setMTime($this->getInt($prefix . 'mtime', $data));
-		$this->setStorageMTime($this->getInt($prefix . 'storage_mtime', $data));
-		$this->setEncrypted($this->getBool($prefix . 'encrypted', $data));
-		$this->setUnencryptedSize($this->getInt($prefix . 'unencrypted_size', $data));
-		$this->setEtag($this->get($prefix . 'etag', $data));
-		$this->setChecksum($this->get($prefix . 'checksum', $data));
+		$this->setId($this->getInt($prefix.'fileid', $data));
+		$this->setPath($this->get($prefix.'path', $data));
+		$this->setPermissions($this->getInt($prefix.'permissions', $data));
+		$this->setStorageId($this->getInt($prefix.'storage', $data));
+		$this->setPathHash($this->get($prefix.'path_hash', $data));
+		$this->setParent($this->getInt($prefix.'parent', $data));
+		$this->setName($this->get($prefix.'name', $data));
+		$this->setMimeType($this->getInt($prefix.'mimetype', $data));
+		$this->setMimePart($this->getInt($prefix.'mimepart', $data));
+		$this->setSize($this->getInt($prefix.'size', $data));
+		$this->setMTime($this->getInt($prefix.'mtime', $data));
+		$this->setStorageMTime($this->getInt($prefix.'storage_mtime', $data));
+		$this->setEncrypted($this->getBool($prefix.'encrypted', $data));
+		$this->setUnencryptedSize($this->getInt($prefix.'unencrypted_size', $data));
+		$this->setEtag($this->get($prefix.'etag', $data));
+		$this->setChecksum($this->get($prefix.'checksum', $data));
 
 		// small hack as there is no reason to call a recursive method for a single entry from the table
-		$this->setStorage($this->get($prefix . CoreQueryBuilder::STORAGES . '_id', $data));
+		$this->setStorage($this->get($prefix.CoreQueryBuilder::STORAGES.'_id', $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);
 

lib/Model/Federated/RemoteInstance.php

Spacing +14 added lines, -14 removed lines

@@ -46,11 +46,11 @@ 
 class RemoteInstance extends NCSignatory implements IQueryRow, JsonSerializable {
 	use TArrayTools;
 
-	public const TYPE_UNKNOWN = 'Unknown';    // not trusted
-	public const TYPE_PASSIVE = 'Passive';    // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
-	public const TYPE_EXTERNAL = 'External';  // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
-	public const TYPE_TRUSTED = 'Trusted';    // everything about Federated Circles are broadcasted.
-	public const TYPE_GLOBALSCALE = 'GlobalScale';  // every Circle is broadcasted,
+	public const TYPE_UNKNOWN = 'Unknown'; // not trusted
+	public const TYPE_PASSIVE = 'Passive'; // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
+	public const TYPE_EXTERNAL = 'External'; // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
+	public const TYPE_TRUSTED = 'Trusted'; // everything about Federated Circles are broadcasted.
+	public const TYPE_GLOBALSCALE = 'GlobalScale'; // every Circle is broadcasted,
 
 	public static $LIST_TYPE = [
 		self::TYPE_UNKNOWN,
@@ -526,7 +526,7 @@ 
 		];
 
 		if ($this->getAuthSigned() !== '') {
-			$data[self::AUTH_SIGNED] = $this->getAlgorithm() . ':' . $this->getAuthSigned();
+			$data[self::AUTH_SIGNED] = $this->getAlgorithm().':'.$this->getAuthSigned();
 		}
 
 		if (!empty($this->getAliases())) {
@@ -545,17 +545,17 @@ 
 	 * @throws RemoteNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->getInt($prefix . 'id', $data) === 0) {
+		if ($this->getInt($prefix.'id', $data) === 0) {
 			throw new RemoteNotFoundException();
 		}
 
-		$this->setDbId($this->getInt($prefix . 'id', $data));
-		$this->import($this->getArray($prefix . 'item', $data));
-		$this->setOrigData($this->getArray($prefix . 'item', $data));
-		$this->setType($this->get($prefix . 'type', $data));
-		$this->setInterface($this->getInt($prefix . 'interface', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
-		$this->setId($this->get($prefix . 'href', $data));
+		$this->setDbId($this->getInt($prefix.'id', $data));
+		$this->import($this->getArray($prefix.'item', $data));
+		$this->setOrigData($this->getArray($prefix.'item', $data));
+		$this->setType($this->get($prefix.'type', $data));
+		$this->setInterface($this->getInt($prefix.'interface', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
+		$this->setId($this->get($prefix.'href', $data));
 
 		return $this;
 	}

lib/Tools/Model/NCSignedRequest.php

Spacing +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
 	 */
 	public function setBody(string $body): self {
 		$this->body = $body;
-		$this->setDigest('SHA-256=' . base64_encode(hash("sha256", utf8_encode($body), true)));
+		$this->setDigest('SHA-256='.base64_encode(hash("sha256", utf8_encode($body), true)));
 
 		return $this;
 	}