Completed
Pull Request — master (#1829)
by
unknown
35s
created
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.
lib/Service/MaintenanceService.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -44,9 +44,9 @@  discard block
 block discarded – undo
44 44
 	public const TIMEOUT = 18000;
45 45
 	public static $DELAY =
46 46
 		[
47
-			1 => 60,    // every minute
48
-			2 => 300,   // every 5 minutes
49
-			3 => 3600,  // every hour
47
+			1 => 60, // every minute
48
+			2 => 300, // every 5 minutes
49
+			3 => 3600, // every hour
50 50
 			4 => 75400, // every day
51 51
 			5 => 432000 // evey week
52 52
 		];
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 		$this->federatedUserService->bypassCurrentUserCondition(true);
97 97
 
98 98
 		$this->lockMaintenanceRun();
99
-		$this->debug('running maintenance (' . $level . ')');
99
+		$this->debug('running maintenance ('.$level.')');
100 100
 
101 101
 		switch ($level) {
102 102
 			case 1:
@@ -289,14 +289,14 @@  discard block
 block discarded – undo
289 289
 			->includeSystemCircles();
290 290
 
291 291
 		$circles = array_map(
292
-			function (Circle $circle) {
292
+			function(Circle $circle) {
293 293
 				return $circle->getSingleId();
294 294
 			}, $this->circleRequest->getCircles(null, $probe)
295 295
 		);
296 296
 
297 297
 		$shares = array_unique(
298 298
 			array_map(
299
-				function (ShareWrapper $share) {
299
+				function(ShareWrapper $share) {
300 300
 					return $share->getSharedWith();
301 301
 				}, $this->shareWrapperRequest->getShares()
302 302
 			)
@@ -438,6 +438,6 @@  discard block
 block discarded – undo
438 438
 	 * @param string $message
439 439
 	 */
440 440
 	private function output(string $message): void {
441
-		$this->output?->writeln('- ' . $message);
441
+		$this->output?->writeln('- '.$message);
442 442
 	}
443 443
 }
Please login to merge, or discard this patch.
lib/AppInfo/Capabilities.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -160,7 +160,7 @@
 block discarded – undo
160 160
 			return [];
161 161
 		}
162 162
 		$providerIds = array_map(
163
-			function (ServiceRegistration $registration) {
163
+			function(ServiceRegistration $registration) {
164 164
 				/** @var ITeamResourceProvider $provider */
165 165
 				$provider = $this->container->get($registration->getService());
166 166
 				return $provider->getId();
Please login to merge, or discard this patch.
lib/CirclesQueryHelper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 			$aliasMembership,
153 153
 			$expr->andX(
154 154
 				$this->queryBuilder->exprLimit('single_id', $federatedUser->getSingleId(), $aliasMembership),
155
-				$expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field)
155
+				$expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field)
156 156
 			)
157 157
 		);
158 158
 	}
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 		$circle = new Circle();
191 191
 		$circle->importFromDatabase(
192 192
 			$data,
193
-			CoreQueryBuilder::HELPER . '_' . CoreQueryBuilder::CIRCLE . '_'
193
+			CoreQueryBuilder::HELPER.'_'.CoreQueryBuilder::CIRCLE.'_'
194 194
 		);
195 195
 
196 196
 		return $circle;
Please login to merge, or discard this patch.
lib/Command/SharesFiles.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -200,15 +200,15 @@  discard block
 block discarded – undo
200 200
 				$recipient = $share->getInitiator();
201 201
 				$sharedTo = $recipient->getDisplayName();
202 202
 				if (!$this->configService->isLocalInstance($recipient->getInstance())) {
203
-					$sharedTo .= '@' . $recipient->getInstance();
203
+					$sharedTo .= '@'.$recipient->getInstance();
204 204
 				}
205 205
 			}
206 206
 			$circleField = '';
207 207
 			if ($share->hasCircle()) {
208 208
 				$circle = $share->getCircle();
209 209
 				$circleField = $circle->getDisplayName()
210
-					. ' (' . $share->getSharedWith()
211
-					. ', ' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';
210
+					. ' ('.$share->getSharedWith()
211
+					. ', '.Circle::$DEF_SOURCE[$circle->getSource()].')';
212 212
 			}
213 213
 			$row = [
214 214
 				$share->getId(),
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 				$def = ($recipient->hasBasedOn()) ? Circle::$DEF_SOURCE[$recipient->getBasedOn()->getSource()] : 'undef';
224 224
 				$row = array_merge(
225 225
 					$row, [
226
-						$sharedTo . ' (' . $recipient->getSingleId() . ', ' . $def . ')',
226
+						$sharedTo.' ('.$recipient->getSingleId().', '.$def.')',
227 227
 						(($share->getChildId() > 0) ? $share->getChildFileTarget(
228 228
 						) : $share->getFileTarget()),
229 229
 					]
Please login to merge, or discard this patch.
lib/Db/DeprecatedRequestBuilder.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -344,8 +344,8 @@  discard block
 block discarded – undo
344 344
 		$expr = $qb->expr();
345 345
 
346 346
 		if ($pf === '') {
347
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
348
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
347
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
348
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
349 349
 
350 350
 			return;
351 351
 		}
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
375 375
 				continue;
376 376
 			}
377
-			$orX[] = $expr->gte($p . '.level', $qb->createNamedParameter($level));
377
+			$orX[] = $expr->gte($p.'.level', $qb->createNamedParameter($level));
378 378
 		}
379 379
 
380 380
 		return $expr->orX(...$orX);
@@ -389,12 +389,12 @@  discard block
 block discarded – undo
389 389
 	protected function limitToMembersAndAlmost(IQueryBuilder $qb) {
390 390
 		$expr = $qb->expr();
391 391
 
392
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
392
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
393 393
 
394 394
 		$qb->andWhere($expr->orX(
395
-			$expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)),
396
-			$expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)),
397
-			$expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)),
395
+			$expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)),
396
+			$expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)),
397
+			$expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)),
398 398
 		));
