nextcloud / circles

lib/Service/CircleService.php

Doc Comments +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 	 * @param string $name
 	 * @param FederatedUser|null $owner
 	 *
-	 * @return Circle
+	 * @return SimpleDataStore
 	 * @throws FederatedEventException
 	 * @throws InitiatorNotConfirmedException
 	 * @throws InitiatorNotFoundException

lib/Model/Member.php

Spacing +18 added lines, -18 removed lines

@@ -549,29 +549,29 @@ 
 	 * @throws MemberNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow {
-		if (!array_key_exists($prefix . 'member_id', $data)) {
+		if (!array_key_exists($prefix.'member_id', $data)) {
 			throw new MemberNotFoundException();
 		}
 
-		$this->setId($this->get($prefix . 'member_id', $data));
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
-		$this->setSingleId($this->get($prefix . 'single_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->setLevel($this->getInt($prefix . 'level', $data));
-		$this->setStatus($this->get($prefix . 'status', $data));
-		$this->setCachedName($this->get($prefix . 'cached_name', $data));
-		$this->setNote($this->get($prefix . 'note', $data));
-		$this->setContactId($this->get($prefix . 'contact_id', $data));
-		$this->setContactMeta($this->get($prefix . 'contact_meta', $data));
-
-		$cachedUpdate = $this->get($prefix . 'cached_update', $data);
+		$this->setId($this->get($prefix.'member_id', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
+		$this->setSingleId($this->get($prefix.'single_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->setLevel($this->getInt($prefix.'level', $data));
+		$this->setStatus($this->get($prefix.'status', $data));
+		$this->setCachedName($this->get($prefix.'cached_name', $data));
+		$this->setNote($this->get($prefix.'note', $data));
+		$this->setContactId($this->get($prefix.'contact_id', $data));
+		$this->setContactMeta($this->get($prefix.'contact_meta', $data));
+
+		$cachedUpdate = $this->get($prefix.'cached_update', $data);
 		if ($cachedUpdate !== '') {
 			$this->setCachedUpdate(DateTime::createFromFormat('Y-m-d H:i:s', $cachedUpdate)->getTimestamp());
 		}
 
-		$joined = $this->get($prefix . 'joined', $data);
+		$joined = $this->get($prefix.'joined', $data);
 		if ($joined !== '') {
 			$this->setJoined(DateTime::createFromFormat('Y-m-d H:i:s', $joined)->getTimestamp());
 		}
@@ -600,7 +600,7 @@ 
 
 		if (!$level) {
 			$all = implode(', ', array_values(self::$DEF_LEVEL));
-			throw new MemberLevelException('Available levels: ' . $all);
+			throw new MemberLevelException('Available levels: '.$all);
 		}
 
 		return (int)$level;
@@ -618,7 +618,7 @@ 
 
 		if (!$type) {
 			$all = implode(', ', array_values(self::$DEF_TYPE));
-			throw new UserTypeNotFoundException('Available types: ' . $all);
+			throw new UserTypeNotFoundException('Available types: '.$all);
 		}
 
 		return (int)$type;

lib/Command/MembersAdd.php

Spacing +2 added lines, -2 removed lines

@@ -127,7 +127,7 @@ 
 
 		$outcome = $this->memberService->addMember($circleId, $member);
 
-		echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n";
+		echo json_encode($outcome, JSON_PRETTY_PRINT)."\n";
 
 		return 0;
 	}
@@ -178,7 +178,7 @@ 
 				$instance = $host;
 			}
 
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
 		}
 
 //		if ($userId === '') {

lib/Command/CirclesCreate.php

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 		$owner = $this->federatedUserService->createLocalFederatedUser($ownerId);
 		$outcome = $this->circleService->create($name, $owner);
 
-		echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n";
+		echo json_encode($outcome, JSON_PRETTY_PRINT)."\n";
 
 		return 0;
 	}

lib/Service/FederatedUserService.php

Spacing +4 added lines, -4 removed lines

@@ -216,7 +216,7 @@ 
 	public function createLocalFederatedUser(string $userId): FederatedUser {
 		$user = $this->userManager->get($userId);
 		if ($user === null) {
-			throw new FederatedUserNotFoundException('user ' . $userId . ' not found');
+			throw new FederatedUserNotFoundException('user '.$userId.' not found');
 		}
 
 		$federatedUser = new FederatedUser();
@@ -395,7 +395,7 @@ 
 			$circle = new Circle();
 			$id = $this->token(ManagedModel::ID_LENGTH);
 
-			$circle->setName('single:' . $federatedUser->getUserId() . ':' . $id)
+			$circle->setName('single:'.$federatedUser->getUserId().':'.$id)
 				   ->setId($id)
 				   ->setConfig(Circle::CFG_SINGLE);
 			$this->circleRequest->save($circle);
@@ -491,8 +491,8 @@ 
 
 		$last = $this->generateMemberships($federatedUser);
 
-		echo 'known: ' . json_encode($federatedUser->getMemberships()) . "\n";
-		echo 'last: ' . json_encode($last) . "\n";
+		echo 'known: '.json_encode($federatedUser->getMemberships())."\n";
+		echo 'last: '.json_encode($last)."\n";
 
 //
 //		$circles = $this->circleRequest->getCircles(null, $viewer);