Completed
Pull Request — master (#602)
by Maxence
02:45
created
lib/Service/SyncService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -280,7 +280,7 @@
 block discarded – undo
280 280
 	 */
281 281
 	public function groupDeleted(string $groupId): void {
282 282
 		$circle = new Circle();
283
-		$circle->setName('group:' . $groupId)
283
+		$circle->setName('group:'.$groupId)
284 284
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
285 285
 			   ->setSource(Member::TYPE_GROUP);
286 286
 
Please login to merge, or discard this patch.
lib/Service/FederatedUserService.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 	public function getLocalFederatedUser(string $userId): FederatedUser {
321 321
 		$user = $this->userManager->get($userId);
322 322
 		if ($user === null) {
323
-			throw new FederatedUserNotFoundException('user ' . $userId . ' not found');
323
+			throw new FederatedUserNotFoundException('user '.$userId.' not found');
324 324
 		}
325 325
 
326 326
 		$federatedUser = new FederatedUser();
@@ -721,7 +721,7 @@  discard block
 block discarded – undo
721 721
 			$prefix = ($federatedUser->getUserType() === Member::TYPE_APP) ? 'app'
722 722
 				: Member::$TYPE[$federatedUser->getUserType()];
723 723
 
724
-			$circle->setName($prefix . ':' . $federatedUser->getUserId() . ':' . $id)
724
+			$circle->setName($prefix.':'.$federatedUser->getUserId().':'.$id)
725 725
 				   ->setDisplayName($this->getLocalDisplayName($federatedUser))
726 726
 				   ->setSingleId($id)
727 727
 				   ->setSource($source);
@@ -851,7 +851,7 @@  discard block
 block discarded – undo
851 851
 		$owner = $this->getCurrentApp();
852 852
 
853 853
 		$circle = new Circle();
854
-		$circle->setName('group:' . $groupId)
854
+		$circle->setName('group:'.$groupId)
855 855
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
856 856
 			   ->setSingleId($this->token(ManagedModel::ID_LENGTH))
857 857
 			   ->setSource(Member::TYPE_GROUP);
Please login to merge, or discard this patch.
lib/Controller/LocalController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -194,7 +194,7 @@
 block discarded – undo
194 194
 					throw new OCSException('works only from local instance', 404);
195 195
 				}
196 196
 
197
-				$userId = $currentUser->getUserId() . '/' . $userId;
197
+				$userId = $currentUser->getUserId().'/'.$userId;
198 198
 			}
199 199
 
200 200
 			$federatedUser = $this->federatedUserService->generateFederatedUser($userId, $type);
Please login to merge, or discard this patch.
lib/Listeners/Files/MemberAdded.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,8 +74,8 @@
 block discarded – undo
74 74
 			$result[$instance] = $item->gData('files');
75 75
 		}
76 76
 
77
-		\OC::$server->getLogger()->log(3, 'FILES: ' . json_encode($result));
78
-		\OC::$server->getLogger()->log(3, 'MAILS: ' . json_encode($federatedUsers));
77
+		\OC::$server->getLogger()->log(3, 'FILES: '.json_encode($result));
78
+		\OC::$server->getLogger()->log(3, 'MAILS: '.json_encode($federatedUsers));
79 79
 	}
80 80
 
81 81
 }
Please login to merge, or discard this patch.
lib/MountManager/CircleMountManager.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
 	 * @return string
110 110
 	 */
111 111
 	protected function stripPath($path) {
112
-		$prefix = '/' . $this->userId . '/files';
112
+		$prefix = '/'.$this->userId.'/files';
113 113
 
114 114
 		return rtrim(substr($path, strlen($prefix)), '/');
115 115
 	}
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
@@ -325,10 +325,10 @@  discard block
 block discarded – undo
325 325
 	protected function generateMember(Circle $circle, Member $member): Member {
326 326
 		try {
327 327
 			if ($member->getSingleId() !== '') {
328
-				$userId = $member->getSingleId() . '@' . $member->getInstance();
328
+				$userId = $member->getSingleId().'@'.$member->getInstance();
329 329
 				$federatedUser = $this->federatedUserService->getFederatedUser($userId, Member::TYPE_SINGLE);
330 330
 			} else {
331
-				$userId = $member->getUserId() . '@' . $member->getInstance();
331
+				$userId = $member->getUserId().'@'.$member->getInstance();
332 332
 				$federatedUser =
333 333
 					$this->federatedUserService->getFederatedUser($userId, $member->getUserType());
334 334
 			}
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
 			$this->sendMailExistingShares($template, $author, $recipient);
602 602
 			$this->sendPasswordExistingShares($author, $recipient, $password);
603 603
 		} catch (Exception $e) {
604
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
604
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
605 605
 		}
606 606
 	}
607 607
 
@@ -753,7 +753,7 @@  discard block
 block discarded – undo
753 753
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
754 754
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
755 755
 
756
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
756
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
757 757
 