399 399
 	}
400 400
 
@@ -406,8 +406,8 @@  discard block
 block discarded – undo
406 406
 	 */
407 407
 	public function limitToDBField(IQueryBuilder $qb, $field, $value) {
408 408
 		$expr = $qb->expr();
409
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
410
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
409
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
410
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
411 411
 	}
412 412
 
413 413
 
@@ -418,8 +418,8 @@  discard block
 block discarded – undo
418 418
 	 */
419 419
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
420 420
 		$expr = $qb->expr();
421
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
422
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
421
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
422
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
423 423
 	}
424 424
 
425 425
 
@@ -434,9 +434,9 @@  discard block
 block discarded – undo
434 434
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
435 435
 		$expr = $qb->expr();
436 436
 
437
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
437
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
438 438
 
439
-		$and = $expr->andX($expr->eq($pf . 'user_id', 'ncgu.gid'));
439
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
440 440
 		if ($userId !== '') {
441 441
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
442 442
 		} else {
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
 		}
460 460
 
461 461
 		$expr = $qb->expr();
462
-		$pf = $this->default_select_alias . '.';
462
+		$pf = $this->default_select_alias.'.';
463 463
 
464 464
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
465 465
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 			->selectAlias('lc.settings', 'circle_settings')
469 469
 			->leftJoin(
470 470
 				$this->default_select_alias, DeprecatedRequestBuilder::TABLE_CIRCLES, 'lc',
471
-				$expr->eq($pf . 'circle_id', 'lc.unique_id')
471
+				$expr->eq($pf.'circle_id', 'lc.unique_id')
472 472
 			);
473 473
 	}
474 474
 
Please login to merge, or discard this patch.
lib/Db/RemoteRequest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -173,10 +173,10 @@  discard block
 block discarded – undo
173 173
 			$qb->leftJoin(
174 174
 				CoreQueryBuilder::REMOTE, self::TABLE_MEMBER, $aliasMember,
175 175
 				$expr->andX(
176
-					$expr->eq($aliasMember . '.circle_id', $qb->createNamedParameter($circle->getSingleId())),
177
-					$expr->eq($aliasMember . '.instance', CoreQueryBuilder::REMOTE . '.instance'),
176
+					$expr->eq($aliasMember.'.circle_id', $qb->createNamedParameter($circle->getSingleId())),
177
+					$expr->eq($aliasMember.'.instance', CoreQueryBuilder::REMOTE.'.instance'),
178 178
 					$expr->gte(
179
-						$aliasMember . '.level',
179
+						$aliasMember.'.level',
180 180
 						$qb->createNamedParameter(Member::LEVEL_MEMBER, IQueryBuilder::PARAM_INT)
181 181
 					)
182 182
 				)
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 
185 185
 			$orX[] = $expr->andX(
186 186
 				$qb->exprLimit('type', RemoteInstance::TYPE_EXTERNAL, '', false),
187
-				$expr->isNotNull($aliasMember . '.instance'),
187
+				$expr->isNotNull($aliasMember.'.instance'),
188 188
 			);
189 189
 		}
190 190
 
Please login to merge, or discard this patch.
lib/Db/GSSharesRequest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -97,11 +97,11 @@
 block discarded – undo
97 97
 
98 98
 	private function leftJoinMountPoint(IQueryBuilder $qb, string $userId) {
99 99
 		$expr = $qb->expr();
100
-		$pf = '' . $this->default_select_alias . '.';
100
+		$pf = ''.$this->default_select_alias.'.';
101 101
 
102 102
 		$on = $expr->andX(
103 103
 			$expr->eq('mp.user_id', $qb->createNamedParameter($userId)),
104
-			$expr->eq('mp.share_id', $pf . 'id'),
104
+			$expr->eq('mp.share_id', $pf.'id'),
105 105
 		);
106 106
 
107 107
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
Please login to merge, or discard this patch.