Completed
Pull Request — master (#1995)
by
unknown
33s
created
rector.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@
 block discarded – undo
12 12
 
13 13
 return RectorConfig::configure()
14 14
 	->withPaths([
15
-		__DIR__ . '/appinfo',
16
-		__DIR__ . '/lib',
17
-		__DIR__ . '/tests/unit',
15
+		__DIR__.'/appinfo',
16
+		__DIR__.'/lib',
17
+		__DIR__.'/tests/unit',
18 18
 	])
19 19
 	->withImportNames(importShortClasses: false)
20 20
 	->withSets([
Please login to merge, or discard this patch.
lib/Circles/FileSharingBroadcaster.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 			$this->miscService = Server::get(MiscService::class);
117 117
 		} catch (QueryException $e) {
118 118
 			OC::$server->getLogger()
119
-				->log(1, 'Circles: cannot init FileSharingBroadcaster - ' . $e->getMessage());
119
+				->log(1, 'Circles: cannot init FileSharingBroadcaster - '.$e->getMessage());
120 120
 		}
121 121
 
122 122
 		try {
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 
262 262
 		$allShares = $this->fileSharesRequest->getSharesForCircle($member->getCircleId());
263 263
 		$knownShares = array_map(
264
-			function (SharesToken $shareToken) {
264
+			function(SharesToken $shareToken) {
265 265
 				return $shareToken->getShareId();
266 266
 			},
267 267
 			$this->tokensRequest->getTokensFromMember($member)
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 	 * @throws IllegalIDChangeException
309 309
 	 */
310 310
 	private function generateShare($data): IShare {
311
-		$this->logger->log(0, 'Regenerate shares from payload: ' . json_encode($data));
311
+		$this->logger->log(0, 'Regenerate shares from payload: '.json_encode($data));
312 312
 
313 313
 		$share = new Share($this->rootFolder, $this->userManager);
314 314
 		$share->setId($data['id']);
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
 			$this->sendPasswordByMail($share, $displayName, $email, $password);
402 402
 		} catch (Exception $e) {
403 403
 			OC::$server->getLogger()
404
-				->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
404
+				->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
405 405
 		}
406 406
 	}
407 407
 
@@ -419,8 +419,8 @@  discard block
 block discarded – undo
419 419
 		$message = $this->mailer->createMessage();
420 420
 
421 421
 		$this->logger->log(
422
-			0, "Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
423
-			   . ' - link: ' . $link
422
+			0, "Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
423
+			   . ' - link: '.$link
424 424
 		);
425 425
 
426 426
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
 
459 459
 		$message = $this->mailer->createMessage();
460 460
 
461
-		$this->logger->log(0, "Sending password mail to circle '" . $circleName . "': " . $email);
461
+		$this->logger->log(0, "Sending password mail to circle '".$circleName."': ".$email);
462 462
 
463 463
 		$filename = $share->getNode()
464 464
 			->getName();
@@ -513,7 +513,7 @@  discard block
 block discarded – undo
513 513
 		$message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
514 514
 		if ($initiatorEmailAddress !== null) {
515 515
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
516
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
516
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
517 517
 		} else {
518 518
 			$emailTemplate->addFooter();
519 519
 		}
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
 		$emailTemplate->addHeader();
549 549
 		$emailTemplate->addHeading($subject, false);
550 550
 		$emailTemplate->addBodyText(
551
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
551
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
552 552
 				$this->l10n->t('Click the button below to open it.')
553 553
 			), $text
554 554
 		);
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
 			$this->sendMailExistingShares($template, $author->getCachedName(), $recipient);
595 595
 			$this->sendPasswordExistingShares($author, $recipient, $password);
596 596
 		} catch (Exception $e) {
597
-			$this->logger->log(2, 'Failed to send mail about existing share ' . $e->getMessage());
597
+			$this->logger->log(2, 'Failed to send mail about existing share '.$e->getMessage());
598 598
 		}
599 599
 	}
600 600
 
@@ -617,7 +617,7 @@  discard block
 block discarded – undo
617 617
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
618 618
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
619 619
 
620
-		$this->logger->log(0, "Sending password mail about existing files to '" . $email . "'");
620
+		$this->logger->log(0, "Sending password mail about existing files to '".$email."'");
621 621
 
622 622
 		$plainBodyPart = $this->l10n->t(
623 623
 			"%1\$s shared multiple files with you.\nYou should have already received a separate email with a link to access them.\n",
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
 		$message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
660 660
 		if ($authorEmail !== null) {
661 661
 			$message->setReplyTo([$authorEmail => $authorName]);
662
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
662
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
663 663
 		} else {
664 664
 			$emailTemplate->addFooter();
665 665
 		}
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
 	 */
705 705
 	protected function generateMailExitingShares($author, $circleName) {
706 706
 		$this->logger->log(
707
-			0, "Generating mail about existing share mail from '" . $author . "' in "
707
+			0, "Generating mail about existing share mail from '".$author."' in "
708 708
 			   . $circleName
709 709
 		);
710 710
 
Please login to merge, or discard this patch.
lib/Service/FederatedEventService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -241,16 +241,16 @@  discard block
 block discarded – undo
241 241
 		try {
242 242
 			$test = new ReflectionClass($class);
243 243
 		} catch (ReflectionException $e) {
244
-			throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage());
244
+			throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage());
245 245
 		}
246 246
 
247 247
 		if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) {
248
-			throw new FederatedEventException($class . ' does not implements IFederatedItem');
248
+			throw new FederatedEventException($class.' does not implements IFederatedItem');
249 249
 		}
