nextcloud / circles

lib/Service/ShareService.php

Doc Comments -1 removed lines

@@ -64,7 +64,6 @@
 
 	/**
 	 * @param Circle $circle
-	 * @param string $instance
 	 */
 	public function syncRemoteShares(Circle $circle) {
 		$event = new FederatedEvent(SharedItemsSync::class);

lib/Db/CoreQueryBuilder.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 
 
 	/**
-	 * @param array $ids
+	 * @param string[] $ids
 	 *
 	 * @throws InvalidIdException
 	 */

lib/Db/FileSharesRequest.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 		$expr = $qb->expr();
 
 		$this->limitToShareType($qb, self::SHARE_TYPE);
-		$qb->andWhere($expr->isNull($this->default_select_alias . '.parent'));
+		$qb->andWhere($expr->isNull($this->default_select_alias.'.parent'));
 
 		$shares = [];
 		$cursor = $qb->execute();

lib/Db/CoreRequestBuilder.php

Spacing +66 added lines, -66 removed lines

@@ -164,16 +164,16 @@ 
 		$this->generateMemberSelectAlias($alias, self::PREFIX_MEMBER)
 			 ->leftJoin(
 				 $this->getDefaultSelectAlias(), CoreQueryBuilder::TABLE_MEMBER, $alias,
-				 $expr->eq($alias . '.circle_id', $this->getDefaultSelectAlias() . '.unique_id')
+				 $expr->eq($alias.'.circle_id', $this->getDefaultSelectAlias().'.unique_id')
 			 );
 
 		// TODO: Check in big table if it is better to put condition in andWhere() or in LeftJoin()
 		$this->andWhere(
 			$expr->andX(
-				$expr->eq($alias . '.user_id', $this->createNamedParameter($member->getUserId())),
-				$expr->eq($alias . '.user_type', $this->createNamedParameter($member->getUserType())),
-				$expr->eq($alias . '.instance', $this->createNamedParameter($this->getInstance($member))),
-				$expr->gte($alias . '.level', $this->createNamedParameter($level))
+				$expr->eq($alias.'.user_id', $this->createNamedParameter($member->getUserId())),
+				$expr->eq($alias.'.user_type', $this->createNamedParameter($member->getUserType())),
+				$expr->eq($alias.'.instance', $this->createNamedParameter($this->getInstance($member))),
+				$expr->gte($alias.'.level', $this->createNamedParameter($level))
 			)
 		);
 	}
@@ -194,7 +194,7 @@ 
 			 ->leftJoin(
 				 $this->getDefaultSelectAlias(), CoreQueryBuilder::TABLE_CIRCLE, $alias,
 				 $expr->andX(
-					 $expr->eq($alias . '.unique_id', $this->getDefaultSelectAlias() . '.circle_id')
+					 $expr->eq($alias.'.unique_id', $this->getDefaultSelectAlias().'.circle_id')
 				 )
 			 );
 
@@ -224,8 +224,8 @@ 
 			 ->leftJoin(
 				 $circleTableAlias, CoreQueryBuilder::TABLE_MEMBER, $alias,
 				 $expr->andX(
-					 $expr->eq($alias . '.circle_id', $circleTableAlias . '.unique_id'),
-					 $expr->eq($alias . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
+					 $expr->eq($alias.'.circle_id', $circleTableAlias.'.unique_id'),
+					 $expr->eq($alias.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
 				 )
 			 );
 	}
@@ -251,11 +251,11 @@ 
 			 ->leftJoin(
 				 $aliasCircle, CoreQueryBuilder::TABLE_MEMBER, $alias,
 				 $expr->andX(
-					 $expr->eq($alias . '.circle_id', $aliasCircle . '.unique_id'),
-					 $expr->eq($alias . '.user_id', $this->createNamedParameter($initiator->getUserId())),
-					 $expr->eq($alias . '.user_type', $this->createNamedParameter($initiator->getUserType())),
+					 $expr->eq($alias.'.circle_id', $aliasCircle.'.unique_id'),
+					 $expr->eq($alias.'.user_id', $this->createNamedParameter($initiator->getUserId())),
+					 $expr->eq($alias.'.user_type', $this->createNamedParameter($initiator->getUserType())),
 					 $expr->eq(
-						 $alias . '.instance', $this->createNamedParameter($this->getInstance($initiator))
+						 $alias.'.instance', $this->createNamedParameter($this->getInstance($initiator))
 					 )
 				 )
 			 );
@@ -281,9 +281,9 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreQueryBuilder::TABLE_MEMBER, $alias,
 			$expr->andX(
-				$expr->eq($alias . '.circle_id', $aliasCircle . '.unique_id'),
-				$expr->eq($alias . '.instance', $this->createNamedParameter($instance)),
-				$expr->gte($alias . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+				$expr->eq($alias.'.circle_id', $aliasCircle.'.unique_id'),
+				$expr->eq($alias.'.instance', $this->createNamedParameter($instance)),
+				$expr->gte($alias.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 			)
 		);
 	}
@@ -308,17 +308,17 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreQueryBuilder::TABLE_MEMBER, $alias,
 			$expr->andX(
-				$expr->eq($alias . '.single_id', $aliasCircle . '.unique_id'),
-				$expr->emptyString($alias . '.instance'),
-				$expr->gte($alias . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+				$expr->eq($alias.'.single_id', $aliasCircle.'.unique_id'),
+				$expr->emptyString($alias.'.instance'),
+				$expr->gte($alias.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 			)
 		);
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreQueryBuilder::TABLE_MEMBER, $aliasRemoteOwner,
 			$expr->andX(
-				$expr->eq($alias . '.circle_id', $aliasRemoteOwner . '.circle_id'),
-				$expr->eq($aliasRemoteOwner . '.instance', $this->createNamedParameter($instance)),
-				$expr->eq($aliasRemoteOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
+				$expr->eq($alias.'.circle_id', $aliasRemoteOwner.'.circle_id'),
+				$expr->eq($aliasRemoteOwner.'.instance', $this->createNamedParameter($instance)),
+				$expr->eq($aliasRemoteOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
 			)
 		);
 	}
@@ -338,7 +338,7 @@ 
 		$expr = $this->expr();
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreQueryBuilder::TABLE_REMOTE, $alias,
-			$expr->eq($alias . '.instance', $this->createNamedParameter($instance))
+			$expr->eq($alias.'.instance', $this->createNamedParameter($instance))
 		);
 	}
 
