Completed
Pull Request — master (#551)
by Maxence
03:07
created
lib/Model/Federated/FederatedEvent.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
 	}
112 112
 
113 113
 	/**
114
-	 * @param mixed $class
114
+	 * @param string $class
115 115
 	 *
116 116
 	 * @return self
117 117
 	 */
Please login to merge, or discard this patch.
lib/Model/FederatedUser.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -224,10 +224,10 @@
 block discarded – undo
224 224
 	 * @return INC21QueryRow
225 225
 	 */
226 226
 	public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow {
227
-		$this->setSingleId($this->get($prefix . 'member_id', $data));
228
-		$this->setUserId($this->get($prefix . 'user_id', $data));
229
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
230
-		$this->setInstance($this->get($prefix . 'instance', $data));
227
+		$this->setSingleId($this->get($prefix.'member_id', $data));
228
+		$this->setUserId($this->get($prefix.'user_id', $data));
229
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
230
+		$this->setInstance($this->get($prefix.'instance', $data));
231 231
 
232 232
 		return $this;
233 233
 	}
Please login to merge, or discard this patch.
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->createLocalFederatedUser($ownerId);
118 118
 		$circle = $this->circleService->create($name, $owner);
119 119
 
120
-		echo json_encode($circle, JSON_PRETTY_PRINT) . "\n";
120
+		echo json_encode($circle, JSON_PRETTY_PRINT)."\n";
121 121
 
122 122
 		return 0;
123 123
 	}
Please login to merge, or discard this patch.
lib/FederatedItems/MemberAdd.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 			$this->sendMailExistingShares($template, $author, $recipient);
178 178
 			$this->sendPasswordExistingShares($author, $recipient, $password);
179 179
 		} catch (Exception $e) {
180
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
180
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
181 181
 		}
182 182
 	}
183 183
 
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
328 328
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
329 329
 
330
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
330
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
331 331
 
332 332
 		$plainBodyPart = $this->l10n->t(
333 333
 			"%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 @@  discard block
 block discarded – undo
369 369
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
370 370
 		if ($authorEmail !== null) {
371 371
 			$message->setReplyTo([$authorEmail => $authorName]);
372
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
372
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
373 373
 		} else {
374 374
 			$emailTemplate->addFooter();
375 375
 		}
Please login to merge, or discard this patch.
lib/Service/FederatedEventService.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -238,16 +238,16 @@
 block discarded – undo
238 238
 		try {
239 239
 			$test = new ReflectionClass($class);
240 240
 		} catch (ReflectionException $e) {
241
-			throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage());
241
+			throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage());
242 242
 		}
243 243
 
244 244
 		if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) {
245
-			throw new FederatedEventException($class . ' does not implements IFederatedItem');
245
+			throw new FederatedEventException($class.' does not implements IFederatedItem');
246 246
 		}
247 247
 
248 248
 		$item = OC::$server->get($class);
249 249
 		if (!($item instanceof IFederatedItem)) {
250
-			throw new FederatedEventException($class . ' not an IFederatedItem');
250
+			throw new FederatedEventException($class.' not an IFederatedItem');
251 251
 		}
252 252
 
253 253
 		$this->setFederatedEventBypass($event, $item);
Please login to merge, or discard this patch.
lib/Command/MembersAdd.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -119,12 +119,12 @@  discard block
 block discarded – undo
119 119
 		$userType = $input->getOption('type');
120 120
 
121 121
 		//
122
-		$this->federatedUserService->commandLineInitiator($input->getOption('initiator'), $circleId,  false);
122
+		$this->federatedUserService->commandLineInitiator($input->getOption('initiator'), $circleId, false);
123 123
 
124 124
 		$member = $this->federatedUserService->createFederatedUser($userId, (int)$userType);
125 125
 		$outcome = $this->memberService->addMember($circleId, $member);
126 126
 
127
-		echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n";
127
+		echo json_encode($outcome, JSON_PRETTY_PRINT)."\n";
128 128
 
129 129
 		return 0;
130 130
 	}
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 				$instance = $host;
176 176
 			}
177 177
 
178
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
178
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
179 179
 		}
180 180
 
181 181
 //		if ($userId === '') {
Please login to merge, or discard this patch.
lib/Model/Helpers/MemberHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 		try {
105 105
 			$level = Member::parseLevelString($levelString);
106 106
 		} catch (MemberLevelException $e) {
107
-			throw new MemberHelperException('method ' . $levelString . ' not found');
107
+			throw new MemberHelperException('method '.$levelString.' not found');
108 108
 		}
109 109
 
110 110
 		$this->mustHaveLevelEqualOrAbove($level);
@@ -122,11 +122,11 @@  discard block
 block discarded – undo
122 122
 		try {
123 123
 			$level = Member::parseLevelString($levelString);
124 124
 		} catch (MemberLevelException $e) {
125
-			throw new MemberHelperException('method ' . $levelString . ' not found');
125
+			throw new MemberHelperException('method '.$levelString.' not found');
126 126
 		}
127 127
 
128 128
 		if ($this->member->getLevel() >= $level) {
129
-			throw new MemberLevelException('Member cannot be ' . $levelString);
129
+			throw new MemberLevelException('Member cannot be '.$levelString);
130 130
 		}
131 131
 	}
132 132
 
Please login to merge, or discard this patch.
lib/Command/MembersLevel.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
 		$level = Member::parseLevelString($input->getArgument('level'));
109 109
 		$outcome = $this->memberService->memberLevel($memberId, $level);
110 110
 
111
-		echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n";
111
+		echo json_encode($outcome, JSON_PRETTY_PRINT)."\n";
112 112
 
113 113
 		return 0;
114 114
 	}
Please login to merge, or discard this patch.
lib/Command/MembersRemove.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
 
107 107
 		$outcome = $this->memberService->removeMember($memberId);
108 108
 
109
-		echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n";
109
+		echo json_encode($outcome, JSON_PRETTY_PRINT)."\n";
110 110
 
111 111
 		return 0;
112 112
 	}
Please login to merge, or discard this patch.