Completed
Pull Request — master (#903)
by Thomas
59s
created
lib/Service/EventsService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@
 block discarded – undo
143 143
 			$event->setSubject('circle_create', ['circle' => json_encode($circle)]);
144 144
 
145 145
 			$this->userManager->callForSeenUsers(
146
-				function ($user) use ($event) {
146
+				function($user) use ($event) {
147 147
 					/** @var IUser $user */
148 148
 					$this->publishEvent($event, [$user]);
149 149
 				}
Please login to merge, or discard this patch.
lib/Service/EventWrapperService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@
 block discarded – undo
174 174
 	 */
175 175
 	private function getFailedEvents(array $retryRange): array {
176 176
 		$token = array_map(
177
-			function (EventWrapper $event): string {
177
+			function(EventWrapper $event): string {
178 178
 				return $event->getToken();
179 179
 			}, $this->eventWrapperRequest->getFailedEvents($retryRange)
180 180
 		);
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
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 			$this->miscService = OC::$server->query(MiscService::class);
137 137
 		} catch (QueryException $e) {
138 138
 			OC::$server->getLogger()
139
-					   ->log(1, 'Circles: cannot init FileSharingBroadcaster - ' . $e->getMessage());
139
+					   ->log(1, 'Circles: cannot init FileSharingBroadcaster - '.$e->getMessage());
140 140
 		}
141 141
 
142 142
 		try {
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 
282 282
 		$allShares = $this->fileSharesRequest->getSharesForCircle($member->getCircleId());
283 283
 		$knownShares = array_map(
284
-			function (SharesToken $shareToken) {
284
+			function(SharesToken $shareToken) {
285 285
 				return $shareToken->getShareId();
286 286
 			},
287 287
 			$this->tokensRequest->getTokensFromMember($member)
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
 	 * @throws IllegalIDChangeException
329 329
 	 */
330 330
 	private function generateShare($data): IShare {
331
-		$this->logger->log(0, 'Regenerate shares from payload: ' . json_encode($data));
331
+		$this->logger->log(0, 'Regenerate shares from payload: '.json_encode($data));
332 332
 
333 333
 		$share = new Share($this->rootFolder, $this->userManager);
334 334
 		$share->setId($data['id']);
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 			$this->sendPasswordByMail($share, $displayName, $email, $password);
422 422
 		} catch (Exception $e) {
423 423
 			OC::$server->getLogger()
424
-					   ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
424
+					   ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
425 425
 		}
426 426
 	}
427 427
 
@@ -439,8 +439,8 @@  discard block
 block discarded – undo
439 439
 		$message = $this->mailer->createMessage();
440 440
 
441 441
 		$this->logger->log(
442
-			0, "Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
443
-			   . ' - link: ' . $link
442
+			0, "Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
443
+			   . ' - link: '.$link
444 444
 		);
445 445
 
446 446
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
 
480 480
 		$message = $this->mailer->createMessage();
481 481
 
482
-		$this->logger->log(0, "Sending password mail to circle '" . $circleName . "': " . $email);
482
+		$this->logger->log(0, "Sending password mail to circle '".$circleName."': ".$email);
483 483
 
484 484
 		$filename = $share->getNode()
485 485
 						  ->getName();
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
535 535
 		if ($initiatorEmailAddress !== null) {
536 536
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
537
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
537
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
538 538
 		} else {
539 539
 			$emailTemplate->addFooter();
540 540
 		}
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
 		$emailTemplate->addHeader();
570 570
 		$emailTemplate->addHeading($subject, false);
571 571
 		$emailTemplate->addBodyText(
572
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
572
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
573 573
 				$this->l10n->t('Click the button below to open it.')
574 574
 			), $text
575 575
 		);
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
615 615
 			$this->sendMailExistingShares($template, $author->getCachedName(), $recipient);
616 616
 			$this->sendPasswordExistingShares($author, $recipient, $password);
617 617
 		} catch (Exception $e) {
618
-			$this->logger->log(2, 'Failed to send mail about existing share ' . $e->getMessage());
618
+			$this->logger->log(2, 'Failed to send mail about existing share '.$e->getMessage());
619 619
 		}
620 620
 	}
621 621
 
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
639 639
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
640 640
 
641
-		$this->logger->log(0, "Sending password mail about existing files to '" . $email . "'");
641
+		$this->logger->log(0, "Sending password mail about existing files to '".$email."'");
642 642
 
643 643
 		$plainBodyPart = $this->l10n->t(
644 644
 			"%1\$s shared multiple files with you.\nYou should have already received a separate email with a link to access them.\n",
@@ -680,7 +680,7 @@  discard block
 block discarded – undo
680 680
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
681 681
 		if ($authorEmail !== null) {
682 682
 			$message->setReplyTo([$authorEmail => $authorName]);
683
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
683
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
684 684
 		} else {
685 685
 			$emailTemplate->addFooter();
686 686
 		}
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
 	 */
726 726
 	protected function generateMailExitingShares($author, $circleName) {
727 727
 		$this->logger->log(
728
-			0, "Generating mail about existing share mail from '" . $author . "' in "
728
+			0, "Generating mail about existing share mail from '".$author."' in "
729 729
 			   . $circleName
730 730
 		);
731 731
 
Please login to merge, or discard this patch.
lib/GlobalScale/FileShare.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -85,14 +85,14 @@  discard block
 block discarded – undo
85 85
 			$node = $share->getNode();
86 86
 			$filename = $node->getName();
87 87
 		} catch (NotFoundException $e) {
88
-			$this->miscService->log('issue while FileShare: ' . $e->getMessage());
88
+			$this->miscService->log('issue while FileShare: '.$e->getMessage());
89 89
 
90 90
 			return;
91 91
 		}
92 92
 
93 93
 		$event->getData()
94 94
 			  ->s('gs_federated', $share->getToken())
95
-			  ->s('gs_filename', '/' . $filename);
95
+			  ->s('gs_filename', '/'.$filename);
96 96
 	}
97 97
 
98 98
 
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 			);
259 259
 		} catch (Exception $e) {
260 260
 			OC::$server->getLogger()
261
-					   ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
261
+					   ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
262 262
 		}
263 263
 	}
