Completed
Pull Request — master (#1875)
by
unknown
28s
created
lib/Command/CirclesConfig.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 		} catch (FederatedItemException $e) {
117 117
 			if ($input->getOption('status-code')) {
118 118
 				throw new FederatedItemException(
119
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
119
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
120 120
 				);
121 121
 			}
122 122
 
@@ -158,8 +158,8 @@  discard block
 block discarded – undo
158 158
 			$value = array_search(strtoupper($item), $valid);
159 159
 			if (!$value) {
160 160
 				throw new InvalidArgumentException(
161
-					'Invalid config \'' . $item . '\'. Available values: '
162
-					. implode(', ', array_values($valid)) . '. '
161
+					'Invalid config \''.$item.'\'. Available values: '
162
+					. implode(', ', array_values($valid)).'. '
163 163
 					. 'To disable a config, start the value with an underscore'
164 164
 				);
165 165
 			}
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 
194 194
 		array_walk(
195 195
 			$listing,
196
-			function (string &$v): void {
196
+			function(string &$v): void {
197 197
 				[, $long] = explode('|', $v);
198 198
 				$v = strtoupper(str_replace(' ', '', $long));
199 199
 			}
Please login to merge, or discard this patch.
lib/Command/CirclesCheck.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 			throw new Exception('Please specify a --type for the test');
110 110
 		}
111 111
 		if ($test !== '' && !in_array($type, self::$checks)) {
112
-			throw new Exception('Unknown type: ' . implode(', ', self::$checks));
112
+			throw new Exception('Unknown type: '.implode(', ', self::$checks));
113 113
 		}
114 114
 
115 115
 		//		$this->configService->setAppValue(ConfigService::TEST_NC_BASE, $test);
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 		}
166 166
 
167 167
 		$output->writeln('');
168
-		$output->writeln('* testing current address: ' . $test);
168
+		$output->writeln('* testing current address: '.$test);
169 169
 
170 170
 		try {
171 171
 			$this->setupLoopback($input, $output, $test);
@@ -200,8 +200,8 @@  discard block
 block discarded – undo
200 200
 				continue;
201 201
 			}
202 202
 
203
-			$loopback = rtrim($scheme . '://' . $cloudId . $path, '/');
204
-			$output->writeln('* testing address: ' . $loopback . ' ');
203
+			$loopback = rtrim($scheme.'://'.$cloudId.$path, '/');
204
+			$output->writeln('* testing address: '.$loopback.' ');
205 205
 
206 206
 			try {
207 207
 				$this->setupLoopback($input, $output, $loopback);
@@ -272,8 +272,8 @@  discard block
 block discarded – undo
272 272
 		$test = new FederatedEvent(LoopbackTest::class);
273 273
 		$this->federatedEventService->newEvent($test);
274 274
 		$output->writeln(
275
-			'<info>' . $test->getWrapperToken() . '</info> ' .
276
-			'(took ' . ((string)(round(microtime(true) * 1000.0) - $timer)) . 'ms)'
275
+			'<info>'.$test->getWrapperToken().'</info> '.
276
+			'(took '.((string)(round(microtime(true) * 1000.0) - $timer)).'ms)'
277 277
 		);
278 278
 
279 279
 		$output->writeln('- Waiting for async process to finish (5s)');
@@ -292,18 +292,18 @@  discard block
 block discarded – undo
292 292
 
293 293
 		$checkVerify = $wrapper->getEvent()->getData()->gInt('verify');
294 294
 		if ($checkVerify === LoopbackTest::VERIFY) {
295
-			$output->write('<info>verify=' . ((string)$checkVerify) . '</info> ');
295
+			$output->write('<info>verify='.((string)$checkVerify).'</info> ');
296 296
 		} else {
297
-			$output->writeln('<error>verify=' . ((string)$checkVerify) . '</error>');
297
+			$output->writeln('<error>verify='.((string)$checkVerify).'</error>');
298 298
 
299 299
 			return false;
300 300
 		}
301 301
 
302 302
 		$checkManage = $wrapper->getResult()->gInt('manage');
303 303
 		if ($checkManage === LoopbackTest::MANAGE) {
304
-			$output->write('<info>manage=' . ((string)$checkManage) . '</info> ');
304
+			$output->write('<info>manage='.((string)$checkManage).'</info> ');
305 305
 		} else {
306
-			$output->writeln('<error>manage=' . ((string)$checkManage) . '</error>');
306
+			$output->writeln('<error>manage='.((string)$checkManage).'</error>');
307 307
 
308 308
 			return false;
309 309
 		}
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_ID, $cloudId);
343 343
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_PATH, $path);
344 344
 		$output->writeln(
345
-			'- Address <info>' . $loopback . '</info> is now used as <info>loopback</info>'
345
+			'- Address <info>'.$loopback.'</info> is now used as <info>loopback</info>'
346 346
 		);
