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/Db/MemberRequest.php

Spacing +7 added lines, -7 removed lines

@@ -216,8 +216,8 @@ 
 			$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $filter);
 		}
 
-		$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
-		$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');
+		$qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc');
+		$qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc');
 
 		return $this->getItemsFromRequest($qb);
 	}
@@ -241,8 +241,8 @@ 
 		$qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId);
 
 		$aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS);
-		$qb->orderBy($aliasMembership . '.inheritance_depth', 'asc');
-		$qb->groupBy(CoreQueryBuilder::MEMBER . '.single_id');
+		$qb->orderBy($aliasMembership.'.inheritance_depth', 'asc');
+		$qb->groupBy(CoreQueryBuilder::MEMBER.'.single_id');
 
 		return $this->getItemsFromRequest($qb);
 	}
@@ -278,8 +278,8 @@ 
 		$qb = $this->getMemberSelectSql();
 		$qb->limitToCircleId($circleId);
 
-		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance'));
-		$qb->groupBy(CoreQueryBuilder::MEMBER . '.instance');
+		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance'));
+		$qb->groupBy(CoreQueryBuilder::MEMBER.'.instance');
 
 		return array_map(
 			function(Member $member): string {
@@ -334,7 +334,7 @@ 
 	 */
 	public function searchFederatedUsers(string $needle): array {
 		$qb = $this->getMemberSelectSql();
-		$qb->searchInDBField('user_id', '%' . $needle . '%');
+		$qb->searchInDBField('user_id', '%'.$needle.'%');
 		$qb->groupBy('single_id');
 
 		return $this->getItemsFromRequest($qb, true);

lib/Db/RemoteRequestBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -78,13 +78,13 @@
 	protected function getRemoteSelectSql(string $alias = CoreQueryBuilder::REMOTE): CoreQueryBuilder {
 		$qb = $this->getQueryBuilder();
 		$qb->select(
-			$alias . '.id',
-			$alias . '.type',
-			$alias . '.uid',
-			$alias . '.instance',
-			$alias . '.href',
-			$alias . '.item',
-			$alias . '.creation'
+			$alias.'.id',
+			$alias.'.type',
+			$alias.'.uid',
+			$alias.'.instance',
+			$alias.'.href',
+			$alias.'.item',
+			$alias.'.creation'
 		)
 		   ->from(self::TABLE_REMOTE, $alias)
 		   ->setDefaultSelectAlias($alias);

lib/Db/MembershipRequestBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -73,13 +73,13 @@
 	protected function getMembershipSelectSql(): CoreQueryBuilder {
 		$qb = $this->getQueryBuilder();
 		$qb->select(
-			CoreQueryBuilder::MEMBER . '.single_id',
-			CoreQueryBuilder::MEMBER . '.circle_id',
-			CoreQueryBuilder::MEMBER . '.level',
-			CoreQueryBuilder::MEMBER . '.inheritance_first',
-			CoreQueryBuilder::MEMBER . '.inheritance_last',
-			CoreQueryBuilder::MEMBER . '.inheritance_path',
-			CoreQueryBuilder::MEMBER . '.inheritance_depth'
+			CoreQueryBuilder::MEMBER.'.single_id',
+			CoreQueryBuilder::MEMBER.'.circle_id',
+			CoreQueryBuilder::MEMBER.'.level',
+			CoreQueryBuilder::MEMBER.'.inheritance_first',
+			CoreQueryBuilder::MEMBER.'.inheritance_last',
+			CoreQueryBuilder::MEMBER.'.inheritance_path',
+			CoreQueryBuilder::MEMBER.'.inheritance_depth'
 		)
 		   ->from(self::TABLE_MEMBERSHIP, CoreQueryBuilder::MEMBER)
 		   ->setDefaultSelectAlias(CoreQueryBuilder::MEMBER);

lib/Db/CircleRequestBuilder.php

Spacing +12 added lines, -12 removed lines

@@ -75,21 +75,21 @@
 	 */
 	protected function getCircleSelectSql(string $alias = CoreQueryBuilder::CIRCLE): CoreQueryBuilder {
 		$qb = $this->getQueryBuilder();
-		$qb->selectDistinct($alias . '.unique_id')
+		$qb->selectDistinct($alias.'.unique_id')
 		   ->addSelect(
-			   $alias . '.name',
-			   $alias . '.display_name',
-			   $alias . '.source',
-			   $alias . '.description',
-			   $alias . '.settings',
-			   $alias . '.config',
-			   $alias . '.contact_addressbook',
-			   $alias . '.contact_groupname',
-			   $alias . '.creation'
+			   $alias.'.name',
+			   $alias.'.display_name',
+			   $alias.'.source',
+			   $alias.'.description',
+			   $alias.'.settings',
+			   $alias.'.config',
+			   $alias.'.contact_addressbook',
+			   $alias.'.contact_groupname',
+			   $alias.'.creation'
 		   )
 		   ->from(self::TABLE_CIRCLE, $alias)
-		   ->groupBy($alias . '.unique_id')
-		   ->orderBy($alias . '.creation', 'asc')
+		   ->groupBy($alias.'.unique_id')
+		   ->orderBy($alias.'.creation', 'asc')
 		   ->setDefaultSelectAlias($alias);
 
 		return $qb;