Completed
Pull Request — master (#439)
by Joas
01:52
created
lib/Model/DavCard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 	 * @return string
147 147
 	 */
148 148
 	public function getUniqueId(): string {
149
-		return $this->getAddressBookId() . '/' . $this->getCardUri();
149
+		return $this->getAddressBookId().'/'.$this->getCardUri();
150 150
 	}
151 151
 
152 152
 
Please login to merge, or discard this patch.
lib/Service/ConfigService.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		if ((!$this->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0)
213 213
 			&& strpos($remote, 'https://') !== 0
214 214
 		) {
215
-			$remote = 'https://' . $remote;
215
+			$remote = 'https://'.$remote;
216 216
 		}
217 217
 
218 218
 		return rtrim($remote, '/');
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
 				return false;
400 400
 			}
401 401
 
402
-			throw new GSStatusException('GS and lookup are not configured : ' . $lookup . ', ' . $enabled);
402
+			throw new GSStatusException('GS and lookup are not configured : '.$lookup.', '.$enabled);
403 403
 		}
404 404
 
405 405
 		$clef = $this->config->getSystemValue('gss.jwt.key', '');
Please login to merge, or discard this patch.
lib/Search/GlobalScaleUsers.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@
 block discarded – undo
98 98
 		RequestServerException |
99 99
 		RequestResultNotJsonException $e
100 100
 		) {
101
-			$this->miscService->log('Issue while retrieving instances from lookup: ' . $e->getMessage());
101
+			$this->miscService->log('Issue while retrieving instances from lookup: '.$e->getMessage());
102 102
 
103 103
 			return [];
104 104
 		}
Please login to merge, or discard this patch.
lib/Circles/FileSharingBroadcaster.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 			$this->miscService = OC::$server->query(MiscService::class);
146 146
 		} catch (QueryException $e) {
147 147
 			OC::$server->getLogger()
148
-					   ->log(1, 'Circles: cannot init FileSharingBroadcaster - ' . $e->getMessage());
148
+					   ->log(1, 'Circles: cannot init FileSharingBroadcaster - '.$e->getMessage());
149 149
 		}
150 150
 
151 151
 		try {
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 	 * @throws IllegalIDChangeException
323 323
 	 */
324 324
 	private function generateShare($data): IShare {
325
-		$this->logger->log(0, 'Regenerate shares from payload: ' . json_encode($data));
325
+		$this->logger->log(0, 'Regenerate shares from payload: '.json_encode($data));
326 326
 
327 327
 		$share = new Share($this->rootFolder, $this->userManager);
328 328
 		$share->setId($data['id']);
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 			);
414 414
 		} catch (Exception $e) {
415 415
 			OC::$server->getLogger()
416
-					   ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
416
+					   ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
417 417
 		}
418 418
 	}
419 419
 
@@ -431,8 +431,8 @@  discard block
 block discarded – undo
431 431
 		$message = $this->mailer->createMessage();
432 432
 
433 433
 		$this->logger->log(
434
-			0, "Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
435
-			   . ' - link: ' . $link
434
+			0, "Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
435
+			   . ' - link: '.$link
436 436
 		);
437 437
 
438 438
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
 
472 472
 		$message = $this->mailer->createMessage();
473 473
 
474
-		$this->logger->log(0, "Sending password mail to circle '" . $circleName . "': " . $email);
474
+		$this->logger->log(0, "Sending password mail to circle '".$circleName."': ".$email);
475 475
 
476 476
 		$filename = $share->getNode()
477 477
 						  ->getName();
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
527 527
 		if ($initiatorEmailAddress !== null) {
528 528
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
529
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
529
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
530 530
 		} else {
531 531
 			$emailTemplate->addFooter();
532 532
 		}
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
 		$emailTemplate->addHeader();
562 562
 		$emailTemplate->addHeading($subject, false);
563 563
 		$emailTemplate->addBodyText(
564
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
564
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
565 565
 				$this->l10n->t('Click the button below to open it.')
566 566
 			), $text
567 567
 		);
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
 			$this->sendMailExistingShares($template, $author, $recipient);
607 607
 			$this->sendPasswordExistingShares($author, $recipient, $password);
608 608
 		} catch (Exception $e) {
609
-			$this->logger->log(2, 'Failed to send mail about existing share ' . $e->getMessage());
609
+			$this->logger->log(2, 'Failed to send mail about existing share '.$e->getMessage());
610 610
 		}
611 611
 	}
612 612
 
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
631 631
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
632 632
 