347 347
 	}
348 348
 
@@ -395,8 +395,8 @@  discard block
 block discarded – undo
395 395
 				continue;
396 396
 			}
397 397
 
398
-			$internal = rtrim($scheme . '://' . $cloudId, '/');
399
-			$fullInternal = rtrim($scheme . '://' . $cloudId . $path, '/');
398
+			$internal = rtrim($scheme.'://'.$cloudId, '/');
399
+			$fullInternal = rtrim($scheme.'://'.$cloudId.$path, '/');
400 400
 
401 401
 			$question = new ConfirmationQuestion(
402 402
 				'<comment>Do you want to check the validity of this internal address?</comment> (Y/n) ', true,
@@ -415,9 +415,9 @@  discard block
 block discarded – undo
415 415
 					'You will need to run this <info>curl</info> command from a terminal on your local network and paste its result: '
416 416
 				);
417 417
 				$output->writeln(
418
-					'     curl -L "' . $internal
418
+					'     curl -L "'.$internal
419 419
 					. '/.well-known/webfinger?resource=http://nextcloud.com/&test='
420
-					. $testToken . '"'
420
+					. $testToken.'"'
421 421
 				);
422 422
 
423 423
 				$output->writeln('paste the result here: ');
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 
452 452
 				if ($pastedHref !== $href) {
453 453
 					$output->writeln(
454
-						'<error>The returned data (' . $pastedHref . ') are not the one expected: </error>'
454
+						'<error>The returned data ('.$pastedHref.') are not the one expected: </error>'
455 455
 						. $href
456 456
 					);
457 457
 					continue;
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
 					'Next step, please run this <info>curl</info> command from a terminal on your local network and paste its result: '
464 464
 				);
465 465
 				$output->writeln(
466
-					'     curl -L "' . $pastedHref . '?test=' . $testToken . '" -H "Accept: application/json"'
466
+					'     curl -L "'.$pastedHref.'?test='.$testToken.'" -H "Accept: application/json"'
467 467
 				);
468 468
 
469 469
 				$output->writeln('paste the result here: ');
@@ -479,9 +479,9 @@  discard block
 block discarded – undo
479 479
 					|| $appSignatory->getRoot() !== $pastedSignatory->g('root')) {
480 480
 					$output->writeln(
481 481
 						'<error>The returned data ('
482
-						. $pastedSignatory->g('uid') . '/' . $pastedSignatory->g('root')
482
+						. $pastedSignatory->g('uid').'/'.$pastedSignatory->g('root')
483 483
 						. ') are not the one expected: </error>'
484
-						. $appSignatory->getUid(true) . '/' . $appSignatory->getRoot()
484
+						. $appSignatory->getUid(true).'/'.$appSignatory->getRoot()
485 485
 					);
486 486
 					continue;
487 487
 				}
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
 
508 508
 		$output->writeln('');
509 509
 		$question = new ConfirmationQuestion(
510
-			'- Do you want to save <info>' . $internal
510
+			'- Do you want to save <info>'.$internal
511 511
 			. '</info> as your <info>internal</info> address ? (y/N) ',
512 512
 			false, '/^(y|Y)/i'
513 513
 		);
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
 		$this->configService->setAppValue(ConfigService::INTERNAL_CLOUD_ID, $cloudId);
525 525
 		$this->configService->setAppValue(ConfigService::INTERNAL_CLOUD_PATH, $path);
526 526
 
527
-		$output->writeln('- Address <info>' . $internal . '</info> is now used as <info>internal</info>');
527
+		$output->writeln('- Address <info>'.$internal.'</info> is now used as <info>internal</info>');
528 528
 	}
529 529
 
