nextcloud / circles

lib/Service/ShareService.php

Unused Use Statements -1 removed lines

@@ -33,7 +33,6 @@
 
 
 use OCA\Circles\Model\Circle;
-use OCA\Circles\Model\Federated\FederatedEvent;
 
 /**
  * Class ShareService

lib/ShareByCircleProviderDeprecated.php

Doc Comments +2 added lines, -2 removed lines

@@ -438,8 +438,8 @@
 
 	/**
 	 * @param string $userId
-	 * @param $shareType
-	 * @param Node $node
+	 * @param integer $shareType
+	 * @param Node|null $node
 	 * @param int $limit
 	 * @param int $offset
 	 *

Indentation -1 removed lines

@@ -494,7 +494,6 @@
 
 	/**
 	 * Get shares for a given path
-
 	 * @param Node $path
 	 *
 	 * @return IShare[]|null

Spacing +9 added lines, -9 removed lines

@@ -331,19 +331,19 @@ 
 	 */
 	private function createShare($share) {
 		$this->miscService->log(
-			'Creating share (1/4) - type: ' . $share->getShareType() . ' - token: '
-			. $share->getToken() . ' - type: ' . $share->getShareType() . ' - with: '
-			. $share->getSharedWith() . ' - permissions: ' . $share->getPermissions(), 0
+			'Creating share (1/4) - type: '.$share->getShareType().' - token: '
+			. $share->getToken().' - type: '.$share->getShareType().' - with: '
+			. $share->getSharedWith().' - permissions: '.$share->getPermissions(), 0
 		);
 
 		$qb = $this->getBaseInsertSql($share);
-		$this->miscService->log('Share creation (2/4) : ' . json_encode($qb->getSQL()), 0);
+		$this->miscService->log('Share creation (2/4) : '.json_encode($qb->getSQL()), 0);
 
 		$result = $qb->execute();
-		$this->miscService->log('Share creation result (3/4) : ' . json_encode($result), 0);
+		$this->miscService->log('Share creation result (3/4) : '.json_encode($result), 0);
 
 		$id = $qb->getLastInsertId();
-		$this->miscService->log('Share created ID (4/4) : ' . $id, 0);
+		$this->miscService->log('Share created ID (4/4) : '.$id, 0);
 
 		try {
 			$share->setId($id);
@@ -590,7 +590,7 @@ 
 		\OC::$server->getLogger()->log(3, 'deprecated>getShareByToken');
 		$qb = $this->dbConnection->getQueryBuilder();
 
-		$this->miscService->log("Opening share by token '#" . $token . "'", 0);
+		$this->miscService->log("Opening share by token '#".$token."'", 0);
 
 		$cursor = $qb->select('*')
 					 ->from('share')
@@ -614,7 +614,7 @@ 
 			try {
 				$data = $this->getShareByPersonalToken($token);
 			} catch (Exception $e) {
-				$this->miscService->log("Share '#" . $token . "' not found.", 0);
+				$this->miscService->log("Share '#".$token."' not found.", 0);
 				throw new ShareNotFound('Share not found', $this->l10n->t('Could not find share'));
 			}
 		}
@@ -623,7 +623,7 @@ 
 			$share = $this->createShareObject($data);
 		} catch (InvalidShare $e) {
 			$this->miscService->log(
-				"Share Object '#" . $token . "' not created. " . json_encode($data), 0
+				"Share Object '#".$token."' not created. ".json_encode($data), 0
 			);
 			throw new ShareNotFound('Share not found', $this->l10n->t('Could not find share'));
 		}

