Completed
Pull Request — master (#629)
by Maxence
03:04
created
lib/Model/Federated/FederatedEvent.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	}
134 134
 
135 135
 	/**
136
-	 * @param mixed $class
136
+	 * @param string $class
137 137
 	 *
138 138
 	 * @return self
139 139
 	 */
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
 
455 455
 	/**
456 456
 	 * @param string $key
457
-	 * @param array $result
457
+	 * @param \OCA\Circles\Model\ShareWrapper[] $result
458 458
 	 *
459 459
 	 * @return $this
460 460
 	 */
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
@@ -251,16 +251,16 @@
 block discarded – undo
251 251
 		try {
252 252
 			$test = new ReflectionClass($class);
253 253
 		} catch (ReflectionException $e) {
254
-			throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage());
254
+			throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage());
255 255
 		}
256 256
 
257 257
 		if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) {
258
-			throw new FederatedEventException($class . ' does not implements IFederatedItem');
258
+			throw new FederatedEventException($class.' does not implements IFederatedItem');
259 259
 		}
260 260
 
261 261
 		$item = OC::$server->get($class);
262 262
 		if (!($item instanceof IFederatedItem)) {
263
-			throw new FederatedEventException($class . ' not an IFederatedItem');
263
+			throw new FederatedEventException($class.' not an IFederatedItem');
264 264
 		}
265 265
 
266 266
 		if ($item instanceof IFederatedItemHighSeverity) {
Please login to merge, or discard this patch.
lib/GlobalScale/MemberAdd.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 			$this->sendMailExistingShares($template, $author, $recipient);
243 243
 			$this->sendPasswordExistingShares($author, $recipient, $password);
244 244
 		} catch (Exception $e) {
245
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
245
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
246 246
 		}
247 247
 	}
248 248
 
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
393 393
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
394 394
 
395
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
395
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
396 396
 
397 397
 		$plainBodyPart = $this->l10n->t(
398 398
 			"%1\$s shared multiple files with you.\nYou should have already received a separate email with a link to access them.\n",
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
435 435
 		if ($authorEmail !== null) {
436 436
 			$message->setReplyTo([$authorEmail => $authorName]);
437
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
437
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
438 438
 		} else {
439 439
 			$emailTemplate->addFooter();
440 440
 		}
Please login to merge, or discard this patch.
lib/Model/Member.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -811,29 +811,29 @@  discard block
 block discarded – undo
811 811
 	 * @throws MemberNotFoundException
812 812
 	 */
813 813
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
814
-		if ($this->get($prefix . 'single_id', $data) === '') {
814
+		if ($this->get($prefix.'single_id', $data) === '') {
815 815
 			throw new MemberNotFoundException();
816 816
 		}
817 817
 
818
-		$this->setId($this->get($prefix . 'member_id', $data));
819
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
820
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
821
-		$this->setUserId($this->get($prefix . 'user_id', $data));
822
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
823
-		$this->setInstance($this->get($prefix . 'instance', $data));
824
-		$this->setLevel($this->getInt($prefix . 'level', $data));
825
-		$this->setStatus($this->get($prefix . 'status', $data));
826
-		$this->setDisplayName($this->get($prefix . 'cached_name', $data));
827
-		$this->setNotes($this->getArray($prefix . 'note', $data));
828
-		$this->setContactId($this->get($prefix . 'contact_id', $data));
829
-		$this->setContactMeta($this->get($prefix . 'contact_meta', $data));
830
-
831
-		$cachedUpdate = $this->get($prefix . 'cached_update', $data);
818
+		$this->setId($this->get($prefix.'member_id', $data));
819
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
820
+		$this->setSingleId($this->get($prefix.'single_id', $data));
821
+		$this->setUserId($this->get($prefix.'user_id', $data));
822
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
823
+		$this->setInstance($this->get($prefix.'instance', $data));
824
+		$this->setLevel($this->getInt($prefix.'level', $data));
825
+		$this->setStatus($this->get($prefix.'status', $data));
826
+		$this->setDisplayName($this->get($prefix.'cached_name', $data));
827
+		$this->setNotes($this->getArray($prefix.'note', $data));
828
+		$this->setContactId($this->get($prefix.'contact_id', $data));
829
+		$this->setContactMeta($this->get($prefix.'contact_meta', $data));
830
+
831
+		$cachedUpdate = $this->get($prefix.'cached_update', $data);
832 832
 		if ($cachedUpdate !== '') {
833 833
 			$this->setDisplayUpdate(DateTime::createFromFormat('Y-m-d H:i:s', $cachedUpdate)->getTimestamp());
834 834
 		}
835 835
 
836
-		$joined = $this->get($prefix . 'joined', $data);
836
+		$joined = $this->get($prefix.'joined', $data);
837 837
 		if ($joined !== '') {
838 838
 			$this->setJoined(DateTime::createFromFormat('Y-m-d H:i:s', $joined)->getTimestamp());
839 839
 		}
@@ -924,7 +924,7 @@  discard block
 block discarded – undo
924 924
 	public static function parseLevelInt(int $level): int {
925 925
 		if (!array_key_exists($level, self::$DEF_LEVEL)) {
926 926
 			$all = implode(', ', array_keys(self::$DEF_LEVEL));
927
-			throw new ParseMemberLevelException('Available levels: ' . $all, 121);
927
+			throw new ParseMemberLevelException('Available levels: '.$all, 121);
928 928
 		}
929 929
 
930 930
 		return $level;
@@ -943,7 +943,7 @@  discard block
 block discarded – undo
943 943
 
944 944
 		if (!$level) {
945 945
 			$all = implode(', ', array_values(self::$DEF_LEVEL));
946
-			throw new ParseMemberLevelException('Available levels: ' . $all, 121);
946
+			throw new ParseMemberLevelException('Available levels: '.$all, 121);
947 947
 		}
948 948
 
949 949
 		return (int)$level;
@@ -964,7 +964,7 @@  discard block
 block discarded – undo
964 964
 		$type = array_search($typeString, Member::$TYPE);
965 965
 		if ($type === false) {
966 966
 			$all = implode(', ', array_values(self::$TYPE));
967
-			throw new UserTypeNotFoundException('Available types: ' . $all);
967
+			throw new UserTypeNotFoundException('Available types: '.$all);
968 968
 		}
969 969
 
970 970
 		return (int)$type;
Please login to merge, or discard this patch.
lib/Service/ConfigService.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 			return $value;
177 177
 		}
178 178
 
179
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
179
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
180 180
 			return $value;
181 181
 		}
182 182
 
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
 		}