530 530
 	/**
@@ -575,8 +575,8 @@  discard block
 block discarded – undo
575 575
 				continue;
576 576
 			}
577 577
 
578
-			$frontal = rtrim($scheme . '://' . $cloudId, '/');
579
-			$fullFrontal = rtrim($scheme . '://' . $cloudId . $path, '/');
578
+			$frontal = rtrim($scheme.'://'.$cloudId, '/');
579
+			$fullFrontal = rtrim($scheme.'://'.$cloudId.$path, '/');
580 580
 
581 581
 			$question = new ConfirmationQuestion(
582 582
 				'<comment>Do you want to check the validity of this frontal address?</comment> (y/N) ', false,
@@ -595,9 +595,9 @@  discard block
 block discarded – undo
595 595
 					'You will need to run this <info>curl</info> command from a remote terminal and paste its result: '
596 596
 				);
597 597
 				$output->writeln(
598
-					'     curl -L "' . $frontal
598
+					'     curl -L "'.$frontal
599 599
 					. '/.well-known/webfinger?resource=http://nextcloud.com/&test='
600
-					. $testToken . '"'
600
+					. $testToken.'"'
601 601
 				);
602 602
 
603 603
 				$output->writeln('paste the result here: ');
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
 
632 632
 				if ($pastedHref !== $href) {
633 633
 					$output->writeln(
634
-						'<error>The returned data (' . $pastedHref . ') are not the one expected: </error>'
634
+						'<error>The returned data ('.$pastedHref.') are not the one expected: </error>'
635 635
 						. $href
636 636
 					);
637 637
 					continue;
@@ -643,7 +643,7 @@  discard block
 block discarded – undo
643 643
 					'Next step, please run this <info>curl</info> command from a remote terminal and paste its result: '
644 644
 				);
645 645
 				$output->writeln(
646
-					'     curl -L "' . $pastedHref . '?test=' . $testToken . '" -H "Accept: application/json"'
646
+					'     curl -L "'.$pastedHref.'?test='.$testToken.'" -H "Accept: application/json"'
647 647
 				);
648 648
 
649 649
 				$output->writeln('paste the result here: ');
@@ -659,9 +659,9 @@  discard block
 block discarded – undo
659 659
 					|| $appSignatory->getRoot() !== $pastedSignatory->g('root')) {
660 660
 					$output->writeln(
661 661
 						'<error>The returned data ('
662
-						. $pastedSignatory->g('uid') . '/' . $pastedSignatory->g('root')
662
+						. $pastedSignatory->g('uid').'/'.$pastedSignatory->g('root')
663 663
 						. ') are not the one expected: </error>'
664
-						. $appSignatory->getUid(true) . '/' . $appSignatory->getRoot()
664
+						. $appSignatory->getUid(true).'/'.$appSignatory->getRoot()
665 665
 					);
666 666
 					continue;
667 667
 				}
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
 
688 688
 		$output->writeln('');
689 689
 		$question = new ConfirmationQuestion(
690
-			'- Do you want to save <info>' . $frontal
690
+			'- Do you want to save <info>'.$frontal
691 691
 			. '</info> as your <info>frontal</info> address ? (y/N) ',
692 692
 			false, '/^(y|Y)/i'
693 693
 		);
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
 		$this->configService->setAppValue(ConfigService::FRONTAL_CLOUD_ID, $cloudId);
705 705
 		$this->configService->setAppValue(ConfigService::FRONTAL_CLOUD_PATH, $path);
706 706
 
707
-		$output->writeln('- Address <info>' . $frontal . '</info> is now used as <info>frontal</info>');
707
+		$output->writeln('- Address <info>'.$frontal.'</info> is now used as <info>frontal</info>');
708 708
 	}
709 709
 
710 710
 	/**
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
 			$request->setDataSerialize(new SimpleDataStore(['empty' => 1]));
730 730
 		}
731 731
 
732
-		$output->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': ');
732
+		$output->write('- '.$type.' request on '.$request->getCompleteUrl().': ');
733 733
 
734 734
 		try {
735 735
 			$this->doRequest($request);
@@ -740,7 +740,7 @@  discard block
 block discarded – undo
740 740
 				$color = 'info';
741 741
 			}
742 742
 
743
-			$output->writeln('<' . $color . '>' . ((string)$result->getStatusCode()) . '</' . $color . '>');
743
+			$output->writeln('<'.$color.'>'.((string)$result->getStatusCode()).'</'.$color.'>');
744 744
 			if ($result->getStatusCode() === 200) {
745 745
 				return true;
746 746
 			}
@@ -763,7 +763,7 @@  discard block
 block discarded – undo
763 763
 
764 764
 		$output->writeln('');
765 765
 		$output->writeln(
766
-			'The address <info>' . $address . '</info> seems to reach your local Nextcloud.'
766
+			'The address <info>'.$address.'</info> seems to reach your local Nextcloud.'
767 767
 		);
768 768
 
769 769
 		/** @var QuestionHelper $helper */
