Completed
Pull Request — master (#2254)
by Konstantin
30s
created
lib/Service/MembershipService.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
 		try {
93 93
 			$this->circleRequest->getFederatedUserBySingleId($singleId);
94
-		} catch (FederatedUserNotFoundException|OwnerNotFoundException $e) {
94
+		} catch (FederatedUserNotFoundException | OwnerNotFoundException $e) {
95 95
 			$this->membershipRequest->removeBySingleId($singleId);
96 96
 		}
97 97
 
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 	 */
243 243
 	private function getChildrenMembers(string $id, array &$knownIds = []): array {
244 244
 		$singleIds = array_map(
245
-			function (Member $item): string {
245
+			function(Member $item): string {
246 246
 				return $item->getSingleId();
247 247
 			}, $this->memberRequest->getMembers($id)
248 248
 		);
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 	 */
267 267
 	private function getChildrenMemberships(string $id, array &$knownIds = []): array {
268 268
 		$singleIds = array_map(
269
-			function (Membership $item): string {
269
+			function(Membership $item): string {
270 270
 				return $item->getSingleId();
271 271
 			}, $this->membershipRequest->getInherited($id)
272 272
 		);
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 	 */
321 321
 	private function removeDeprecatedMemberships(array $memberships, array $known): array {
322 322
 		$circleIds = array_map(
323
-			function (Membership $membership): string {
323
+			function(Membership $membership): string {
324 324
 				return $membership->getCircleId();
325 325
 			}, $memberships
326 326
 		);
Please login to merge, or discard this patch.
lib/Controller/RemoteController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -449,21 +449,21 @@
 block discarded – undo
449 449
 			/** @var FederatedUser $initiator */
450 450
 			$initiator = $store->gObj('initiator', FederatedUser::class);
451 451
 			$this->federatedUserService->setCurrentUser($initiator);
452
-		} catch (InvalidItemException|ItemNotFoundException $e) {
452
+		} catch (InvalidItemException | ItemNotFoundException $e) {
453 453
 		}
454 454
 
455 455
 		try {
456 456
 			/** @var FederatedUser $initiator */
457 457
 			$filterMember = $store->gObj('filterMember', Member::class);
458 458
 			$data->aObj('filterMember', $filterMember);
459
-		} catch (InvalidItemException|ItemNotFoundException $e) {
459
+		} catch (InvalidItemException | ItemNotFoundException $e) {
460 460
 		}
461 461
 
462 462
 		try {
463 463
 			/** @var FederatedUser $initiator */
464 464
 			$filterCircle = $store->gObj('filterCircle', Circle::class);
465 465
 			$data->aObj('filterCircle', $filterCircle);
466
-		} catch (InvalidItemException|ItemNotFoundException $e) {
466
+		} catch (InvalidItemException | ItemNotFoundException $e) {
467 467
 		}
468 468
 
469 469
 		return $data;
Please login to merge, or discard this patch.
lib/Db/MemberRequestBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
 			self::$tables[self::TABLE_MEMBER],
65 65
 			CoreQueryBuilder::MEMBER
66 66
 		)
67
-			->orderBy(CoreQueryBuilder::MEMBER . '.joined');
67
+			->orderBy(CoreQueryBuilder::MEMBER.'.joined');
68 68
 
69 69
 		if ($getBasedOn) {
70 70
 			$qb->leftJoinBasedOn(CoreQueryBuilder::MEMBER, $initiator);
Please login to merge, or discard this patch.
lib/Search/GlobalScaleUsers.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -66,11 +66,11 @@
 block discarded – undo
66 66
 		try {
67 67
 			$users = $this->retrieveJson($request);
68 68
 		} catch (
69
-			RequestNetworkException|
69
+			RequestNetworkException |
70 70
 			RequestResultNotJsonException $e
71 71
 		) {
72 72
 			$this->miscService->log(
73
-				'Issue while search users from lookup: ' . get_class($e) . ' ' . $e->getMessage()
73
+				'Issue while search users from lookup: '.get_class($e).' '.$e->getMessage()
74 74
 			);
75 75
 
76 76
 			return [];
Please login to merge, or discard this patch.
lib/Model/ModelManager.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -333,7 +333,7 @@
 block discarded – undo
333 333
 					$invitedBy = new FederatedUser();
334 334
 					$invitedBy->importFromCircle($invitedByCircle);
335 335
 					$member->setInvitedBy($invitedBy);
336
-				} catch (CircleNotFoundException|OwnerNotFoundException $e) {
336
+				} catch (CircleNotFoundException | OwnerNotFoundException $e) {
337 337
 				}
338 338
 				break;
339 339
 
Please login to merge, or discard this patch.
lib/MountManager/CircleMountProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -218,13 +218,13 @@
 block discarded – undo
218 218
 
219 219
 	private function generateIncrementedMountpoint(Folder $fs, Mount $mount, IFederatedUser $federatedUser): void {
220 220
 		$info = pathinfo($mount->getMountPoint());
221
-		$filename = rtrim($this->get('dirname', $info), '/') . '/' . $this->get('filename', $info);
221
+		$filename = rtrim($this->get('dirname', $info), '/').'/'.$this->get('filename', $info);
222 222
 		$extension = $this->get('extension', $info);
223
-		$extension = ($extension === '') ? '' : '.' . $extension;
223
+		$extension = ($extension === '') ? '' : '.'.$extension;
224 224
 
225 225
 		$n = 2;
226 226
 		while (true) {
227
-			$path = $filename . " ($n)" . $extension;
227
+			$path = $filename." ($n)".$extension;
228 228
 			try {
229 229
 				$fs->get($path);
230 230
 			} catch (NotFoundException) {
Please login to merge, or discard this patch.
lib/Model/Mountpoint.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -63,13 +63,13 @@
 block discarded – undo
63 63
 	}
64 64
 
65 65
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
66
-		if ($this->get($prefix . 'mountpoint', $data) === '') {
66
+		if ($this->get($prefix.'mountpoint', $data) === '') {
67 67
 			throw new MountPointNotFoundException();
68 68
 		}
69 69
 
70
-		$this->setMountId($this->get($prefix . 'mount_id', $data));
71
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
72
-		$this->setMountPoint($this->get($prefix . 'mountpoint', $data));
70
+		$this->setMountId($this->get($prefix.'mount_id', $data));
71
+		$this->setSingleId($this->get($prefix.'single_id', $data));
72
+		$this->setMountPoint($this->get($prefix.'mountpoint', $data));
73 73
 
74 74
 		return $this;
75 75
 	}
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
@@ -116,7 +116,7 @@
 block discarded – undo
116 116
 			return $mountPoint;
117 117
 		}
118 118
 
119
-		return '/' . $this->getInitiator()->getUserId() . '/files/' . ltrim($mountPoint, '/');
119
+		return '/'.$this->getInitiator()->getUserId().'/files/'.ltrim($mountPoint, '/');
120 120
 	}
121 121
 
122 122
 	/**
Please login to merge, or discard this patch.
tests/unit/CirclesManagerTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,12 +72,12 @@
 block discarded – undo
72 72
 
73 73
 		// Created circle returned by probeCircle()
74 74
 		$circles = $this->circlesManager->probeCircles();
75
-		$this->assertCount(1, array_filter($circles, function (Circle $c) { return $c->getName() === $this->circleName; }));
75
+		$this->assertCount(1, array_filter($circles, function(Circle $c) { return $c->getName() === $this->circleName; }));
76 76
 
77 77
 		// Destroyed circle not returned by probeCircle()
78 78
 		$this->circlesManager->destroyCircle($circle->getSingleId());
79 79
 		$circles = $this->circlesManager->probeCircles();
80
-		$this->assertCount(0, array_filter($circles, function (Circle $c) { return $c->getName() === $this->circleName; }));
80
+		$this->assertCount(0, array_filter($circles, function(Circle $c) { return $c->getName() === $this->circleName; }));
81 81
 	}
82 82
 
83 83
 	public function testGetCirclesWithInitiator(): void {
Please login to merge, or discard this patch.