nextcloud / circles

lib/Command/CirclesEdit.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/Circle.php

Doc Comments +2 added lines, -2 removed lines

@@ -358,7 +358,7 @@ 
 
 
 	/**
-	 * @param ?Member $owner
+	 * @param Member $owner
 	 *
 	 * @return self
 	 */
@@ -414,7 +414,7 @@ 
 
 
 	/**
-	 * @param array $members
+	 * @param Member[] $members
 	 * @param bool $detailed
 	 *
 	 * @return self

Spacing +31 added lines, -31 removed lines

@@ -84,26 +84,26 @@ 
 
 
 	// specific value
-	const CFG_CIRCLE = 0;        // only for code readability. Circle is locked by default.
-	const CFG_SINGLE = 1;        // Circle with only one single member.
-	const CFG_PERSONAL = 2;      // Personal circle, only the owner can see it.
+	const CFG_CIRCLE = 0; // only for code readability. Circle is locked by default.
+	const CFG_SINGLE = 1; // Circle with only one single member.
+	const CFG_PERSONAL = 2; // Personal circle, only the owner can see it.
 
 	// bitwise
-	const CFG_SYSTEM = 4;            // System Circle (not managed by the official front-end). Meaning some config are limited
-	const CFG_VISIBLE = 8;           // Visible to everyone, if not visible, people have to know its name to be able to find it
-	const CFG_OPEN = 16;             // Circle is open, people can join
-	const CFG_INVITE = 32;           // Adding a member generate an invitation that needs to be accepted
-	const CFG_REQUEST = 64;          // Request to join Circles needs to be confirmed by a moderator
-	const CFG_FRIEND = 128;          // Members of the circle can invite their friends
-	const CFG_PROTECTED = 256;       // Password protected to join/request
-	const CFG_NO_OWNER = 512;        // no owner, only members
-	const CFG_HIDDEN = 1024;         // hidden from listing, but available as a share entity
-	const CFG_BACKEND = 2048;            // Fully hidden, only backend Circles
-	const CFG_LOCAL = 4096;              // Local even on GlobalScale
-	const CFG_ROOT = 8192;               // Circle cannot be inside another Circle
-	const CFG_CIRCLE_INVITE = 16384;     // Circle must confirm when invited in another circle
-	const CFG_FEDERATED = 32768;         // Federated
-	const CFG_MOUNTPOINT = 65536;        // Generate a Files folder for this Circle
+	const CFG_SYSTEM = 4; // System Circle (not managed by the official front-end). Meaning some config are limited
+	const CFG_VISIBLE = 8; // Visible to everyone, if not visible, people have to know its name to be able to find it
+	const CFG_OPEN = 16; // Circle is open, people can join
+	const CFG_INVITE = 32; // Adding a member generate an invitation that needs to be accepted
+	const CFG_REQUEST = 64; // Request to join Circles needs to be confirmed by a moderator
+	const CFG_FRIEND = 128; // Members of the circle can invite their friends
+	const CFG_PROTECTED = 256; // Password protected to join/request
+	const CFG_NO_OWNER = 512; // no owner, only members
+	const CFG_HIDDEN = 1024; // hidden from listing, but available as a share entity
+	const CFG_BACKEND = 2048; // Fully hidden, only backend Circles
+	const CFG_LOCAL = 4096; // Local even on GlobalScale
+	const CFG_ROOT = 8192; // Circle cannot be inside another Circle
+	const CFG_CIRCLE_INVITE = 16384; // Circle must confirm when invited in another circle
+	const CFG_FEDERATED = 32768; // Federated
+	const CFG_MOUNTPOINT = 65536; // Generate a Files folder for this Circle
 
 	public static $DEF_CFG_MAX = 131071;
 
@@ -702,22 +702,22 @@ 
 	 * @throws CircleNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
-		if ($this->get($prefix . 'unique_id', $data) === '') {
+		if ($this->get($prefix.'unique_id', $data) === '') {
 			throw new CircleNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'unique_id', $data))
-			 ->setName($this->get($prefix . 'name', $data))
-			 ->setDisplayName($this->get($prefix . 'display_name', $data))
-			 ->setConfig($this->getInt($prefix . 'config', $data))
-			 ->setSource($this->getInt($prefix . 'source', $data))
-			 ->setInstance($this->get($prefix . 'instance', $data))
-			 ->setSettings($this->getArray($prefix . 'settings', $data))
-			 ->setContactAddressBook($this->getInt($prefix . 'contact_addressbook', $data))
-			 ->setContactGroupName($this->get($prefix . 'contact_groupname', $data))
-			 ->setDescription($this->get($prefix . 'description', $data));
-
-		$creation = $this->get($prefix . 'creation', $data);
+		$this->setSingleId($this->get($prefix.'unique_id', $data))
+			 ->setName($this->get($prefix.'name', $data))
+			 ->setDisplayName($this->get($prefix.'display_name', $data))
+			 ->setConfig($this->getInt($prefix.'config', $data))
+			 ->setSource($this->getInt($prefix.'source', $data))
+			 ->setInstance($this->get($prefix.'instance', $data))
+			 ->setSettings($this->getArray($prefix.'settings', $data))
+			 ->setContactAddressBook($this->getInt($prefix.'contact_addressbook', $data))
+			 ->setContactGroupName($this->get($prefix.'contact_groupname', $data))
+			 ->setDescription($this->get($prefix.'description', $data));
+
+		$creation = $this->get($prefix.'creation', $data);
 		$this->setCreation(DateTime::createFromFormat('Y-m-d H:i:s', $creation)->getTimestamp());
 
 		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);

lib/Db/CircleProviderRequest.php

Doc Comments +3 added lines, -3 removed lines

@@ -40,10 +40,10 @@
 
 
 	/**
-	 * @param $userId
+	 * @param string $userId
 	 * @param $circleUniqueIds
-	 * @param $limit
-	 * @param $offset
+	 * @param integer $limit
+	 * @param integer $offset
 	 *
 	 * @return array
 	 * @throws GSStatusException

lib/Db/GSSharesRequestBuilder.php

Indentation -1 removed lines

@@ -35,7 +35,6 @@
 
 
 /** * @deprecated
-
  * Class GSSharesRequestBuilder
  *
  * @package OCA\Circles\Db

lib/Db/CircleRequestBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		$qb = $this->getQueryBuilder();
 		$qb->generateSelect(self::TABLE_CIRCLE, self::$tables[self::TABLE_CIRCLE], $alias, true)
 		   ->generateGroupBy(self::$tables[self::TABLE_CIRCLE], $alias)
-		   ->orderBy($alias . '.creation', 'asc');
+		   ->orderBy($alias.'.creation', 'asc');
 
 		return $qb;
 	}

lib/Db/RemoteRequest.php

Spacing +4 added lines, -4 removed lines

@@ -182,10 +182,10 @@ 
 			$qb->leftJoin(
 				CoreQueryBuilder::REMOTE, self::TABLE_MEMBER, $aliasMember,
 				$expr->andX(
-					$expr->eq($aliasMember . '.circle_id', $qb->createNamedParameter($circle->getSingleId())),
-					$expr->eq($aliasMember . '.instance', CoreQueryBuilder::REMOTE . '.instance'),
+					$expr->eq($aliasMember.'.circle_id', $qb->createNamedParameter($circle->getSingleId())),
+					$expr->eq($aliasMember.'.instance', CoreQueryBuilder::REMOTE.'.instance'),
 					$expr->gte(
-						$aliasMember . '.level',
+						$aliasMember.'.level',
 						$qb->createNamedParameter(Member::LEVEL_MEMBER, IQueryBuilder::PARAM_INT)
 					)
 				)
@@ -193,7 +193,7 @@ 
 
 			$external = $expr->andX();
 			$external->add($qb->exprLimitToDBField('type', RemoteInstance::TYPE_EXTERNAL, true, false));
-			$external->add($expr->isNotNull($aliasMember . '.instance'));
+			$external->add($expr->isNotNull($aliasMember.'.instance'));
 			$orX->add($external);
 		}
 

lib/Db/MemberRequestBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 			CoreQueryBuilder::MEMBER
 		)
 		   ->generateGroupBy(self::$tables[self::TABLE_MEMBER], CoreQueryBuilder::MEMBER)
-		   ->orderBy(CoreQueryBuilder::MEMBER . '.joined');
+		   ->orderBy(CoreQueryBuilder::MEMBER.'.joined');
 
 		if ($getBasedOn) {
 			$qb->leftJoinBasedOn(CoreQueryBuilder::MEMBER, $initiator);

lib/Command/CirclesReport.php

Spacing +3 added lines, -3 removed lines

@@ -218,7 +218,7 @@ 
 	 * @return string[]
 	 */
 	public function fillCommandList(string $source, string $field): array {
-		echo $source . ' ' . $field . "\n";
+		echo $source.' '.$field."\n";
 
 		return ['abcd', 'abdde', 'erfg'];
 	}