tests/unit/lib/Api/CirclesTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -861,7 +861,7 @@
 	/**
 	 * function to generate admin/moderator/member and assigning them their level.
 	 *
-	 * @param $circleId
+	 * @param integer $circleId
 	 * @param bool $isClosed
 	 *
 	 * @throws QueryException

Spacing +2 added lines, -2 removed lines

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

tests/bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -7,10 +7,10 @@
 	define('PHPUNIT_RUN', 1);
 }
 
-require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__.'/../../../lib/base.php';
 
 // Fix for "Autoload path not allowed: .../tests/lib/testcase.php"
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
+\OC::$loader->addValidRoot(OC::$SERVERROOT.'/tests');
 
 \OC_App::loadApp(Application::APP_ID);
 

templates/files/list.php

Spacing +2 added lines, -2 removed lines

@@ -18,14 +18,14 @@
 		<tr>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 				</div>
 			</th>
 			<th id="headerSize" class="hidden column-size">
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 		</tr>
 	</thead>

lib/ShareByCircleProvider.php

Spacing +1 added lines, -1 removed lines

@@ -296,7 +296,7 @@
 	 * @throws RequestBuilderException
 	 */
 	public function move(IShare $share, $recipient): IShare {
-		OC::$server->getLogger()->log(3, 'CSP > move' . $share->getId() . ' ' . $recipient);
+		OC::$server->getLogger()->log(3, 'CSP > move'.$share->getId().' '.$recipient);
 
 		$federatedUser = $this->federatedUserService->getLocalFederatedUser($recipient);
 		$child = $this->shareWrapperService->getChild($share, $federatedUser);

lib/Command/CirclesDestroy.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/CirclesSync.php

Spacing +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
 		if (($userId = $input->getOption('user')) !== '') {
 			$federatedUser = $this->syncService->syncNextcloudUser($userId);
 			$output->writeln(
-				'- Nextcloud User <info>' . $userId . '</info>/<info>' . $federatedUser->getSingleId()
+				'- Nextcloud User <info>'.$userId.'</info>/<info>'.$federatedUser->getSingleId()
 				. '</info> synced'
 			);
 		}
@@ -136,7 +136,7 @@ 
 		if (($groupId = $input->getOption('group')) !== '') {
 			$circle = $this->syncService->syncNextcloudGroup($groupId);
 			$output->writeln(
-				'- Nextcloud Group <info>' . $groupId . '</info>/<info>' . $circle->getSingleId()
+				'- Nextcloud Group <info>'.$groupId.'</info>/<info>'.$circle->getSingleId()
 				. '</info> synced'
 			);
 		}

lib/Command/CirclesRemote.php

Spacing +28 added lines, -28 removed lines

@@ -163,19 +163,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');
@@ -183,14 +183,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('');
@@ -198,7 +198,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 {
@@ -206,15 +206,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;
 		}
@@ -222,7 +222,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();
@@ -244,18 +244,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)
 		);
@@ -276,13 +276,13 @@ 
 				$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>'
 				);
 
 				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(
@@ -292,7 +292,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(
@@ -301,7 +301,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);
@@ -327,10 +327,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 \'' . $remoteSignatory->getType()
+			'Would you like to identify this remote instance as \''.$remoteSignatory->getType()
 			. '\' ? (y/N) ',
 			false,
 			'/^(y|Y)/i'
@@ -353,7 +353,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(
@@ -431,13 +431,13 @@ 
 		if ($this->configService->isLocalInstance($instance)) {
 			return;
 		}
-		$this->output->write('Adding <comment>' . $instance . '</comment>: ');
+		$this->output->write('Adding <comment>'.$instance.'</comment>: ');
 		try {
 			$this->remoteStreamService->addRemoteInstance($instance, RemoteInstance::TYPE_GLOBAL_SCALE, true);
 			$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>');
 		}
 	}
 
@@ -455,12 +455,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(
@@ -485,7 +485,7 @@ 
 			}
 		}
 
-		throw new Exception('Unknown type: ' . implode(', ', RemoteInstance::$LIST_TYPE));
+		throw new Exception('Unknown type: '.implode(', ', RemoteInstance::$LIST_TYPE));
 	}
 
 }