@@ -357,15 +357,15 @@ 
 		// - 4 (Visible to everyone)
 		$orX = $expr->orX();
 		$orX->add(
-			$expr->andX($expr->gte($alias . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)))
+			$expr->andX($expr->gte($alias.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)))
 		);
 		$orX->add(
 			$expr->andX(
-				$expr->bitwiseAnd($aliasCircle . '.config', Circle::CFG_PERSONAL),
-				$expr->eq($alias . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
+				$expr->bitwiseAnd($aliasCircle.'.config', Circle::CFG_PERSONAL),
+				$expr->eq($alias.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
 			)
 		);
-		$orX->add($expr->bitwiseAnd($aliasCircle . '.config', Circle::CFG_VISIBLE));
+		$orX->add($expr->bitwiseAnd($aliasCircle.'.config', Circle::CFG_VISIBLE));
 		$this->andWhere($orX);
 
 
@@ -400,10 +400,10 @@ 
 		$expr = $this->expr();
 
 		$orHidden = $expr->orX();
-		$orHidden->add($expr->bitwiseAnd($alias . '.config', Circle::CFG_SINGLE));
-		$orHidden->add($expr->bitwiseAnd($alias . '.config', Circle::CFG_HIDDEN));
-		$orHidden->add($expr->bitwiseAnd($alias . '.config', Circle::CFG_BACKEND));
-		$this->andWhere($this->createFunction('NOT') . $orHidden);
+		$orHidden->add($expr->bitwiseAnd($alias.'.config', Circle::CFG_SINGLE));
+		$orHidden->add($expr->bitwiseAnd($alias.'.config', Circle::CFG_HIDDEN));
+		$orHidden->add($expr->bitwiseAnd($alias.'.config', Circle::CFG_BACKEND));
+		$this->andWhere($this->createFunction('NOT').$orHidden);
 	}
 
 
@@ -436,16 +436,16 @@ 
 
 		$orX = $expr->orX();
 		$orX->add(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBAL_SCALE))
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBAL_SCALE))
 		);
 
 		$orExtOrPassive = $expr->orX();
 		$orExtOrPassive->add(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
 		);
 		if (!$sensitive) {
 			$orExtOrPassive->add(
-				$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
+				$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
 			);
 		} else {
 			if ($this->getDefaultSelectAlias() === 'm') {
@@ -455,8 +455,8 @@ 
 
 
 		$orInstance = $expr->orX();
-		$orInstance->add($expr->isNotNull($aliasMembers . '.instance'));
-		$orInstance->add($expr->isNotNull($aliasRemoteOwner . '.instance'));
+		$orInstance->add($expr->isNotNull($aliasMembers.'.instance'));
+		$orInstance->add($expr->isNotNull($aliasRemoteOwner.'.instance'));
 
 		$andExternal = $expr->andX();
 		$andExternal->add($orExtOrPassive);
@@ -465,13 +465,13 @@ 
 		$orExtOrTrusted = $expr->orX();
 		$orExtOrTrusted->add($andExternal);
 		$orExtOrTrusted->add(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
 		);
 
 		$andTrusted = $expr->andX();
 		$andTrusted->add($orExtOrTrusted);
-		$andTrusted->add($expr->bitwiseAnd($aliasCircle . '.config', Circle::CFG_FEDERATED));
-		$andTrusted->add($expr->emptyString($aliasOwner . '.instance'));
+		$andTrusted->add($expr->bitwiseAnd($aliasCircle.'.config', Circle::CFG_FEDERATED));
+		$andTrusted->add($expr->emptyString($aliasOwner.'.instance'));
 		$orX->add($andTrusted);
 
 		$this->andWhere($orX);
@@ -489,21 +489,21 @@ 
 		$expr = $this->expr();
 		$andPassive = $expr->andX();
 		$andPassive->add(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
 		);
 
 		$orMemberOrLevel = $expr->orX();
 		$orMemberOrLevel->add(
-			$expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance')
+			$expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance')
 		);
 		// TODO: do we need this ? (display members from the local instance)
 		$orMemberOrLevel->add(
-			$expr->emptyString($this->getDefaultSelectAlias() . '.instance')
+			$expr->emptyString($this->getDefaultSelectAlias().'.instance')
 		);
 
 		$orMemberOrLevel->add(
 			$expr->eq(
-				$this->getDefaultSelectAlias() . '.level',
+				$this->getDefaultSelectAlias().'.level',
 				$this->createNamedParameter(Member::LEVEL_OWNER)
 			)
 		);
@@ -517,7 +517,7 @@ 
 	 * @param int $flag
 	 */
 	public function filterConfig(int $flag): void {
-		$this->andWhere($this->expr()->bitwiseAnd($this->getDefaultSelectAlias() . '.config', $flag));
+		$this->andWhere($this->expr()->bitwiseAnd($this->getDefaultSelectAlias().'.config', $flag));
 	}
 
 
@@ -528,15 +528,15 @@ 
 	 * @return $this
 	 */
 	private function generateCircleSelectAlias(string $alias, string $prefix): self {
-		$this->selectAlias($alias . '.unique_id', $prefix . 'unique_id')
-			 ->selectAlias($alias . '.name', $prefix . 'name')
-			 ->selectAlias($alias . '.alt_name', $prefix . 'alt_name')
-			 ->selectAlias($alias . '.description', $prefix . 'description')
-			 ->selectAlias($alias . '.settings', $prefix . 'settings')
-			 ->selectAlias($alias . '.config', $prefix . 'config')
-			 ->selectAlias($alias . '.contact_addressbook', $prefix . 'contact_addressbook')
-			 ->selectAlias($alias . '.contact_groupname', $prefix . 'contact_groupname')
-			 ->selectAlias($alias . '.creation', $prefix . 'creation');
+		$this->selectAlias($alias.'.unique_id', $prefix.'unique_id')
+			 ->selectAlias($alias.'.name', $prefix.'name')
+			 ->selectAlias($alias.'.alt_name', $prefix.'alt_name')
+			 ->selectAlias($alias.'.description', $prefix.'description')
+			 ->selectAlias($alias.'.settings', $prefix.'settings')
+			 ->selectAlias($alias.'.config', $prefix.'config')
+			 ->selectAlias($alias.'.contact_addressbook', $prefix.'contact_addressbook')
+			 ->selectAlias($alias.'.contact_groupname', $prefix.'contact_groupname')
+			 ->selectAlias($alias.'.creation', $prefix.'creation');
 
 		return $this;
 	}
@@ -548,20 +548,20 @@ 
 	 * @return $this
 	 */
 	private function generateMemberSelectAlias(string $alias, string $prefix): self {
-		$this->selectAlias($alias . '.circle_id', $prefix . 'circle_id')
-			 ->selectAlias($alias . '.single_id', $prefix . 'single_id')
-			 ->selectAlias($alias . '.user_id', $prefix . 'user_id')
-			 ->selectAlias($alias . '.user_type', $prefix . 'user_type')
-			 ->selectAlias($alias . '.member_id', $prefix . 'member_id')
-			 ->selectAlias($alias . '.instance', $prefix . 'instance')
-			 ->selectAlias($alias . '.cached_name', $prefix . 'cached_name')
-			 ->selectAlias($alias . '.cached_update', $prefix . 'cached_update')
-			 ->selectAlias($alias . '.status', $prefix . 'status')
-			 ->selectAlias($alias . '.level', $prefix . 'level')
-			 ->selectAlias($alias . '.note', $prefix . 'note')
-			 ->selectAlias($alias . '.contact_id', $prefix . 'contact_id')
-			 ->selectAlias($alias . '.contact_meta', $prefix . 'contact_meta')
-			 ->selectAlias($alias . '.joined', $prefix . 'joined');
+		$this->selectAlias($alias.'.circle_id', $prefix.'circle_id')
+			 ->selectAlias($alias.'.single_id', $prefix.'single_id')
+			 ->selectAlias($alias.'.user_id', $prefix.'user_id')
+			 ->selectAlias($alias.'.user_type', $prefix.'user_type')
+			 ->selectAlias($alias.'.member_id', $prefix.'member_id')
+			 ->selectAlias($alias.'.instance', $prefix.'instance')
+			 ->selectAlias($alias.'.cached_name', $prefix.'cached_name')
+			 ->selectAlias($alias.'.cached_update', $prefix.'cached_update')
+			 ->selectAlias($alias.'.status', $prefix.'status')
+			 ->selectAlias($alias.'.level', $prefix.'level')
+			 ->selectAlias($alias.'.note', $prefix.'note')
+			 ->selectAlias($alias.'.contact_id', $prefix.'contact_id')
+			 ->selectAlias($alias.'.contact_meta', $prefix.'contact_meta')
+			 ->selectAlias($alias.'.joined', $prefix.'joined');
 
 		return $this;
 	}

lib/Command/CirclesMemberships.php

Spacing +16 added lines, -16 removed lines

@@ -170,10 +170,10 @@ 
 		$type = Member::parseTypeString($input->getOption('type'));
 		$federatedUser = $this->federatedUserService->getFederatedUser($userId, (int)$type);
 
-		$output->writeln('Id: <info>' . $federatedUser->getUserId() . '</info>');
-		$output->writeln('Instance: <info>' . $federatedUser->getInstance() . '</info>');
-		$output->writeln('Type: <info>' . Member::$DEF_TYPE[$federatedUser->getUserType()] . '</info>');
-		$output->writeln('SingleId: <info>' . $federatedUser->getSingleId() . '</info>');
+		$output->writeln('Id: <info>'.$federatedUser->getUserId().'</info>');
+		$output->writeln('Instance: <info>'.$federatedUser->getInstance().'</info>');
+		$output->writeln('Type: <info>'.Member::$DEF_TYPE[$federatedUser->getUserType()].'</info>');
+		$output->writeln('SingleId: <info>'.$federatedUser->getSingleId().'</info>');
 
 		$output->writeln('');
 		$output->writeln('Memberships:');
@@ -181,14 +181,14 @@ 
 		if ($count === 0) {
 			$output->writeln('(database not updated)');
 		} else {
-			$output->writeln('(' . $count . ' entries generated/updated in the database)');
+			$output->writeln('('.$count.' entries generated/updated in the database)');
 		}
 
 		foreach ($federatedUser->getMemberships() as $membership) {
 			$this->memberships[$membership->getCircleId()] = $membership;
 			$output->writeln(
-				'- <info>' . $membership->getCircleId() . '</info> ('
-				. Member::$DEF_LEVEL[$membership->getLevel()] . ')'
+				'- <info>'.$membership->getCircleId().'</info> ('
+				. Member::$DEF_LEVEL[$membership->getLevel()].')'
 			);
 		}
 
@@ -261,9 +261,9 @@ 
 				if ($lineNumber === 2) {
 					return '';
 				}
-				$line .= '<info>' . $federatedUser->getSingleId() . '</info>';
+				$line .= '<info>'.$federatedUser->getSingleId().'</info>';
 				if (!$this->configService->isLocalInstance($federatedUser->getInstance())) {
-					$line .= '@' . $federatedUser->getInstance();
+					$line .= '@'.$federatedUser->getInstance();
 				}
 
 				return $line;
@@ -275,24 +275,24 @@ 
 				$circle = $member->getCircle();
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $circle->getId() . '</info>';
+					$line .= '<info>'.$circle->getId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
-					$line .= ' (' . $circle->getName() . ')';
-					$line .= ' <info>Level</info>: ' . Member::$DEF_LEVEL[$member->getLevel()];
+					$line .= ' ('.$circle->getName().')';
+					$line .= ' <info>Level</info>: '.Member::$DEF_LEVEL[$member->getLevel()];
 
 					$knownMembership = $this->memberships[$member->getCircleId()];
 					if ($member->getLevel() !== $knownMembership->getLevel()) {
-						$line .= ' (' . Member::$DEF_LEVEL[$knownMembership->getLevel()] . ')';
+						$line .= ' ('.Member::$DEF_LEVEL[$knownMembership->getLevel()].')';
 					}
 				}
 
 				if ($lineNumber === 2) {
 					$owner = $circle->getOwner();
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance() . ' ';
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance().' ';
 					$type = implode(", ", Circle::getCircleTypes($circle, Circle::TYPES_LONG));
-					$line .= ($type === '') ? '' : '<info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : '<info>Config</info>: '.$type;
 				}
 
 				return $line;