Completed
Pull Request — master (#692)
by John
37s
created
lib/Db/DeprecatedRequestBuilder.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -348,8 +348,8 @@  discard block
 block discarded – undo
348 348
 		$expr = $qb->expr();
349 349
 
350 350
 		if ($pf === '') {
351
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
352
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
351
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
352
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
353 353
 
354 354
 			return;
355 355
 		}
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
379 379
 				continue;
380 380
 			}
381
-			$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
381
+			$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
382 382
 		}
383 383
 
384 384
 		return $orX;
@@ -393,12 +393,12 @@  discard block
 block discarded – undo
393 393
 	protected function limitToMembersAndAlmost(IQueryBuilder $qb) {
394 394
 		$expr = $qb->expr();
395 395
 
396
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
396
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
397 397
 
398 398
 		$orX = $expr->orX();
399
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
400
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
401
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
399
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
400
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
401
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
402 402
 
403 403
 		$qb->andWhere($orX);
404 404
 	}
@@ -411,8 +411,8 @@  discard block
 block discarded – undo
411 411
 	 */
412 412
 	public function limitToDBField(IQueryBuilder $qb, $field, $value) {
413 413
 		$expr = $qb->expr();
414
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
415
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
414
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
415
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
416 416
 	}
417 417
 
418 418
 
@@ -423,8 +423,8 @@  discard block
 block discarded – undo
423 423
 	 */
424 424
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
425 425
 		$expr = $qb->expr();
426
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
427
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
426
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
427
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
428 428
 	}
429 429
 
430 430
 
@@ -439,9 +439,9 @@  discard block
 block discarded – undo
439 439
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
440 440
 		$expr = $qb->expr();
441 441
 
442
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
442
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
443 443
 
444
-		$and = $expr->andX($expr->eq($pf . 'user_id', 'ncgu.gid'));
444
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
445 445
 		if ($userId !== '') {
446 446
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
447 447
 		} else {
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 		}
465 465
 
466 466
 		$expr = $qb->expr();
467
-		$pf = $this->default_select_alias . '.';
467
+		$pf = $this->default_select_alias.'.';
468 468
 
469 469
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
470 470
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
 		   ->selectAlias('lc.settings', 'circle_settings')
474 474
 		   ->leftJoin(
475 475
 			   $this->default_select_alias, DeprecatedRequestBuilder::TABLE_CIRCLES, 'lc',
476
-			   $expr->eq($pf . 'circle_id', 'lc.unique_id')
476
+			   $expr->eq($pf.'circle_id', 'lc.unique_id')
477 477
 		   );
478 478
 	}
479 479
 
Please login to merge, or discard this patch.
lib/Model/DeprecatedCircle.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -292,7 +292,7 @@
 block discarded – undo
292 292
 	 * @return int
293 293
 	 */
294 294
 	public static function convertTypeToConfig(int $type): int {
295
-		switch($type) {
295
+		switch ($type) {
296 296
 			case DeprecatedCircle::CIRCLES_PERSONAL:
297 297
 				return 2;
298 298
 			case DeprecatedCircle::CIRCLES_SECRET:
Please login to merge, or discard this patch.
lib/Service/RemoteService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@
 block discarded – undo
189 189
 			$loop++;
190 190
 			if ($loop > 10 || in_array($instance, $knownInstance)) {
191 191
 				throw new CircleNotFoundException(
192
-					'circle not found after browsing ' . implode(', ', $knownInstance)
192
+					'circle not found after browsing '.implode(', ', $knownInstance)
193 193
 				);
194 194
 			}
195 195
 			$knownInstance[] = $instance;
Please login to merge, or discard this patch.
lib/Db/FileSharesRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 		$expr = $qb->expr();
106 106
 
107 107
 		$this->limitToShareType($qb, self::SHARE_TYPE);
108
-		$qb->andWhere($expr->isNull($this->default_select_alias . '.parent'));
108
+		$qb->andWhere($expr->isNull($this->default_select_alias.'.parent'));
109 109
 
110 110
 		$shares = [];
111 111
 		$cursor = $qb->execute();
Please login to merge, or discard this patch.
lib/Service/FederatedShareService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
110 110
 		/** @var FederatedShare $share */
111 111
 		$share = $data->gObj('federatedShare', FederatedShare::class);
112 112
 		if ($share->getLockStatus() === ItemLock::STATUS_INSTANCE_LOCKED) {
113
-			throw new FederatedShareAlreadyLockedException('item already locked by ' . $share->getInstance());
113
+			throw new FederatedShareAlreadyLockedException('item already locked by '.$share->getInstance());
114 114
 		}
115 115
 
116 116
 		return $share;
Please login to merge, or discard this patch.
tests/unit/lib/Api/CirclesTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 			} catch (Exception $e) {
332 332
 				$this->assertSame(
333 333
 					true, false,
334
-					'should have returned a MemberIsNotModeratorException - ' . $e->getMessage()
334
+					'should have returned a MemberIsNotModeratorException - '.$e->getMessage()
335 335
 				);
336 336
 			}
337 337
 
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 			} catch (Exception $e) {
346 346
 				$this->assertSame(
347 347
 					true, false,
348
-					'should have returned a MemberIsNotModeratorException - ' . $e->getMessage()
348
+					'should have returned a MemberIsNotModeratorException - '.$e->getMessage()
349 349
 				);
350 350
 			}
351 351
 
Please login to merge, or discard this patch.
tests/bootstrap.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,10 +7,10 @@
 block discarded – undo
7 7
 	define('PHPUNIT_RUN', 1);
8 8
 }
9 9
 
10
-require_once __DIR__ . '/../../../lib/base.php';
10
+require_once __DIR__.'/../../../lib/base.php';
11 11
 
12 12
 // Fix for "Autoload path not allowed: .../tests/lib/testcase.php"
13
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
13
+\OC::$loader->addValidRoot(OC::$SERVERROOT.'/tests');
14 14
 
15 15
 \OC_App::loadApp(Application::APP_ID);
16 16
 
Please login to merge, or discard this patch.
templates/files/list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@
 block discarded – undo
18 18
 		<tr>
19 19
 			<th id='headerName' class="hidden column-name">
20 20
 				<div id="headerName-container">
21
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
21
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
22 22
 				</div>
23 23
 			</th>
24 24
 			<th id="headerSize" class="hidden column-size">
25 25
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
26 26
 			</th>
27 27
 			<th id="headerDate" class="hidden column-mtime">
28
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
28
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
29 29
 			</th>
30 30
 		</tr>
31 31
 	</thead>
Please login to merge, or discard this patch.
lib/Command/CirclesDestroy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 		} catch (FederatedItemException $e) {
126 126
 			if ($input->getOption('status-code')) {
127 127
 				throw new FederatedItemException(
128
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
128
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
129 129
 				);
130 130
 			}
131 131
 
Please login to merge, or discard this patch.