Cancelled
Pull Request — master (#643)
by René
31s
created
lib/Db/CircleProviderRequestBuilder.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
78 78
 		$qb->andWhere(
79 79
 			$expr->in(
80
-				$pf . 'share_with',
80
+				$pf.'share_with',
81 81
 				$qb->createNamedParameter($circleUniqueIds, IQueryBuilder::PARAM_STR_ARRAY)
82 82
 			)
83 83
 		);
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 		$expr = $qb->expr();
95 95
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
96 96
 
97
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId)));
97
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId)));
98 98
 	}
99 99
 
100 100
 
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
142 142
 
143 143
 		$qb->andWhere(
144 144
 			$expr->orX(
145
-				$expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)),
146
-				$expr->eq($pf . 'id', $qb->createNamedParameter($circleId))
145
+				$expr->eq($pf.'parent', $qb->createNamedParameter($circleId)),
146
+				$expr->eq($pf.'id', $qb->createNamedParameter($circleId))
147 147
 			)
148 148
 		);
149 149
 	}
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
166 166
 		$qb->andWhere(
167 167
 			$expr->in(
168
-				$pf . 'file_source',
168
+				$pf.'file_source',
169 169
 				$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
170 170
 			)
171 171
 		);
@@ -198,12 +198,12 @@  discard block
 block discarded – undo
198 198
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
199 199
 
200 200
 		if ($reShares === false) {
201
-			$qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)));
201
+			$qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)));
202 202
 		} else {
203 203
 			$qb->andWhere(
204 204
 				$expr->orX(
205
-					$expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)),
206
-					$expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))
205
+					$expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)),
206
+					$expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))
207 207
 				)
208 208
 			);
209 209
 		}
@@ -298,11 +298,11 @@  discard block
 block discarded – undo
298 298
 		$expr = $qb->expr();
299 299
 		$andX = $expr->andX();
300 300
 
301
-		$andX->add($expr->eq($aliasM . '.user_id', $qb->createNamedParameter($userId)));
302
-		$andX->add($expr->eq($aliasM . '.circle_id', $aliasC . '.unique_id'));
303
-		$andX->add($expr->gte($aliasM . '.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
304
-		$andX->add($expr->eq($aliasM . '.instance', $qb->createNamedParameter('')));
305
-		$andX->add($expr->eq($aliasM . '.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER)));
301
+		$andX->add($expr->eq($aliasM.'.user_id', $qb->createNamedParameter($userId)));
302
+		$andX->add($expr->eq($aliasM.'.circle_id', $aliasC.'.unique_id'));
303
+		$andX->add($expr->gte($aliasM.'.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
304
+		$andX->add($expr->eq($aliasM.'.instance', $qb->createNamedParameter('')));
305
+		$andX->add($expr->eq($aliasM.'.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER)));
306 306
 
307 307
 		return $andX;
308 308
 	}
@@ -330,11 +330,11 @@  discard block
 block discarded – undo
330 330
 
331 331
 		$andX = $expr->andX();
332 332
 
333
-		$andX->add($expr->eq($aliasM . '.user_id', 'ncgu.gid'));
334
-		$andX->add($expr->eq($aliasM . '.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_GROUP)));
335
-		$andX->add($expr->eq($aliasM . '.instance', $qb->createNamedParameter('')));
336
-		$andX->add($expr->eq($aliasM . '.circle_id', $aliasC . '.unique_id'));
337
-		$andX->add($expr->gte($aliasM . '.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
333
+		$andX->add($expr->eq($aliasM.'.user_id', 'ncgu.gid'));
334
+		$andX->add($expr->eq($aliasM.'.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_GROUP)));
335
+		$andX->add($expr->eq($aliasM.'.instance', $qb->createNamedParameter('')));
336
+		$andX->add($expr->eq($aliasM.'.circle_id', $aliasC.'.unique_id'));
337
+		$andX->add($expr->gte($aliasM.'.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
338 338
 
339 339
 		return $andX;
340 340
 	}
Please login to merge, or discard this patch.
lib/Db/DeprecatedCirclesRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -203,7 +203,7 @@
 block discarded – undo
203 203
 		$cursor->closeCursor();
204 204
 
205 205
 		if ($data === false) {
206
-			throw new CircleDoesNotExistException($this->l10n->t('Circle not found ' . $circleUniqueId));
206
+			throw new CircleDoesNotExistException($this->l10n->t('Circle not found '.$circleUniqueId));
207 207
 		}
208 208
 
209 209
 		$circle = $this->parseCirclesSelectSql($data);
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
@@ -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.