250 250
 
251 251
 		$item = Server::get($class);
252 252
 		if (!($item instanceof IFederatedItem)) {
253
-			throw new FederatedEventException($class . ' not an IFederatedItem');
253
+			throw new FederatedEventException($class.' not an IFederatedItem');
254 254
 		}
255 255
 
256 256
 		if ($item instanceof IFederatedItemHighSeverity) {
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
 			$knownInstances = $this->memberRequest->getMemberInstances($circle->getSingleId());
449 449
 			$instances = array_filter(
450 450
 				array_map(
451
-					function (RemoteInstance $instance) use ($knownInstances) {
451
+					function(RemoteInstance $instance) use ($knownInstances) {
452 452
 						if (!in_array($instance->getInstance(), $knownInstances)) {
453 453
 							return null;
454 454
 						}
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
 		if ($event->hasMember()
464 464
 			&& !$this->configService->isLocalInstance($event->getMember()->getInstance())) {
465 465
 			$currentInstances = array_map(
466
-				function (RemoteInstance $instance): string {
466
+				function(RemoteInstance $instance): string {
467 467
 					return $instance->getInstance();
468 468
 				}, $instances
469 469
 			);
Please login to merge, or discard this patch.
lib/Model/ShareWrapper.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 			$l10n = Server::get(IFactory::class)->get('circles');
452 452
 			$display = $l10n->t('%s (Team owned by %s)', [$display, $circle->getOwner()->getDisplayName()]);
453 453
 		} else {
454
-			$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';
454
+			$display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')';
455 455
 		}
456 456
 
457 457
 		$share->setSharedWithDisplayName($display);
@@ -541,22 +541,22 @@  discard block
 block discarded – undo
541 541
 
542 542
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
543 543
 		$shareTime = new DateTime();
544
-		$shareTime->setTimestamp($this->getInt($prefix . 'stime', $data));
545
-
546
-		$this->setId($this->get($prefix . 'id', $data))
547
-			->setShareType($this->getInt($prefix . 'share_type', $data))
548
-			->setPermissions($this->getInt($prefix . 'permissions', $data))
549
-			->setItemType($this->get($prefix . 'item_type', $data))
550
-			->setItemSource($this->getInt($prefix . 'item_source', $data))
551
-			->setItemTarget($this->get($prefix . 'item_target', $data))
552
-			->setFileSource($this->getInt($prefix . 'file_source', $data))
553
-			->setFileTarget($this->get($prefix . 'file_target', $data))
554
-			->setSharedWith($this->get($prefix . 'share_with', $data))
555
-			->setSharedBy($this->get($prefix . 'uid_initiator', $data))
556
-			->setShareOwner($this->get($prefix . 'uid_owner', $data))
557
-			->setToken($this->get($prefix . 'token', $data))
544
+		$shareTime->setTimestamp($this->getInt($prefix.'stime', $data));
545
+
546
+		$this->setId($this->get($prefix.'id', $data))
547
+			->setShareType($this->getInt($prefix.'share_type', $data))
548
+			->setPermissions($this->getInt($prefix.'permissions', $data))
549
+			->setItemType($this->get($prefix.'item_type', $data))
550
+			->setItemSource($this->getInt($prefix.'item_source', $data))
551
+			->setItemTarget($this->get($prefix.'item_target', $data))
552
+			->setFileSource($this->getInt($prefix.'file_source', $data))
553
+			->setFileTarget($this->get($prefix.'file_target', $data))
554
+			->setSharedWith($this->get($prefix.'share_with', $data))
555
+			->setSharedBy($this->get($prefix.'uid_initiator', $data))
556
+			->setShareOwner($this->get($prefix.'uid_owner', $data))
557
+			->setToken($this->get($prefix.'token', $data))
558 558
 			->setShareTime($shareTime)
559
-			->setShareNote($this->get($prefix . 'note', $data));
559
+			->setShareNote($this->get($prefix.'note', $data));
560 560
 
561 561
 		$this->importAttributesFromDatabase($this->get('attributes', $data));
562 562
 
@@ -566,9 +566,9 @@  discard block
 block discarded – undo
566 566
 		//			$share->setPassword($this->get('password', $data, ''));
567 567
 		//		}
568 568
 
569
-		$this->setChildId($this->getInt($prefix . 'child_id', $data))
570
-			->setChildFileTarget($this->get($prefix . 'child_file_target', $data))
571
-			->setChildPermissions($this->getInt($prefix . 'child_permissions', $data))
569
+		$this->setChildId($this->getInt($prefix.'child_id', $data))
570
+			->setChildFileTarget($this->get($prefix.'child_file_target', $data))
571
+			->setChildPermissions($this->getInt($prefix.'child_permissions', $data))
572 572
 			->setProviderId(ShareByCircleProvider::IDENTIFIER)
573 573
 			->setStatus(Ishare::STATUS_ACCEPTED);
574 574
 
Please login to merge, or discard this patch.