264 264
 
@@ -276,8 +276,8 @@  discard block
 block discarded – undo
276 276
 		$message = $this->mailer->createMessage();
277 277
 
278 278
 		$this->miscService->log(
279
-			"Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
280
-			. ' - link: ' . $link, 0
279
+			"Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
280
+			. ' - link: '.$link, 0
281 281
 		);
282 282
 
283 283
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 
317 317
 		$message = $this->mailer->createMessage();
318 318
 
319
-		$this->miscService->log("Sending password mail to circle '" . $circleName . "': " . $email, 0);
319
+		$this->miscService->log("Sending password mail to circle '".$circleName."': ".$email, 0);
320 320
 
321 321
 		$filename = $share->getNode()
322 322
 						  ->getName();
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
372 372
 		if ($initiatorEmailAddress !== null) {
373 373
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
374
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
374
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
375 375
 		} else {
376 376
 			$emailTemplate->addFooter();
377 377
 		}
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 		$emailTemplate->addHeader();
407 407
 		$emailTemplate->addHeading($subject, false);
408 408
 		$emailTemplate->addBodyText(
409
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
409
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
410 410
 				$this->l10n->t('Click the button below to open it.')
411 411
 			), $text
412 412
 		);
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 		);
430 430
 
431 431
 		return array_map(
432
-			function (DeprecatedMember $member) {
432
+			function(DeprecatedMember $member) {
433 433
 				return $member->getUserId();
434 434
 			}, $members
435 435
 		);
Please login to merge, or discard this patch.
lib/GlobalScale/MemberAdd.php 1 patch
Spacing   +4 added lines, -4 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
 
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 	private function getUnknownShares(DeprecatedMember $member): array {
278 278
 		$allShares = $this->fileSharesRequest->getSharesForCircle($member->getCircleId());
279 279
 		$knownShares = array_map(
280
-			function (SharesToken $shareToken) {
280
+			function(SharesToken $shareToken) {
281 281
 				return $shareToken->getShareId();
282 282
 			},
283 283
 			$this->tokensRequest->getTokensFromMember($member)
@@ -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/Db/DeprecatedMembersRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -227,7 +227,7 @@
 block discarded – undo
227 227
 			if ($force === false) {
228 228
 				if (!$viewer->isLevel(DeprecatedMember::LEVEL_MODERATOR)) {
229 229
 					array_map(
230
-						function (DeprecatedMember $m) {
230
+						function(DeprecatedMember $m) {
231 231
 							$m->setNote('');
232 232
 						}, $members
233 233
 					);
Please login to merge, or discard this patch.
lib/ShareByCircleProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
 
460 460
 		return array_filter(
461 461
 			array_map(
462
-				function (ShareWrapper $wrapper) {
462
+				function(ShareWrapper $wrapper) {
463 463
 					return $wrapper->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
464 464
 				}, $wrappedShares
465 465
 			)
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
511 511
 
512 512
 		return array_filter(
513 513
 			array_map(
514
-				function (ShareWrapper $wrapper) {
514
+				function(ShareWrapper $wrapper) {
515 515
 					return $wrapper->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
516 516
 				}, $wrappedShares
517 517
 			)
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 
556 556
 		return array_filter(
557 557
 			array_map(
558
-				function (ShareWrapper $wrapper) {
558
+				function(ShareWrapper $wrapper) {
559 559
 					return $wrapper->getShare(
560 560
 						$this->rootFolder, $this->userManager, $this->urlGenerator, true
561 561
 					);
Please login to merge, or discard this patch.
lib/Listeners/Examples/ExampleAddingCircleMember.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -85,35 +85,35 @@
 block discarded – undo
85 85
 
86 86
 		$eventType = ($event->getType() === CircleGenericEvent::INVITED) ? 'invited' : 'joined';
87 87
 
88
-		$info = 'A new member have been added (' . $eventType . ') to a Circle. ';
88
+		$info = 'A new member have been added ('.$eventType.') to a Circle. ';
89 89
 
90
-		$info .= 'userId: ' . $member->getUserId() . '; userType: ' . Member::$TYPE[$member->getUserType()]
91
-				 . '; singleId: ' . $member->getSingleId() . '; memberId: ' . $member->getId()
92
-				 . '; isLocal: ' . json_encode($member->isLocal()) . '; level: '
93
-				 . Member::$DEF_LEVEL[$member->getLevel()] . '; ';
90
+		$info .= 'userId: '.$member->getUserId().'; userType: '.Member::$TYPE[$member->getUserType()]
91
+				 . '; singleId: '.$member->getSingleId().'; memberId: '.$member->getId()
92
+				 . '; isLocal: '.json_encode($member->isLocal()).'; level: '
93
+				 . Member::$DEF_LEVEL[$member->getLevel()].'; ';
94 94
 
95 95
 		$memberships = array_map(
96
-			function (Membership $membership) {
96
+			function(Membership $membership) {
97 97
 				return $membership->getCircleId();
98 98
 			}, $circle->getMemberships()
99 99
 		);
100 100
 
101 101
 		$listMemberships = (count($memberships) > 0) ? implode(', ', $memberships) : 'none';
102
-		$info .= 'circleName: ' . $circle->getDisplayName() . '; circleId: ' . $circle->getSingleId()
103
-				 . '; Circle memberships: ' . $listMemberships . '.';
102
+		$info .= 'circleName: '.$circle->getDisplayName().'; circleId: '.$circle->getSingleId()
103
+				 . '; Circle memberships: '.$listMemberships.'.';
104 104
 
105 105
 		if ($member->getUserType() === Member::TYPE_CIRCLE) {
106 106
 			$basedOn = $member->getBasedOn();
107 107
 			$members = array_map(
108
-				function (Member $member) {
109
-					return $member->getUserId() . ' (' . Member::$TYPE[$member->getUserType()] . ')';
108
+				function(Member $member) {
109
+					return $member->getUserId().' ('.Member::$TYPE[$member->getUserType()].')';
110 110
 				}, $basedOn->getInheritedMembers()
111 111
 			);
112 112
 
113
-			$info .= ' Member is a Circle (singleId: ' . $basedOn->getSingleId()
114
-					 . ') that contains those inherited members: ' . implode(', ', $members);
113
+			$info .= ' Member is a Circle (singleId: '.$basedOn->getSingleId()
114
+					 . ') that contains those inherited members: '.implode(', ', $members);
115 115
 		}
116 116
 
117
-		$this->log(3, $prefix . $info);
117
+		$this->log(3, $prefix.$info);
118 118
 	}
119 119
 }
Please login to merge, or discard this patch.
lib/Listeners/Examples/ExampleMembershipsRemoved.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 		$prefix = '[Example Event] (ExampleMembershipsRemoved) ';
93 93
 
94 94
 		$memberships = array_map(
95
-			function (Membership $membership) {
95
+			function(Membership $membership) {
96 96
 				$inheritance = ($membership->getInheritanceDepth() > 1) ?
97 97
 					'an inherited member' : 'a direct member';
98 98
 				try {
@@ -100,15 +100,15 @@  discard block
 block discarded – undo
100 100
 				} catch (Exception $e) {
101 101
 					$this->e($e);
102 102
 
103
-					return $membership->getSingleId() . ' is not ' . $inheritance . ' of '
104
-						   . $membership->getCircleId() . ' anymore';
103
+					return $membership->getSingleId().' is not '.$inheritance.' of '
104
+						   . $membership->getCircleId().' anymore';
105 105
 				}
106 106
 
107
-				return $federatedUser->getUserId() . ' (' . Member::$TYPE[$federatedUser->getUserType()]
108
-					   . ') is not ' . $inheritance . ' of ' . $membership->getCircleId() . ' anymore';
107
+				return $federatedUser->getUserId().' ('.Member::$TYPE[$federatedUser->getUserType()]
108
+					   . ') is not '.$inheritance.' of '.$membership->getCircleId().' anymore';
109 109
 			}, $event->getMemberships()
110 110
 		);
111 111
 
112
-		$this->log(3, $prefix . implode('. ', $memberships));
112
+		$this->log(3, $prefix.implode('. ', $memberships));
113 113
 	}
114 114
 }
Please login to merge, or discard this patch.