431 431
 
432 432
 		if (array_key_exists('port', $loopback)) {
433
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
433
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
434 434
 		} else {
435 435
 			$loopbackCloudId = $loopback['host'];
436 436
 		}
@@ -459,12 +459,12 @@  discard block
 block discarded – undo
459 459
 			$scheme = $this->getAppValue(self::LOOPBACK_CLOUD_SCHEME);
460 460
 		}
461 461
 
462
-		$base = $scheme . '://' . $instance;
462
+		$base = $scheme.'://'.$instance;
463 463
 		if ($route === '') {
464 464
 			return $base;
465 465
 		}
466 466
 
467
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
467
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
468 468
 	}
469 469
 
470 470
 
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
 	 * @return string
562 562
 	 */
563 563
 	public function displayFederatedUser(IFederatedUser $federatedUser): string {
564
-		return $federatedUser->getUserId() . $this->displayInstance($federatedUser->getInstance(), true);
564
+		return $federatedUser->getUserId().$this->displayInstance($federatedUser->getInstance(), true);
565 565
 	}
566 566
 
567 567
 	/**
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
 			return '';
576 576
 		}
577 577
 
578
-		return (($showAt) ? '@' : '') . $instance;
578
+		return (($showAt) ? '@' : '').$instance;
579 579
 	}
580 580
 
581 581
 
Please login to merge, or discard this patch.
lib/CirclesManager.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -83,7 +83,6 @@
 block discarded – undo
83 83
 	/**
84 84
 	 * CirclesManager constructor.
85 85
 	 *
86
-	 * @param IUserSession $userSession
87 86
 	 * @param FederatedUserService $federatedUserService
88 87
 	 * @param CircleService $circleService
89 88
 	 * @param MemberService $memberService
Please login to merge, or discard this patch.
lib/Service/MaintenanceService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -169,7 +169,7 @@
 block discarded – undo
169 169
 	 */