633
-		$this->logger->log(0, "Sending password mail about existing files to '" . $email . "'");
633
+		$this->logger->log(0, "Sending password mail about existing files to '".$email."'");
634 634
 
635 635
 		$plainBodyPart = $this->l10n->t(
636 636
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
673 673
 		if ($authorEmail !== null) {
674 674
 			$message->setReplyTo([$authorEmail => $authorName]);
675
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
675
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
676 676
 		} else {
677 677
 			$emailTemplate->addFooter();
678 678
 		}
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 	 */
720 720
 	protected function generateMailExitingShares($author, $circleName) {
721 721
 		$this->logger->log(
722
-			0, "Generating mail about existing share mail from '" . $author . "' in "
722
+			0, "Generating mail about existing share mail from '".$author."' in "
723 723
 			   . $circleName
724 724
 		);
725 725
 
Please login to merge, or discard this patch.
lib/AppInfo/Application.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 use OCP\AppFramework\QueryException;
41 41
 use OCP\Util;
42 42
 
43
-require_once __DIR__ . '/../../appinfo/autoload.php';
43
+require_once __DIR__.'/../../appinfo/autoload.php';
44 44
 
45 45
 
46 46
 class Application extends App {
Please login to merge, or discard this patch.
lib/Controller/GlobalScaleController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
 			$wrappers = $this->gsUpstreamService->getEventsByToken($token);
92 92
 		} catch (Exception $e) {
93 93
 			$this->miscService->log(
94
-				'exception during async: ' . ['token' => $token, 'error' => $e->getMessage()]
94
+				'exception during async: '.['token' => $token, 'error' => $e->getMessage()]
95 95
 			);
96 96
 			$this->fail(['token' => $token, 'error' => $e->getMessage()]);
97 97
 		}
Please login to merge, or discard this patch.
appinfo/app.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 use OCA\Circles\AppInfo\Application;
32 32
 
33 33
 
34
-require_once __DIR__ . '/autoload.php';
34
+require_once __DIR__.'/autoload.php';
35 35
 
36 36
 
37 37
 /** @var Application $app */
Please login to merge, or discard this patch.
lib/GlobalScale/GlobalSync.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
 				}
117 117
 
118 118
 				$this->miscService->log(
119
-					'updating member :' . json_encode($member) . ' from ' . json_encode($knownMember), 2
119
+					'updating member :'.json_encode($member).' from '.json_encode($knownMember), 2
120 120
 				);
121 121
 				$this->membersRequest->updateMember($member);
122 122
 			} catch (MemberDoesNotExistException $e) {
123 123
 				try {
124 124
 					$this->miscService->log(
125
-						'creating member :' . json_encode($member), 2
125
+						'creating member :'.json_encode($member), 2
126 126
 					);
127 127
 					$this->membersRequest->createMember($member);
128 128
 				} catch (MemberAlreadyExistsException $e) {
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 			try {
141 141
 				$this->getMember($knownItem, $circle->getMembers(), $source);
142 142
 			} catch (MemberDoesNotExistException $e) {
143
-				$this->miscService->log('removing deprecated member :' . json_encode($knownItem), 2);
143
+				$this->miscService->log('removing deprecated member :'.json_encode($knownItem), 2);
144 144
 				$this->membersRequest->removeMember($knownItem);
145 145
 				$this->gsSharesRequest->removeGSSharesFromMember($knownItem);
146 146
 			}
Please login to merge, or discard this patch.
lib/Controller/SharesController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	 */
132 132
 	public function create($circleUniqueId, $source, $type, $payload) {
133 133
 
134
-		$this->miscService->log('Creating circle share: ' . $circleUniqueId, 0);
134
+		$this->miscService->log('Creating circle share: '.$circleUniqueId, 0);
135 135
 
136 136
 		try {
137 137
 			$share = new SharingFrame($source, $type);
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 
140 140
 			$this->sharingFrameService->createFrame($circleUniqueId, $share);
141 141
 		} catch (\Exception $e) {
142
-			$this->miscService->log('Failed to create circle - ' . $e->getMessage(), 3);
142
+			$this->miscService->log('Failed to create circle - '.$e->getMessage(), 3);
143 143
 			return $this->fail(
144 144
 				[
145 145
 					'circle_id' => $circleUniqueId,
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 			);
152 152
 		}
153 153
 
154
-		$this->miscService->log('Created circle: share ' . $circleUniqueId, 0);
154
+		$this->miscService->log('Created circle: share '.$circleUniqueId, 0);
155 155
 
156 156
 		return $this->success(
157 157
 			[
Please login to merge, or discard this patch.