nextcloud / circles

lib/Db/CircleProviderRequestBuilder.php

Spacing +18 added lines, -18 removed lines

@@ -77,7 +77,7 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 		$qb->andWhere(
 			$expr->in(
-				$pf . 'share_with',
+				$pf.'share_with',
 				$qb->createNamedParameter($circleUniqueIds, IQueryBuilder::PARAM_STR_ARRAY)
 			)
 		);
@@ -94,7 +94,7 @@ 
 		$expr = $qb->expr();
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId)));
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId)));
 	}
 
 
@@ -142,8 +142,8 @@ 
 
 		$qb->andWhere(
 			$expr->orX(
-				$expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)),
-				$expr->eq($pf . 'id', $qb->createNamedParameter($circleId))
+				$expr->eq($pf.'parent', $qb->createNamedParameter($circleId)),
+				$expr->eq($pf.'id', $qb->createNamedParameter($circleId))
 			)
 		);
 	}
@@ -165,7 +165,7 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 		$qb->andWhere(
 			$expr->in(
-				$pf . 'file_source',
+				$pf.'file_source',
 				$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
 			)
 		);
@@ -198,12 +198,12 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 
 		if ($reShares === false) {
-			$qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)));
+			$qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)));
 		} else {
 			$qb->andWhere(
 				$expr->orX(
-					$expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)),
-					$expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))
+					$expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)),
+					$expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))
 				)
 			);
 		}
@@ -298,11 +298,11 @@ 
 		$expr = $qb->expr();
 		$andX = $expr->andX();
 
