nextcloud / circles

lib/Db/MembersRequest.php

Doc Comments +4 added lines, -1 removed lines

@@ -316,7 +316,7 @@ 
 	 * returns the index of a specific UserID in a Members List
 	 *
 	 * @param array $members
-	 * @param $userId
+	 * @param string $userId
 	 *
 	 * @return int
 	 */
@@ -656,6 +656,9 @@ 
 	}
 
 
+	/**
+	 * @param string $groupId
+	 */
 	public function unlinkAllFromGroup($groupId) {
 		$qb = $this->getMembersDeleteSql();
 

lib/Db/CirclesRequestBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -243,7 +243,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = '' . $this->default_select_alias . '.';
+		$pf = ''.$this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('u.user_id', 'viewer_userid')
@@ -255,7 +255,7 @@ 
 		   ->leftJoin(
 			   $this->default_select_alias, CoreRequestBuilder::TABLE_MEMBERS, 'u',
 			   $expr->andX(
-				   $expr->eq('u.circle_id', $pf . 'unique_id'),
+				   $expr->eq('u.circle_id', $pf.'unique_id'),
 				   $expr->eq('u.user_id', $qb->createNamedParameter($userId)),
 				   $expr->eq('u.instance', $qb->createNamedParameter($instanceId)),
 				   $expr->eq('u.user_type', $qb->createNamedParameter($type))
@@ -277,7 +277,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('o.user_id', 'owner_userid')
@@ -287,7 +287,7 @@ 
 		   ->leftJoin(
 			   $this->default_select_alias, CoreRequestBuilder::TABLE_MEMBERS, 'o',
 			   $expr->andX(
-				   $expr->eq('o.circle_id', $pf . 'unique_id'),
+				   $expr->eq('o.circle_id', $pf.'unique_id'),
 				   $expr->eq('o.level', $qb->createNamedParameter(Member::LEVEL_OWNER)),
 				   $expr->eq('o.user_type', $qb->createNamedParameter(Member::TYPE_USER))
 			   )

lib/Db/CoreRequestBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -344,8 +344,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;
 		}
@@ -373,7 +373,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;
@@ -388,12 +388,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(Member::STATUS_MEMBER)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
 
 		$qb->andWhere($orX);
 	}
@@ -406,8 +406,8 @@ 
 	 */
 	private 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)));
 	}
 
 
@@ -418,8 +418,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)));
 	}
 
 
@@ -434,9 +434,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 {
@@ -459,7 +459,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -467,7 +467,7 @@ 
 		   ->selectAlias('lc.settings', 'circle_settings')
 		   ->leftJoin(
 			   $this->default_select_alias, CoreRequestBuilder::TABLE_CIRCLES, 'lc',
-			   $expr->eq($pf . 'circle_id', 'lc.unique_id')
+			   $expr->eq($pf.'circle_id', 'lc.unique_id')
 		   );
 	}
 

lib/Service/GSUpstreamService.php

Doc Comments +1 added lines, -1 removed lines

@@ -354,7 +354,7 @@
 
 
 	/**
-	 * @param array $circles
+	 * @param Circle[] $circles
 	 */
 	public function synchronizeCircles(array $circles): void {
 		$event = new GSEvent(GSEvent::GLOBAL_SYNC, true);

Spacing +4 added lines, -4 removed lines

@@ -145,12 +145,12 @@ 
 			} else {
 //				$gs->verify($event); // needed ? as we check event on the 'master' of the circle
 				$this->confirmEvent($event);
-				$this->miscService->log('confirmed: ' . json_encode($event));
+				$this->miscService->log('confirmed: '.json_encode($event));
 //				$gs->manage($event); // needed ? as we manage it throw the confirmEvent
 			}
 		} catch (Exception $e) {
 			$this->miscService->log(
-				get_class($e) . ' on new event: ' . $e->getMessage() . ' - ' . json_encode($event), 1
+				get_class($e).' on new event: '.$e->getMessage().' - '.json_encode($event), 1
 			);
 			throw $e;
 		}
@@ -239,13 +239,13 @@ 
 		$request->setDataSerialize($event);
 
 		$result = $this->retrieveJson($request);
-		$this->miscService->log('result ' . json_encode($result));
+		$this->miscService->log('result '.json_encode($result));
 		if ($this->getInt('status', $result) === 0) {
 			throw new GlobalScaleEventException($this->get('error', $result));
 		}
 
 		$updatedData = $this->getArray('event', $result);
-		$this->miscService->log('updatedEvent: ' . json_encode($updatedData));
+		$this->miscService->log('updatedEvent: '.json_encode($updatedData));
 		if (!empty($updatedData)) {
 			$updated = new GSEvent();
 			try {

lib/Service/GlobalScaleService.php

Spacing +5 added lines, -5 removed lines

@@ -167,12 +167,12 @@ 
 		try {
 			$gs = OC::$server->query($class);
 			if (!$gs instanceof AGlobalScaleEvent) {
-				throw new GlobalScaleEventException($class . ' not an AGlobalScaleEvent');
+				throw new GlobalScaleEventException($class.' not an AGlobalScaleEvent');
 			}
 
 			return $gs;
 		} catch (QueryException $e) {
-			throw new GlobalScaleEventException('AGlobalScaleEvent ' . $class . ' not found');
+			throw new GlobalScaleEventException('AGlobalScaleEvent '.$class.' not found');
 		}
 	}
 
@@ -188,7 +188,7 @@ 
 			$key = $this->configService->getSystemValue('instanceid');
 		}
 
-		return md5('gskey:' . $key);
+		return md5('gskey:'.$key);
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 				$instances = $this->retrieveJson($request);
 			} catch (RequestContentException | RequestNetworkException | RequestResultSizeException | RequestServerException | RequestResultNotJsonException $e) {
 				$this->miscService->log(
-					'Issue while retrieving instances from lookup: ' . get_class($e) . ' ' . $e->getMessage()
+					'Issue while retrieving instances from lookup: '.get_class($e).' '.$e->getMessage()
 				);
 
 				return [];
@@ -260,7 +260,7 @@ 
 		$className = $event->getType();
 		if (substr($className, 0, 25) !== '\OCA\Circles\GlobalScale\\' || strpos($className, '.')) {
 			throw new GlobalScaleEventException(
-				$className . ' does not seems to be a secured AGlobalScaleEvent'
+				$className.' does not seems to be a secured AGlobalScaleEvent'
 			);
 		}
 

lib/GlobalScale/MemberAdd.php

Spacing +3 added lines, -3 removed lines

@@ -177,7 +177,7 @@ 
 			$this->sendMailExistingShares($template, $author, $recipient);
 			$this->sendPasswordExistingShares($author, $recipient, $password);
 		} catch (Exception $e) {
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
 		}
 	}
 
@@ -327,7 +327,7 @@ 
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
 
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
 
 		$plainBodyPart = $this->l10n->t(
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -369,7 +369,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($authorEmail !== null) {
 			$message->setReplyTo([$authorEmail => $authorName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}

lib/Search/GlobalScaleUsers.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 		RequestServerException |
 		RequestResultNotJsonException $e
 		) {
-			$this->miscService->log('Issue while retrieving instances from lookup: ' . get_class($e) . ' ' . $e->getMessage());
+			$this->miscService->log('Issue while retrieving instances from lookup: '.get_class($e).' '.$e->getMessage());
 
 			return [];
 		}