@@ -781,8 +781,8 @@  discard block
 block discarded – undo
781 781
 
782 782
 		$this->configService->setAppValue(ConfigService::FORCE_NC_BASE, $address);
783 783
 		$output->writeln(
784
-			'New configuration <info>' . Application::APP_ID . '.' . ConfigService::FORCE_NC_BASE . '=\''
785
-			. $address . '\'</info> stored in database'
784
+			'New configuration <info>'.Application::APP_ID.'.'.ConfigService::FORCE_NC_BASE.'=\''
785
+			. $address.'\'</info> stored in database'
786 786
 		);
787 787
 	}
788 788
 
@@ -809,7 +809,7 @@  discard block
 block discarded – undo
809 809
 		$path = rtrim($path, '/');
810 810
 
811 811
 		if (!is_null($cloudIdPort)) {
812
-			$cloudId = $cloudId . ':' . ((string)$cloudIdPort);
812
+			$cloudId = $cloudId.':'.((string)$cloudIdPort);
813 813
 		}
814 814
 
815 815
 		return [$scheme, $cloudId, $path];
Please login to merge, or discard this patch.
lib/Command/MembersAdd.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 		} catch (FederatedItemException $e) {
110 110
 			if ($input->getOption('status-code')) {
111 111
 				throw new FederatedItemException(
112
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
112
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
113 113
 				);
114 114
 			}
115 115
 
@@ -148,10 +148,10 @@  discard block
 block discarded – undo
148 148
 		try {
149 149
 			$users = $this->retrieveJson($request);
150 150
 		} catch (
151
-			RequestContentException|
152
-			RequestNetworkException|
153
-			RequestResultSizeException|
154
-			RequestServerException|
151
+			RequestContentException |
152
+			RequestNetworkException |
153
+			RequestResultSizeException |
154
+			RequestServerException |
155 155
 			RequestResultNotJsonException $e
156 156
 		) {
157 157
 			return '';
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 				$instance = $host;
170 170
 			}
171 171
 
172
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
172
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
173 173
 		}
174 174
 
175 175
 		//		if ($userId === '') {
Please login to merge, or discard this patch.
lib/Command/CirclesMemberships.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -192,10 +192,10 @@  discard block
 block discarded – undo
192 192
 		//			return 0;
193 193
 		//		}
194 194
 
195
-		$output->writeln('Id: <info>' . $federatedUser->getUserId() . '</info>');
196
-		$output->writeln('Instance: <info>' . $federatedUser->getInstance() . '</info>');
197
-		$output->writeln('Type: <info>' . Member::$TYPE[$federatedUser->getUserType()] . '</info>');
198
-		$output->writeln('SingleId: <info>' . $federatedUser->getSingleId() . '</info>');
195
+		$output->writeln('Id: <info>'.$federatedUser->getUserId().'</info>');
196
+		$output->writeln('Instance: <info>'.$federatedUser->getInstance().'</info>');
197
+		$output->writeln('Type: <info>'.Member::$TYPE[$federatedUser->getUserType()].'</info>');
198
+		$output->writeln('SingleId: <info>'.$federatedUser->getSingleId().'</info>');
199 199
 
200 200
 		$output->writeln('');
201 201
 		$output->writeln('Memberships:');
@@ -204,14 +204,14 @@  discard block
 block discarded – undo
204 204
 		if ($count === 0) {
205 205
 			$output->writeln('(database not updated)');
206 206
 		} else {
207
-			$output->writeln('(' . ((string)$count) . ' entries generated/updated in the database)');
207
+			$output->writeln('('.((string)$count).' entries generated/updated in the database)');
208 208
 		}
