Completed
Pull Request — master (#609)
by Maxence
02:47
created
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/Model/Federated/EventWrapper.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,6 @@
 block discarded – undo
37 37
 use daita\MySmallPhpTools\Model\SimpleDataStore;
38 38
 use daita\MySmallPhpTools\Traits\TArrayTools;
39 39
 use JsonSerializable;
40
-use OCA\Circles\Exceptions\UnknownInterfaceException;
41 40
 
42 41
 
43 42
 /**
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
@@ -152,7 +152,7 @@
 block discarded – undo
152 152
 	 */
153 153
 	public function retry() {
154 154
 		$tokens = $this->getFailedEvents();
155
-		echo json_encode($tokens) . "\n";
155
+		echo json_encode($tokens)."\n";
156 156
 		foreach ($tokens as $token) {
157 157
 			$this->confirmStatus($token, true);
158 158
 		}
Please login to merge, or discard this patch.
lib/Service/ConfigService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 			return $value;
176 176
 		}
177 177
 
178
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
178
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
179 179
 			return $value;
180 180
 		}
181 181
 
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 		}
430 430
 
431 431
 		if (array_key_exists('port', $loopback)) {
432
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
432
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
433 433
 		} else {
434 434
 			$loopbackCloudId = $loopback['host'];
435 435
 		}
@@ -458,12 +458,12 @@  discard block
 block discarded – undo
458 458
 			$scheme = $this->getAppValue(self::LOOPBACK_CLOUD_SCHEME);
459 459
 		}
460 460
 
461
-		$base = $scheme . '://' . $instance;
461
+		$base = $scheme.'://'.$instance;
462 462
 		if ($route === '') {
463 463
 			return $base;
464 464
 		}
465 465
 
466
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
466
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
467 467
 	}
468 468
 
469 469
 
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
 			return '';
564 564
 		}
565 565
 
566
-		return (($showAt) ? '@' : '') . $instance;
566
+		return (($showAt) ? '@' : '').$instance;
567 567
 	}
568 568
 
569 569
 
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/FederatedItems/SingleMemberAdd.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -331,10 +331,10 @@  discard block
 block discarded – undo
331 331
 	protected function generateMember(FederatedEvent $event, Circle $circle, Member $member): Member {
332 332
 		try {
333 333
 			if ($member->getSingleId() !== '') {
334
-				$userId = $member->getSingleId() . '@' . $member->getInstance();
334
+				$userId = $member->getSingleId().'@'.$member->getInstance();
335 335
 				$federatedUser = $this->federatedUserService->getFederatedUser($userId, Member::TYPE_SINGLE);
336 336
 			} else {
337
-				$userId = $member->getUserId() . '@' . $member->getInstance();
337
+				$userId = $member->getUserId().'@'.$member->getInstance();
338 338
 				$federatedUser =
339 339
 					$this->federatedUserService->getFederatedUser($userId, $member->getUserType());
340 340
 			}
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
 			$this->sendMailExistingShares($template, $author, $recipient);
639 639
 			$this->sendPasswordExistingShares($author, $recipient, $password);
640 640
 		} catch (Exception $e) {
641
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
641
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
642 642
 		}
643 643
 	}
644 644
 
@@ -790,7 +790,7 @@  discard block
 block discarded – undo
790 790
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
791 791
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
792 792
 
793
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
793
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
794 794
 
795 795
 		$plainBodyPart = $this->l10n->t(
796 796
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -832,7 +832,7 @@  discard block
 block discarded – undo
832 832
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
833 833
 		if ($authorEmail !== null) {
834 834
 			$message->setReplyTo([$authorEmail => $authorName]);
835
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
835
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
836 836
 		} else {
837 837
 			$emailTemplate->addFooter();
838 838
 		}
Please login to merge, or discard this patch.