170 170
 	private function output(string $message): void {
171 171
 		if (!is_null($this->output)) {
172
-			$this->output->writeln('- ' . $message);
172
+			$this->output->writeln('- '.$message);
173 173
 		}
174 174
 	}
175 175
 
Please login to merge, or discard this patch.
lib/Model/FederatedUser.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -400,15 +400,15 @@
 block discarded – undo
400 400
 	 * @throws FederatedUserNotFoundException
401 401
 	 */
402 402
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
403
-		if ($this->get($prefix . 'single_id', $data) === '') {
403
+		if ($this->get($prefix.'single_id', $data) === '') {
404 404
 			throw new FederatedUserNotFoundException();
405 405
 		}
406 406
 
407
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
408
-		$this->setUserId($this->get($prefix . 'user_id', $data));
409
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
410
-		$this->setDisplayName($this->get($prefix . 'cached_name', $data));
411
-		$this->setInstance($this->get($prefix . 'instance', $data));
407
+		$this->setSingleId($this->get($prefix.'single_id', $data));
408
+		$this->setUserId($this->get($prefix.'user_id', $data));
409
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
410
+		$this->setDisplayName($this->get($prefix.'cached_name', $data));
411
+		$this->setInstance($this->get($prefix.'instance', $data));
412 412
 
413 413
 		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);
414 414
 
Please login to merge, or discard this patch.
lib/Model/Federated/RemoteInstance.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -50,11 +50,11 @@  discard block
 block discarded – undo
50 50
 
51 51
 	use TArrayTools;
52 52
 
53
-	const TYPE_UNKNOWN = 'Unknown';    // not trusted
54
-	const TYPE_PASSIVE = 'Passive';    // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
55
-	const TYPE_EXTERNAL = 'External';  // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
56
-	const TYPE_TRUSTED = 'Trusted';    // everything about Federated Circles are broadcasted.
57
-	const TYPE_GLOBALSCALE = 'GlobalScale';  // every Circle is broadcasted,
53
+	const TYPE_UNKNOWN = 'Unknown'; // not trusted
54
+	const TYPE_PASSIVE = 'Passive'; // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
55
+	const TYPE_EXTERNAL = 'External'; // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
56
+	const TYPE_TRUSTED = 'Trusted'; // everything about Federated Circles are broadcasted.
57
+	const TYPE_GLOBALSCALE = 'GlobalScale'; // every Circle is broadcasted,
58 58
 
59 59
 	public static $LIST_TYPE = [
60 60
 		self::TYPE_UNKNOWN,
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
 		];
478 478
 
479 479
 		if ($this->getAuthSigned() !== '') {
480
-			$data['auth-signed'] = $this->getAlgorithm() . ':' . $this->getAuthSigned();
480
+			$data['auth-signed'] = $this->getAlgorithm().':'.$this->getAuthSigned();
481 481
 		}
482 482
 
483 483
 		if (!empty($this->getAliases())) {
@@ -496,17 +496,17 @@  discard block
 block discarded – undo
496 496
 	 * @throws RemoteNotFoundException
497 497
 	 */
498 498
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
499
-		if ($this->getInt($prefix . 'id', $data) === 0) {
499
+		if ($this->getInt($prefix.'id', $data) === 0) {
500 500
 			throw new RemoteNotFoundException();
501 501
 		}
502 502
 
503
-		$this->setDbId($this->getInt($prefix . 'id', $data));
504
-		$this->import($this->getArray($prefix . 'item', $data));
505
-		$this->setOrigData($this->getArray($prefix . 'item', $data));
506
-		$this->setType($this->get($prefix . 'type', $data));
507
-		$this->setInterface($this->getInt($prefix . 'interface', $data));
508
-		$this->setInstance($this->get($prefix . 'instance', $data));
509
-		$this->setId($this->get($prefix . 'href', $data));
503
+		$this->setDbId($this->getInt($prefix.'id', $data));
504
+		$this->import($this->getArray($prefix.'item', $data));
505
+		$this->setOrigData($this->getArray($prefix.'item', $data));
506
+		$this->setType($this->get($prefix.'type', $data));
507
+		$this->setInterface($this->getInt($prefix.'interface', $data));
508
+		$this->setInstance($this->get($prefix.'instance', $data));
509
+		$this->setId($this->get($prefix.'href', $data));
510 510
 
511 511
 		return $this;
512 512
 	}
Please login to merge, or discard this patch.