209 209
 
210 210
 		foreach ($federatedUser->getMemberships() as $membership) {
211 211
 			$this->memberships[$membership->getCircleId()] = $membership;
212 212
 			$output->writeln(
213
-				'- <info>' . $membership->getCircleId() . '</info> ('
214
-				. Member::$DEF_LEVEL[$membership->getLevel()] . ')'
213
+				'- <info>'.$membership->getCircleId().'</info> ('
214
+				. Member::$DEF_LEVEL[$membership->getLevel()].')'
215 215
 			);
216 216
 		}
217 217
 
@@ -285,9 +285,9 @@  discard block
 block discarded – undo
285 285
 				if ($lineNumber === 2) {
286 286
 					return '';
287 287
 				}
288
-				$line .= '<info>' . $federatedUser->getSingleId() . '</info>';
288
+				$line .= '<info>'.$federatedUser->getSingleId().'</info>';
289 289
 				if (!$this->configService->isLocalInstance($federatedUser->getInstance())) {
290
-					$line .= '@' . $federatedUser->getInstance();
290
+					$line .= '@'.$federatedUser->getInstance();
291 291
 				}
292 292
 
293 293
 				return $line;
@@ -299,33 +299,33 @@  discard block
 block discarded – undo
299 299
 				$circle = $member->getCircle();
300 300
 
301 301
 				if ($lineNumber === 1) {
302
-					$line .= '<info>' . $circle->getSingleId() . '</info>';
302
+					$line .= '<info>'.$circle->getSingleId().'</info>';
303 303
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
304
-						$line .= '@' . $circle->getInstance();
304
+						$line .= '@'.$circle->getInstance();
305 305
 					}
306
-					$line .= ' (' . ($this->input->getOption('display-name') ?
307
-							$circle->getDisplayName() : $circle->getName()) . ')';
308
-					$line .= ' <info>MemberId</info>: ' . $member->getId();
309
-					$line .= ' <info>Level</info>: ' . Member::$DEF_LEVEL[$member->getLevel()];
306
+					$line .= ' ('.($this->input->getOption('display-name') ?
307
+							$circle->getDisplayName() : $circle->getName()).')';
308
+					$line .= ' <info>MemberId</info>: '.$member->getId();
309
+					$line .= ' <info>Level</info>: '.Member::$DEF_LEVEL[$member->getLevel()];
310 310
 
311 311
 					$knownMembership = $this->memberships[$member->getCircleId()];
312 312
 					if ($member->getLevel() !== $knownMembership->getLevel()) {
313
-						$line .= ' (' . Member::$DEF_LEVEL[$knownMembership->getLevel()] . ')';
313
+						$line .= ' ('.Member::$DEF_LEVEL[$knownMembership->getLevel()].')';
314 314
 					}
315 315
 				}
316 316
 				if ($lineNumber === 2) {
317 317
 					$owner = $circle->getOwner();
318
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance() . ' ';
318
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance().' ';
319 319
 					if ($owner->hasBasedOn()) {
320
-						$line .= '(' . Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()] . ') ';
320
+						$line .= '('.Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()].') ';
321 321
 					}
322 322
 					$type = implode(', ', Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
323
-					$line .= ($type === '') ? '' : '<info>Config</info>: ' . $type;
323
+					$line .= ($type === '') ? '' : '<info>Config</info>: '.$type;
324 324
 				}
325 325
 
326 326
 				return $line;
327 327
 			}
328
-		} catch (InvalidItemException|ItemNotFoundException|UnknownTypeException $e) {
328
+		} catch (InvalidItemException | ItemNotFoundException | UnknownTypeException $e) {
329 329
 		}
330 330
 
331 331
 		return '';
@@ -379,6 +379,6 @@  discard block
 block discarded – undo
379 379
 			);
380 380
 		}
381 381
 
382
-		$output->writeln(((string)$count) . ' memberships updated');
382
+		$output->writeln(((string)$count).' memberships updated');
383 383
 	}
384 384
 }
