Completed
Pull Request — master (#866)
by Maxence
44s
created
lib/Service/FederatedUserService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 		if ($check) {
479 479
 			$user = $this->userManager->get($userId);
480 480
 			if ($user === null) {
481
-				throw new FederatedUserNotFoundException('user ' . $userId . ' not found');
481
+				throw new FederatedUserNotFoundException('user '.$userId.' not found');
482 482
 			}
483 483
 			$userId = $user->getUID();
484 484
 			$displayName = $user->getDisplayName();
@@ -953,7 +953,7 @@  discard block
 block discarded – undo
953 953
 			$prefix = ($federatedUser->getUserType() === Member::TYPE_APP) ? 'app'
954 954
 				: Member::$TYPE[$federatedUser->getUserType()];
955 955
 
956
-			$circle->setName($prefix . ':' . $federatedUser->getUserId() . ':' . $id)
956
+			$circle->setName($prefix.':'.$federatedUser->getUserId().':'.$id)
957 957
 				   ->setDisplayName($federatedUser->getDisplayName())
958 958
 				   ->setSingleId($id)
959 959
 				   ->setSource($source);
@@ -1157,7 +1157,7 @@  discard block
 block discarded – undo
1157 1157
 		$owner = $this->getCurrentApp();
1158 1158
 
1159 1159
 		$circle = new Circle();
1160
-		$circle->setName('group:' . $groupId)
1160
+		$circle->setName('group:'.$groupId)
1161 1161
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
1162 1162
 			   ->setSingleId($this->token(ManagedModel::ID_LENGTH))
1163 1163
 			   ->setSource(Member::TYPE_GROUP);
@@ -1223,8 +1223,8 @@  discard block
 block discarded – undo
1223 1223
 	 * @return string
1224 1224
 	 */
1225 1225
 	private function generateCacheKey(FederatedUser $federatedUser): string {
1226
-		return $federatedUser->getInstance() . '#'
1227
-			   . $federatedUser->getUserType() . '#'
1226
+		return $federatedUser->getInstance().'#'
1227
+			   . $federatedUser->getUserType().'#'
1228 1228
 			   . $federatedUser->getUserId();
1229 1229
 	}
1230 1230
 }
Please login to merge, or discard this patch.
lib/Model/ShareToken.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -281,17 +281,17 @@
 block discarded – undo
281 281
 	 * @throws ShareTokenNotFoundException
282 282
 	 */
283 283
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
284
-		if ($this->get($prefix . 'token', $data) === '') {
284
+		if ($this->get($prefix.'token', $data) === '') {
285 285
 			throw new ShareTokenNotFoundException();
286 286
 		}
287 287
 
288
-		$this->setShareId($this->getInt($prefix . 'share_id', $data));
289
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
290
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
291
-		$this->setMemberId($this->get($prefix . 'member_id', $data));
292
-		$this->setToken($this->get($prefix . 'token', $data));
293
-		$this->setPassword($this->get($prefix . 'password', $data));
294
-		$this->setAccepted($this->getInt($prefix . 'accepted', $data, IShare::STATUS_PENDING));
288
+		$this->setShareId($this->getInt($prefix.'share_id', $data));
289
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
290
+		$this->setSingleId($this->get($prefix.'single_id', $data));
291
+		$this->setMemberId($this->get($prefix.'member_id', $data));
292
+		$this->setToken($this->get($prefix.'token', $data));
293
+		$this->setPassword($this->get($prefix.'password', $data));
294
+		$this->setAccepted($this->getInt($prefix.'accepted', $data, IShare::STATUS_PENDING));
295 295
 
296 296
 		return $this;
297 297
 	}
Please login to merge, or discard this patch.