@@ -394,7 +394,7 @@ 
 	 * @return string
 	 */
 	private function obfuscateId(string $id): string {
-		return substr($id, 0, 5) . '.' . md5(substr($id, 5));
+		return substr($id, 0, 5).'.'.md5(substr($id, 5));
 	}
 
 
@@ -403,7 +403,7 @@ 
 	 */
 	public function onNewPrompt(NC22InteractiveShellSession $session): void {
 		$prompt =
-			'Circles Report [<info>' . $this->report->getSource() . '</info>]:<comment>%PATH%</comment>';
+			'Circles Report [<info>'.$this->report->getSource().'</info>]:<comment>%PATH%</comment>';
 
 		$commands = [];
 		if ($session->getData()->g('currentStatus') === 'write') {

lib/Command/CirclesCheck.php

Doc Comments +1 added lines, -2 removed lines

@@ -110,7 +110,7 @@ 
 	 * CirclesCheck constructor.
 	 *
 	 * @param Capabilities $capabilities
-	 * @param FederatedEvent $federatedEventService
+	 * @param FederatedEventService $federatedEventService
 	 * @param RemoteService $remoteService
 	 * @param RemoteStreamService $remoteStreamService
 	 * @param RemoteUpstreamService $remoteUpstreamService
@@ -619,7 +619,6 @@ 
 
 
 	/**
-	 * @param OutputInterface $o
 	 * @param string $type
 	 * @param string $route
 	 * @param array $args

Spacing +21 added lines, -21 removed lines

@@ -173,7 +173,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);
@@ -278,7 +278,7 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('* testing current address: ' . $test);
+		$output->writeln('* testing current address: '.$test);
 
 		try {
 			$this->setupLoopback($input, $output, $test);
@@ -314,8 +314,8 @@ 
 				continue;
 			}
 
-			$loopback = $scheme . '://' . $cloudId;
-			$output->write('* testing address: ' . $loopback . ' ');
+			$loopback = $scheme.'://'.$cloudId;
+			$output->write('* testing address: '.$loopback.' ');
 
 			if ($this->testLoopback($input, $output, $loopback)) {
 				$output->writeln('* <info>Loopback</info> address looks good');
@@ -385,9 +385,9 @@ 
 		$test = new FederatedEvent(LoopbackTest::class);
 		$this->federatedEventService->newEvent($test);
 
-		$output->writeln('<info>' . $test->getWrapperToken() . '</info>');
+		$output->writeln('<info>'.$test->getWrapperToken().'</info>');
 
-		$output->writeln('- Waiting for async process to finish (' . $this->delay . 's)');
+		$output->writeln('- Waiting for async process to finish ('.$this->delay.'s)');
 		sleep($this->delay);
 
 		$output->write('- Checking status on FederatedEvent ');
@@ -401,18 +401,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;
 		}
@@ -434,7 +434,7 @@ 
 		[$scheme, $cloudId] = $this->parseAddress($loopback);
 
 		$question = new ConfirmationQuestion(
-			'- Do you want to save <info>'. $loopback . '</info> as your <info>loopback</info> address ? (y/N) ', false, '/^(y|Y)/i'
+			'- Do you want to save <info>'.$loopback.'</info> as your <info>loopback</info> address ? (y/N) ', false, '/^(y|Y)/i'
 		);
 
 		$helper = $this->getHelper('question');
@@ -447,7 +447,7 @@ 
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_SCHEME, $scheme);
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_ID, $cloudId);
 		$output->writeln(
-			'- Address <info>' . $loopback . '</info> is now used as <info>loopback</info>'
+			'- Address <info>'.$loopback.'</info> is now used as <info>loopback</info>'
 		);
 
 	}
@@ -518,7 +518,7 @@ 
 				continue;
 			}
 
-			$frontal = $scheme . '://' . $cloudId;
+			$frontal = $scheme.'://'.$cloudId;
 			break;
 		}
 
@@ -532,13 +532,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 !!');
@@ -661,7 +661,7 @@ 
 		$this->configService->configureLoopbackRequest($request, $route, $args);
 		$request->setFollowLocation(false);
 
-		$output->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': ');
+		$output->write('- '.$type.' request on '.$request->getCompleteUrl().': ');
 
 		try {
 			$this->doRequest($request);
@@ -672,7 +672,7 @@ 
 				$color = 'info';
 			}
 
-			$output->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>');
+			$output->writeln('<'.$color.'>'.$result->getStatusCode().'</'.$color.'>');
 			if ($result->getStatusCode() === 200) {
 				return true;
 			}
@@ -696,7 +696,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');
@@ -713,8 +713,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'
 		);
 	}
 
@@ -735,7 +735,7 @@ 
 		}
 
 		if (!is_null($cloudIdPort)) {
-			$cloudId = $cloudId . ':' . $cloudIdPort;
+			$cloudId = $cloudId.':'.$cloudIdPort;
 		}
 
 		return [$scheme, $cloudId];