Please login to merge, or discard this patch.
lib/Tools/Db/ExtendedQueryBuilder.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	 */
196 196
 	public function limitToCreation(int $delay = 0): self {
197 197
 		$date = new DateTime('now');
198
-		$date->sub(new DateInterval('PT' . ((string)$delay) . 'M'));
198
+		$date->sub(new DateInterval('PT'.((string)$delay).'M'));
199 199
 
200 200
 		$this->limitToDBFieldDateTime('creation', $date, true);
201 201
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		$expr = $this->expr();
213 213
 		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias()
214 214
 																. '.' : '';
215
-		$field = $pf . $field;
215
+		$field = $pf.$field;
216 216
 
217 217
 		$orX = $expr->orX();
218 218
 		$orX->add(
@@ -242,8 +242,8 @@  discard block
 block discarded – undo
242 242
 		}
243 243
 
244 244
 		$expr = $this->expr();
245
-		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias() . '.' : '';
246
-		$field = $pf . $field;
245
+		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias().'.' : '';
246
+		$field = $pf.$field;
247 247
 
248 248
 		$orX = $expr->orX();
249 249
 		$orX->add(
@@ -261,8 +261,8 @@  discard block
 block discarded – undo
261 261
 	public function searchInDBField(string $field, string $value): void {
262 262
 		$expr = $this->expr();
263 263
 
264
-		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias() . '.' : '';
265
-		$field = $pf . $field;
264
+		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias().'.' : '';
265
+		$field = $pf.$field;
266 266
 
267 267
 		$this->andWhere($expr->iLike($field, $this->createNamedParameter($value)));
268 268
 	}
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
 	 */
386 386
 	public function exprLike(string $field, string $value, string $alias = '', bool $cs = true): string {
387 387
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
388
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
388
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
389 389
 		}
390 390
 
391 391
 		$expr = $this->expr();
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
 
399 399
 	public function exprLimit(string $field, string $value, string $alias = '', bool $cs = true): string {
400 400
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
401
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
401
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
402 402
 		}
403 403
 
404 404
 		$expr = $this->expr();
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
 
417 417
 	public function exprLimitInt(string $field, int $value, string $alias = ''): string {
418 418
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
419
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
419
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
420 420
 		}
421 421
 
422 422
 		$expr = $this->expr();
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
 	 */
435 435
 	public function exprLimitBool(string $field, bool $value, string $alias = ''): string {
436 436
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
437
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
437
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
438 438
 		}
439 439
 
440 440
 		$expr = $this->expr();
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
 		string $alias = '',
456 456
 	): ICompositeExpression {
457 457
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
458
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
458
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
459 459
 		}
460 460
 
461 461
 		$expr = $this->expr();
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
 		string $alias = '',
482 482
 	): ICompositeExpression {
483 483
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
484
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
484
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
485 485
 		}
486 486
 
487 487
 		$expr = $this->expr();
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
 		int $type = IQueryBuilder::PARAM_STR_ARRAY,
537 537
 	): string {
538 538
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
539
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
539
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
540 540
 		}
541 541
 
542 542
 		$expr = $this->expr();
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
553 553
 	 */
554 554
 	public function exprLimitBitwise(string $field, int $flag, string $alias = ''): string {
555 555
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
556
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
556
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
557 557
 		}
558 558
 
559 559
 		$expr = $this->expr();
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
 	 */
576 576
 	public function exprLt(string $field, int $value, bool $lte = false, string $alias = ''): string {
577 577
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
578
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
578
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
579 579
 		}
580 580
 
581 581
 		$expr = $this->expr();
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 	 */
598 598
 	public function exprGt(string $field, int $value, bool $gte = false, string $alias = ''): string {
599 599
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
600
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
600
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
601 601
 		}
602 602
 
603 603
 		$expr = $this->expr();
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
 	 */
707 707
 	public function exprUnlike(string $field, string $value, string $alias = '', bool $cs = true): string {
708 708
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
709
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
709
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
710 710
 		}
711 711
 
712 712
 		$expr = $this->expr();
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
 	 */
731 731
 	public function exprFilter(string $field, string $value, string $alias = '', bool $cs = true): string {
732 732
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
733
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
733
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
734 734
 		}
735 735
 
736 736
 		$expr = $this->expr();
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 	 */
757 757
 	public function exprFilterInt(string $field, int $value, string $alias = ''): string {
758 758
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
759
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
759
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
760 760
 		}
761 761
 
762 762
 		$expr = $this->expr();
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
774 774
 	 */