-		$andX->add($expr->eq($aliasM . '.user_id', $qb->createNamedParameter($userId)));
-		$andX->add($expr->eq($aliasM . '.circle_id', $aliasC . '.unique_id'));
-		$andX->add($expr->gte($aliasM . '.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
-		$andX->add($expr->eq($aliasM . '.instance', $qb->createNamedParameter('')));
-		$andX->add($expr->eq($aliasM . '.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER)));
+		$andX->add($expr->eq($aliasM.'.user_id', $qb->createNamedParameter($userId)));
+		$andX->add($expr->eq($aliasM.'.circle_id', $aliasC.'.unique_id'));
+		$andX->add($expr->gte($aliasM.'.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
+		$andX->add($expr->eq($aliasM.'.instance', $qb->createNamedParameter('')));
+		$andX->add($expr->eq($aliasM.'.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER)));
 
 		return $andX;
 	}
@@ -330,11 +330,11 @@ 
 
 		$andX = $expr->andX();
 
-		$andX->add($expr->eq($aliasM . '.user_id', 'ncgu.gid'));
-		$andX->add($expr->eq($aliasM . '.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_GROUP)));
-		$andX->add($expr->eq($aliasM . '.instance', $qb->createNamedParameter('')));
-		$andX->add($expr->eq($aliasM . '.circle_id', $aliasC . '.unique_id'));
-		$andX->add($expr->gte($aliasM . '.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
+		$andX->add($expr->eq($aliasM.'.user_id', 'ncgu.gid'));
+		$andX->add($expr->eq($aliasM.'.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_GROUP)));
+		$andX->add($expr->eq($aliasM.'.instance', $qb->createNamedParameter('')));
+		$andX->add($expr->eq($aliasM.'.circle_id', $aliasC.'.unique_id'));
+		$andX->add($expr->gte($aliasM.'.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
 
 		return $andX;
 	}

lib/Db/DeprecatedRequestBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -348,8 +348,8 @@ 
 		$expr = $qb->expr();
 
 		if ($pf === '') {
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
 
 			return;
 		}
@@ -378,7 +378,7 @@ 
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
 				continue;
 			}
-			$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
+			$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
 		}
 
 		return $orX;
@@ -393,12 +393,12 @@ 
 	protected function limitToMembersAndAlmost(IQueryBuilder $qb) {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
 		$orX = $expr->orX();
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
 
 		$qb->andWhere($orX);
 	}
@@ -411,8 +411,8 @@ 
 	 */
 	public function limitToDBField(IQueryBuilder $qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -423,8 +423,8 @@ 
 	 */
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -439,9 +439,9 @@ 
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
-		$and = $expr->andX($expr->eq($pf . 'user_id', 'ncgu.gid'));
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
 		if ($userId !== '') {
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
 		} else {
@@ -464,7 +464,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -473,7 +473,7 @@ 
 		   ->selectAlias('lc.settings', 'circle_settings')
 		   ->leftJoin(
 			   $this->default_select_alias, DeprecatedRequestBuilder::TABLE_CIRCLES, 'lc',
-			   $expr->eq($pf . 'circle_id', 'lc.unique_id')
+			   $expr->eq($pf.'circle_id', 'lc.unique_id')
 		   );
 	}
 

lib/Model/Circle.php

Doc Comments +1 added lines, -1 removed lines

@@ -299,7 +299,7 @@
 
 
 	/**
-	 * @param array $members
+	 * @param Member[] $members
 	 *
 	 * @return self
 	 */

Spacing +27 added lines, -27 removed lines

@@ -82,23 +82,23 @@ 
 
 
 	// 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 Circl (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_ROOT = 4096;        // Circle cannot be inside another Circle
-	const CFG_FEDERATED = 8192;   // Federated
+	const CFG_SYSTEM = 4; // System Circl (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_ROOT = 4096; // Circle cannot be inside another Circle
+	const CFG_FEDERATED = 8192; // Federated
 
 
 	public static $DEF_CFG_MAX = 16383;
@@ -628,21 +628,21 @@ 
 	 * @throws CircleNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow {
-		if (!array_key_exists($prefix . 'unique_id', $data)) {
+		if (!array_key_exists($prefix.'unique_id', $data)) {
 			throw new CircleNotFoundException();
 		}
 
-		$this->setId($this->get($prefix . 'unique_id', $data))
-			 ->setName($this->get($prefix . 'name', $data))
-			 ->setAltName($this->get($prefix . 'alt_name', $data))
-			 ->setConfig($this->getInt($prefix . 'config', $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->setId($this->get($prefix.'unique_id', $data))
+			 ->setName($this->get($prefix.'name', $data))
+			 ->setAltName($this->get($prefix.'alt_name', $data))
+			 ->setConfig($this->getInt($prefix.'config', $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()->importOwnerFromDatabase($this, $data);

lib/Service/GSUpstreamService.php

Doc Comments +1 added lines, -2 removed lines

@@ -180,7 +180,6 @@ 
 	/**
 	 * @param GSEvent $event
 	 * @param string $instance
-	 * @param string $protocol
 	 *
 	 * @throws RequestContentException
 	 * @throws RequestNetworkException
@@ -329,7 +328,7 @@ 
 
 
 	/**
-	 * @param array $sync
+	 * @param DeprecatedCircle[] $sync
 	 *
 	 * @throws GSStatusException
 	 */

lib/Command/MembersAdd.php

Spacing +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
 				$instance = $host;
 			}
 
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
 		}
 
 //		if ($userId === '') {

lib/Model/Federated/FederatedEvent.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 	}
 
 	/**
-	 * @param mixed $class
+	 * @param string $class
 	 *
 	 * @return self
 	 */

lib/Model/FederatedUser.php

Spacing +4 added lines, -4 removed lines

@@ -224,10 +224,10 @@
 	 * @return INC21QueryRow
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow {
-		$this->setSingleId($this->get($prefix . 'member_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->setSingleId($this->get($prefix.'member_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));
 
 		return $this;
 	}

lib/Service/FederatedEventService.php

Spacing +3 added lines, -3 removed lines

@@ -238,16 +238,16 @@
 		try {
 			$test = new ReflectionClass($class);
 		} catch (ReflectionException $e) {
-			throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage());
+			throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage());
 		}
 
 		if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) {
-			throw new FederatedEventException($class . ' does not implements IFederatedItem');
+			throw new FederatedEventException($class.' does not implements IFederatedItem');
 		}
 
 		$item = OC::$server->get($class);
 		if (!($item instanceof IFederatedItem)) {
-			throw new FederatedEventException($class . ' not an IFederatedItem');
+			throw new FederatedEventException($class.' not an IFederatedItem');
 		}
 
 		$this->setFederatedEventBypass($event, $item);

lib/Model/Helpers/MemberHelper.php

Spacing +3 added lines, -3 removed lines

@@ -104,7 +104,7 @@ 
 		try {
 			$level = Member::parseLevelString($levelString);
 		} catch (MemberLevelException $e) {
-			throw new MemberHelperException('method ' . $levelString . ' not found');
+			throw new MemberHelperException('method '.$levelString.' not found');
 		}
 
 		$this->mustHaveLevelEqualOrAbove($level);
@@ -122,11 +122,11 @@ 
 		try {
 			$level = Member::parseLevelString($levelString);
 		} catch (MemberLevelException $e) {
-			throw new MemberHelperException('method ' . $levelString . ' not found');
+			throw new MemberHelperException('method '.$levelString.' not found');
 		}
 
 		if ($this->member->getLevel() >= $level) {
-			throw new MemberLevelException('Member cannot be ' . $levelString);
+			throw new MemberLevelException('Member cannot be '.$levelString);
 		}
 	}