Completed
Pull Request — master (#551)
by Maxence
02:35
created
lib/Command/CirclesCreate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@
 block discarded – undo
117 117
 		$owner = $this->federatedUserService->getLocalFederatedUser($ownerId);
118 118
 		$outcome = $this->circleService->create($name, $owner);
119 119
 
120
-		echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n";
120
+		echo json_encode($outcome, JSON_PRETTY_PRINT)."\n";
121 121
 
122 122
 		return 0;
123 123
 	}
Please login to merge, or discard this patch.
lib/Command/MembersAdd.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 		$federatedUser = $this->federatedUserService->generateFederatedUser($userId, (int)$type);
128 128
 		$outcome = $this->memberService->addMember($circleId, $federatedUser);
129 129
 
130
-		echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n";
130
+		echo json_encode($outcome, JSON_PRETTY_PRINT)."\n";
131 131
 
132 132
 		return 0;
133 133
 	}
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 				$instance = $host;
179 179
 			}
180 180
 
181
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
181
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
182 182
 		}
183 183
 
184 184
 //		if ($userId === '') {
Please login to merge, or discard this patch.
lib/Command/CirclesMemberships.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -159,10 +159,10 @@  discard block
 block discarded – undo
159 159
 		$type = Member::parseTypeString($input->getOption('type'));
160 160
 		$federatedUser = $this->federatedUserService->getFederatedUser($userId, (int)$type);
161 161
 
162
-		$output->writeln('UserId: <info>' . $federatedUser->getUserId() . '</info>');
163
-		$output->writeln('Instance: <info>' . $federatedUser->getInstance() . '</info>');
164
-		$output->writeln('UserType: <info>' . Member::$DEF_TYPE[$federatedUser->getUserType()] . '</info>');
165
-		$output->writeln('SingleId: <info>' . $federatedUser->getSingleId() . '</info>');
162
+		$output->writeln('UserId: <info>'.$federatedUser->getUserId().'</info>');
163
+		$output->writeln('Instance: <info>'.$federatedUser->getInstance().'</info>');
164
+		$output->writeln('UserType: <info>'.Member::$DEF_TYPE[$federatedUser->getUserType()].'</info>');
165
+		$output->writeln('SingleId: <info>'.$federatedUser->getSingleId().'</info>');
166 166
 		$output->writeln('');
167 167
 
168 168
 		$tree = new NC21TreeNode(null, new SimpleDataStore(['federatedUser' => $federatedUser]));
@@ -223,14 +223,14 @@  discard block
 block discarded – undo
223 223
 				/** @var FederatedUser $federatedUser */
224 224
 				$federatedUser = $data->gObj('federatedUser', FederatedUser::class);
225 225
 
226
-				return '<info>' . $federatedUser->getSingleId() . '</info>';
226
+				return '<info>'.$federatedUser->getSingleId().'</info>';
227 227
 			}
228 228
 
229 229
 			if ($data->hasKey('member')) {
230 230
 				/** @var Member $member */
231 231
 				$member = $data->gObj('member', Member::class);
232 232
 
233
-				return ' <info>' . $member->getCircleId() . '</info>';
233
+				return ' <info>'.$member->getCircleId().'</info>';
234 234
 			}
235 235
 		} catch (InvalidItemException | ItemNotFoundException | UnknownTypeException $e) {
236 236
 		}
Please login to merge, or discard this patch.
lib/Service/FederatedUserService.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 	public function getLocalFederatedUser(string $userId): FederatedUser {
231 231
 		$user = $this->userManager->get($userId);
232 232
 		if ($user === null) {
233
-			throw new FederatedUserNotFoundException('user ' . $userId . ' not found');
233
+			throw new FederatedUserNotFoundException('user '.$userId.' not found');
234 234
 		}
235 235
 
236 236
 		$federatedUser = new FederatedUser();
@@ -513,7 +513,7 @@  discard block
 block discarded – undo
513 513
 			$circle = new Circle();
514 514
 			$id = $this->token(ManagedModel::ID_LENGTH);
515 515
 
516
-			$circle->setName('single:' . $federatedUser->getUserId() . ':' . $id)
516
+			$circle->setName('single:'.$federatedUser->getUserId().':'.$id)
517 517
 				   ->setId($id)
518 518
 				   ->setConfig(Circle::CFG_SINGLE);
519 519
 			$this->circleRequest->save($circle);
Please login to merge, or discard this patch.
lib/FederatedItems/MemberAdd.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 		} catch (MemberNotFoundException $e) {
170 170
 		}
171 171
 
172
-		$federatedId = $member->getUserId() . '@' . $member->getInstance();
172
+		$federatedId = $member->getUserId().'@'.$member->getInstance();
173 173
 		$federatedUser = $this->federatedUserService->getFederatedUser($federatedId, $member->getUserType());
174 174
 		$member->importFromIFederatedUser($federatedUser);
175 175
 		$member->setId($this->uuid(ManagedModel::ID_LENGTH));
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 			$this->sendMailExistingShares($template, $author, $recipient);
481 481
 			$this->sendPasswordExistingShares($author, $recipient, $password);
482 482
 		} catch (Exception $e) {
483
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
483
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
484 484
 		}
485 485
 	}
486 486
 
@@ -632,7 +632,7 @@  discard block
 block discarded – undo
632 632
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
633 633
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
634 634
 
635
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
635
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
636 636
 
637 637
 		$plainBodyPart = $this->l10n->t(
638 638
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
675 675
 		if ($authorEmail !== null) {
676 676
 			$message->setReplyTo([$authorEmail => $authorName]);
677
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
677
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
678 678
 		} else {
679 679
 			$emailTemplate->addFooter();
680 680
 		}
Please login to merge, or discard this patch.