775 775
 	public function exprFilterBool(string $field, bool $value, string $alias = ''): string {
776 776
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
777
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
777
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
778 778
 		}
779 779
 
780 780
 		$expr = $this->expr();
@@ -795,7 +795,7 @@  discard block
 block discarded – undo
795 795
 		string $alias = '',
796 796
 	): ICompositeExpression {
797 797
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
798
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
798
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
799 799
 		}
800 800
 
801 801
 		$expr = $this->expr();
@@ -821,7 +821,7 @@  discard block
 block discarded – undo
821 821
 		string $alias = '',
822 822
 	): ICompositeExpression {
823 823
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
824
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
824
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
825 825
 		}
826 826
 
827 827
 		$expr = $this->expr();
@@ -850,7 +850,7 @@  discard block
 block discarded – undo
850 850
 		bool $cs = true,
851 851
 	): ICompositeExpression {
852 852
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
853
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
853
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
854 854
 		}
855 855
 
856 856
 		$orX = $this->expr()->orX();
@@ -875,7 +875,7 @@  discard block
 block discarded – undo
875 875
 	 */
876 876
 	public function exprFilterInArray(string $field, array $values, string $alias = ''): string {
877 877
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
878
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
878
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
879 879
 		}
880 880
 
881 881
 		$expr = $this->expr();
@@ -893,7 +893,7 @@  discard block
 block discarded – undo
893 893
 	 */
894 894
 	public function exprFilterBitwise(string $field, int $flag, string $alias = ''): string {
895 895
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
896
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
896
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
897 897
 		}
898 898
 
899 899
 		$expr = $this->expr();
@@ -1054,12 +1054,12 @@  discard block
 block discarded – undo
1054 1054
 		string $alias = '',
1055 1055
 	): self {
1056 1056
 		$selectFields = array_map(
1057
-			function (string $item) use ($alias) {
1057
+			function(string $item) use ($alias) {
1058 1058
 				if ($alias === '') {
1059 1059
 					return $item;
1060 1060
 				}
1061 1061
 
1062
-				return $alias . '.' . $item;
1062
+				return $alias.'.'.$item;
1063 1063
 			}, $fields
1064 1064
 		);
1065 1065
 
@@ -1085,13 +1085,13 @@  discard block
 block discarded – undo
1085 1085
 		string $prefix,
1086 1086
 		array $default = [],
1087 1087
 	): self {
1088
-		$prefix = trim($prefix) . '_';
1088
+		$prefix = trim($prefix).'_';
1089 1089
 		foreach ($default as $k => $v) {
1090
-			$this->addDefaultValue($prefix . $k, (string)$v);
1090
+			$this->addDefaultValue($prefix.$k, (string)$v);
1091 1091
 		}
1092 1092
 
1093 1093
 		foreach ($fields as $field) {
1094
-			$this->selectAlias($alias . '.' . $field, $prefix . $field);
1094
+			$this->selectAlias($alias.'.'.$field, $prefix.$field);
1095 1095
 		}
1096 1096
 
1097 1097
 		return $this;
Please login to merge, or discard this patch.
lib/Command/CirclesJoin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 		} catch (FederatedItemException $e) {
159 159
 			if ($input->getOption('status-code')) {
160 160
 				throw new FederatedItemException(
161
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
161
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
162 162
 				);
163 163
 			}
164 164
 
Please login to merge, or discard this patch.
lib/Command/CirclesLeave.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 		} catch (FederatedItemException $e) {
159 159
 			if ($input->getOption('status-code')) {
160 160
 				throw new FederatedItemException(
161
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
161
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
162 162
 				);
163 163
 			}
164 164
 
Please login to merge, or discard this patch.
lib/Command/CirclesSetting.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 		} catch (FederatedItemException $e) {
159 159
 			if ($input->getOption('status-code')) {
160 160
 				throw new FederatedItemException(
161
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
161
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
162 162
 				);
163 163
 			}
164 164
 
Please login to merge, or discard this patch.
lib/Command/CirclesEdit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 		} catch (FederatedItemException $e) {
159 159
 			if ($input->getOption('status-code')) {
160 160
 				throw new FederatedItemException(
161
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
161
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
162 162
 				);
163 163
 			}
164 164
 
Please login to merge, or discard this patch.