758 758
 		$plainBodyPart = $this->l10n->t(
759 759
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -795,7 +795,7 @@  discard block
 block discarded – undo
795 795
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
796 796
 		if ($authorEmail !== null) {
797 797
 			$message->setReplyTo([$authorEmail => $authorName]);
798
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
798
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
799 799
 		} else {
800 800
 			$emailTemplate->addFooter();
801 801
 		}
Please login to merge, or discard this patch.
lib/Model/FederatedUser.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -394,14 +394,14 @@
 block discarded – undo
394 394
 	 * @throws FederatedUserNotFoundException
395 395
 	 */
396 396
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
397
-		if ($this->get($prefix . 'single_id', $data) === '') {
397
+		if ($this->get($prefix.'single_id', $data) === '') {
398 398
 			throw new FederatedUserNotFoundException();
399 399
 		}
400 400
 
401
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
402
-		$this->setUserId($this->get($prefix . 'user_id', $data));
403
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
404
-		$this->setInstance($this->get($prefix . 'instance', $data));
401
+		$this->setSingleId($this->get($prefix.'single_id', $data));
402
+		$this->setUserId($this->get($prefix.'user_id', $data));
403
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
404
+		$this->setInstance($this->get($prefix.'instance', $data));
405 405
 
406 406
 		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);
407 407
 
Please login to merge, or discard this patch.
lib/Model/Mount.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -190,7 +190,7 @@
 block discarded – undo
190 190
 			return $this->mountPoint;
191 191
 		}
192 192
 
193
-		return '/' . $this->getInitiator()->getUserId() . '/files/' . ltrim($this->mountPoint, '/');
193
+		return '/'.$this->getInitiator()->getUserId().'/files/'.ltrim($this->mountPoint, '/');
194 194
 	}
195 195
 
196 196
 	/**
Please login to merge, or discard this patch.
lib/Model/FileCacheWrapper.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -504,29 +504,29 @@
 block discarded – undo
504 504
 	 * @throws FileCacheNotFoundException
505 505
 	 */
506 506
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
507
-		if ($this->getInt($prefix . 'fileid', $data) === 0) {
507
+		if ($this->getInt($prefix.'fileid', $data) === 0) {
508 508
 			throw new FileCacheNotFoundException();
509 509
 		}
510 510
 
511
-		$this->setId($this->getInt($prefix . 'fileid', $data));
512
-		$this->setPath($this->get($prefix . 'path', $data));
513
-		$this->setPermissions($this->getInt($prefix . 'permissions', $data));
514
-		$this->setStorageId($this->getInt($prefix . 'storage', $data));
515
-		$this->setPathHash($this->get($prefix . 'path_hash', $data));
516
-		$this->setParent($this->getInt($prefix . 'parent', $data));
517
-		$this->setName($this->get($prefix . 'name', $data));
518
-		$this->setMimeType($this->getInt($prefix . 'mimetype', $data));
519
-		$this->setMimePart($this->getInt($prefix . 'mimepart', $data));
520
-		$this->setSize($this->getInt($prefix . 'size', $data));
521
-		$this->setMTime($this->getInt($prefix . 'mtime', $data));
522
-		$this->setStorageMTime($this->getInt($prefix . 'storage_mtime', $data));
523
-		$this->setEncrypted($this->getBool($prefix . 'encrypted', $data));
524
-		$this->setUnencryptedSize($this->getInt($prefix . 'unencrypted_size', $data));
525
-		$this->setEtag($this->get($prefix . 'etag', $data));
526
-		$this->setChecksum($this->get($prefix . 'checksum', $data));
511
+		$this->setId($this->getInt($prefix.'fileid', $data));
512
+		$this->setPath($this->get($prefix.'path', $data));
513
+		$this->setPermissions($this->getInt($prefix.'permissions', $data));
514
+		$this->setStorageId($this->getInt($prefix.'storage', $data));
515
+		$this->setPathHash($this->get($prefix.'path_hash', $data));
516
+		$this->setParent($this->getInt($prefix.'parent', $data));
517
+		$this->setName($this->get($prefix.'name', $data));
518
+		$this->setMimeType($this->getInt($prefix.'mimetype', $data));
519
+		$this->setMimePart($this->getInt($prefix.'mimepart', $data));
520
+		$this->setSize($this->getInt($prefix.'size', $data));
521
+		$this->setMTime($this->getInt($prefix.'mtime', $data));
522
+		$this->setStorageMTime($this->getInt($prefix.'storage_mtime', $data));
523
+		$this->setEncrypted($this->getBool($prefix.'encrypted', $data));
524
+		$this->setUnencryptedSize($this->getInt($prefix.'unencrypted_size', $data));
525
+		$this->setEtag($this->get($prefix.'etag', $data));
526
+		$this->setChecksum($this->get($prefix.'checksum', $data));
527 527
 
528 528
 		// small hack as there is no reason to call a recursive method for a single entry from the table
529
-		$this->setStorage($this->get($prefix . CoreQueryBuilder::STORAGES . '_id', $data));
529
+		$this->setStorage($this->get($prefix.CoreQueryBuilder::STORAGES.'_id', $data));
530 530
 
531 531
 		return $this;
532 532
 	}
Please login to merge, or discard this patch.