Completed
Pull Request — master (#1571)
by rakekniven
22s
created
lib/Tools/Db/ExtendedQueryBuilder.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 	 */
216 216
 	public function limitToCreation(int $delay = 0): self {
217 217
 		$date = new DateTime('now');
218
-		$date->sub(new DateInterval('PT' . $delay . 'M'));
218
+		$date->sub(new DateInterval('PT'.$delay.'M'));
219 219
 
220 220
 		$this->limitToDBFieldDateTime('creation', $date, true);
221 221
 
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 		$expr = $this->expr();
233 233
 		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias()
234 234
 																. '.' : '';
235
-		$field = $pf . $field;
235
+		$field = $pf.$field;
236 236
 
237 237
 		$orX = $expr->orX();
238 238
 		$orX->add(
@@ -262,8 +262,8 @@  discard block
 block discarded – undo
262 262
 		}
263 263
 
264 264
 		$expr = $this->expr();
265
-		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias() . '.' : '';
266
-		$field = $pf . $field;
265
+		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias().'.' : '';
266
+		$field = $pf.$field;
267 267
 
268 268
 		$orX = $expr->orX();
269 269
 		$orX->add(
@@ -281,8 +281,8 @@  discard block
 block discarded – undo
281 281
 	public function searchInDBField(string $field, string $value): void {
282 282
 		$expr = $this->expr();
283 283
 
284
-		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias() . '.' : '';
285
-		$field = $pf . $field;
284
+		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias().'.' : '';
285
+		$field = $pf.$field;
286 286
 
287 287
 		$this->andWhere($expr->iLike($field, $this->createNamedParameter($value)));
288 288
 	}
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
 	 */
405 405
 	public function exprLike(string $field, string $value, string $alias = '', bool $cs = true): string {
406 406
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
407
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
407
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
408 408
 		}
409 409
 
410 410
 		$expr = $this->expr();
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
 
418 418
 	public function exprLimit(string $field, string $value, string $alias = '', bool $cs = true): string {
419 419
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
420
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
420
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
421 421
 		}
422 422
 
423 423
 		$expr = $this->expr();
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
 
436 436
 	public function exprLimitInt(string $field, int $value, string $alias = ''): string {
437 437
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
438
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
438
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
439 439
 		}
440 440
 
441 441
 		$expr = $this->expr();
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
 	 */
454 454
 	public function exprLimitBool(string $field, bool $value, string $alias = ''): string {
455 455
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
456
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
456
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
457 457
 		}
458 458
 
459 459
 		$expr = $this->expr();
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
 		string $alias = ''
475 475
 	): ICompositeExpression {
476 476
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
477
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
477
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
478 478
 		}
479 479
 
480 480
 		$expr = $this->expr();
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
 		string $alias = ''
501 501
 	): ICompositeExpression {
502 502
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
503
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
503
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
504 504
 		}
505 505
 
506 506
 		$expr = $this->expr();
@@ -529,7 +529,7 @@  discard block
 block discarded – undo
529 529
 		bool $cs = true
530 530
 	): ICompositeExpression {
531 531
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
532
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
532
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
533 533
 		}
534 534
 
535 535
 		$andX = $this->expr()->andX();
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
554 554
 	 */
555 555
 	public function exprLimitInArray(string $field, array $values, string $alias = ''): string {
556 556
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
557
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
557
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
558 558
 		}
559 559
 
560 560
 		$expr = $this->expr();
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
 	 */
573 573
 	public function exprLimitBitwise(string $field, int $flag, string $alias = ''): string {
574 574
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
575
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
575
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
576 576
 		}
577 577
 
578 578
 		$expr = $this->expr();
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
 	 */
595 595
 	public function exprLt(string $field, int $value, bool $lte = false, string $alias = ''): string {
596 596
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
597
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
597
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
598 598
 		}
599 599
 
600 600
 		$expr = $this->expr();
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
 	 */
617 617
 	public function exprGt(string $field, int $value, bool $gte = false, string $alias = ''): string {
618 618
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
619
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
619
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
620 620
 		}
621 621
 
622 622
 		$expr = $this->expr();
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
 	 */
726 726
 	public function exprUnlike(string $field, string $value, string $alias = '', bool $cs = true): string {
727 727
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
728
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
728
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
729 729
 		}
730 730
 
731 731
 		$expr = $this->expr();
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
749 749
 	 */
750 750
 	public function exprFilter(string $field, string $value, string $alias = '', bool $cs = true): string {
751 751
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
752
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
752
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
753 753
 		}
754 754
 
755 755
 		$expr = $this->expr();
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
775 775
 	 */
776 776
 	public function exprFilterInt(string $field, int $value, string $alias = ''): string {
777 777
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
778
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
778
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
779 779
 		}
780 780
 
781 781
 		$expr = $this->expr();
@@ -793,7 +793,7 @@  discard block
 block discarded – undo
793 793
 	 */
794 794
 	public function exprFilterBool(string $field, bool $value, string $alias = ''): string {
795 795
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
796
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
796
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
797 797
 		}
798 798
 
799 799
 		$expr = $this->expr();
@@ -814,7 +814,7 @@  discard block
 block discarded – undo
814 814
 		string $alias = ''
815 815
 	): ICompositeExpression {
816 816
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
817
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
817
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
818 818
 		}
819 819
 
820 820
 		$expr = $this->expr();
@@ -840,7 +840,7 @@  discard block
 block discarded – undo
840 840
 		string $alias = ''
841 841
 	): ICompositeExpression {
842 842
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
843
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
843
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
844 844
 		}
845 845
 
846 846
 		$expr = $this->expr();
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
 		bool $cs = true
870 870
 	): ICompositeExpression {
871 871
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
872
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
872
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
873 873
 		}
874 874
 
875 875
 		$orX = $this->expr()->orX();
@@ -894,7 +894,7 @@  discard block
 block discarded – undo
894 894
 	 */
895 895
 	public function exprFilterInArray(string $field, array $values, string $alias = ''): string {
896 896
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
897
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
897
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
898 898
 		}
899 899
 
900 900
 		$expr = $this->expr();
@@ -912,7 +912,7 @@  discard block
 block discarded – undo
912 912
 	 */
913 913
 	public function exprFilterBitwise(string $field, int $flag, string $alias = ''): string {
914 914
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
915
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
915
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
916 916
 		}
917 917
 
918 918
 		$expr = $this->expr();
@@ -1073,12 +1073,12 @@  discard block
 block discarded – undo
1073 1073
 		string $alias = ''
1074 1074
 	): self {
1075 1075
 		$selectFields = array_map(
1076
-			function (string $item) use ($alias) {
1076
+			function(string $item) use ($alias) {
1077 1077
 				if ($alias === '') {
1078 1078
 					return $item;
1079 1079
 				}
1080 1080
 
1081
-				return $alias . '.' . $item;
1081
+				return $alias.'.'.$item;
1082 1082
 			}, $fields
1083 1083
 		);
1084 1084
 
@@ -1104,13 +1104,13 @@  discard block
 block discarded – undo
1104 1104
 		string $prefix,
1105 1105
 		array $default = []
1106 1106
 	): self {
1107
-		$prefix = trim($prefix) . '_';
1107
+		$prefix = trim($prefix).'_';
1108 1108
 		foreach ($default as $k => $v) {
1109
-			$this->addDefaultValue($prefix . $k, (string)$v);
1109
+			$this->addDefaultValue($prefix.$k, (string)$v);
1110 1110
 		}
1111 1111
 
1112 1112
 		foreach ($fields as $field) {
1113
-			$this->selectAlias($alias . '.' . $field, $prefix . $field);
1113
+			$this->selectAlias($alias.'.'.$field, $prefix.$field);
1114 1114
 		}
1115 1115
 
1116 1116
 		return $this;
Please login to merge, or discard this patch.
lib/Service/CircleService.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 
581 581
 		$i = 1;
582 582
 		while (true) {
583
-			$testDisplayName = $baseDisplayName . (($i > 1) ? ' (' . $i . ')' : '');
583
+			$testDisplayName = $baseDisplayName.(($i > 1) ? ' ('.$i.')' : '');
584 584
 			$test = new Circle();
585 585
 			$test->setDisplayName($testDisplayName);
586 586
 
@@ -613,7 +613,7 @@  discard block
 block discarded – undo
613 613
 
614 614
 		$i = 1;
615 615
 		while (true) {
616
-			$testSanitizedName = $baseSanitizedName . (($i > 1) ? ' (' . $i . ')' : '');
616
+			$testSanitizedName = $baseSanitizedName.(($i > 1) ? ' ('.$i.')' : '');
617 617
 
618 618
 			$test = new Circle();
619 619
 			$test->setSanitizedName($testSanitizedName);
@@ -755,7 +755,7 @@  discard block
 block discarded – undo
755 755
 
756 756
 
757 757
 	private function generateGetCirclesCacheKey(FederatedUser $federatedUser, string $probeSum): string {
758
-		return $federatedUser->getSingleId() . '#' . $probeSum;
758
+		return $federatedUser->getSingleId().'#'.$probeSum;
759 759
 	}
760 760
 
761 761
 
Please login to merge, or discard this patch.
lib/ShareByCircleProvider.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
 
447 447
 		return array_filter(
448 448
 			array_map(
449
-				function (ShareWrapper $wrapper) {
449
+				function(ShareWrapper $wrapper) {
450 450
 					return $wrapper->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
451 451
 				}, $wrappedShares
452 452
 			)
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
498 498
 
499 499
 		return array_filter(
500 500
 			array_map(
501
-				function (ShareWrapper $wrapper) {
501
+				function(ShareWrapper $wrapper) {
502 502
 					return $wrapper->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
503 503
 				}, $wrappedShares
504 504
 			)
@@ -547,7 +547,7 @@  discard block
 block discarded – undo
547 547
 
548 548
 		return array_filter(
549 549
 			array_map(
550
-				function (ShareWrapper $wrapper) {
550
+				function(ShareWrapper $wrapper) {
551 551
 					return $wrapper->getShare(
552 552
 						$this->rootFolder, $this->userManager, $this->urlGenerator, true
553 553
 					);
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
578 578
 
579 579
 		$share = $wrappedShare->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
580 580
 		if ($share->getPassword() !== '') {
581
-			$this->logger->notice('share is protected by a password, hash: ' . $share->getPassword());
581
+			$this->logger->notice('share is protected by a password, hash: '.$share->getPassword());
582 582
 		}
583 583
 
584 584
 		return $share;
Please login to merge, or discard this patch.
lib/Listeners/Files/RemovingMember.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 		$singleIds = array_merge(
99 99
 			[$circle->getSingleId()],
100 100
 			array_map(
101
-				function (Membership $membership) {
101
+				function(Membership $membership) {
102 102
 					return $membership->getCircleId();
103 103
 				}, $circle->getMemberships()
104 104
 			)
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 			try {
153 153
 				$this->shareWrapperService->deleteUserSharesToCircle($singleId, $member->getUserId());
154 154
 			} catch (\Exception $e) {
155
-				$this->logger->notice('issue while deleting user shares: ' . $e->getMessage());
155
+				$this->logger->notice('issue while deleting user shares: '.$e->getMessage());
156 156
 			}
157 157
 		}
158 158
 	}
Please login to merge, or discard this patch.
lib/Db/EventWrapperRequest.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
 				$qb->exprLimitInt('status', EventWrapper::STATUS_FAILED),
106 106
 				$expr->andX(
107 107
 					$qb->exprLimitInt('status', EventWrapper::STATUS_INIT),
108
-					$qb->exprGt('creation', time() - 86400),  // only freshly created; less than 3 hours
108
+					$qb->exprGt('creation', time() - 86400), // only freshly created; less than 3 hours
109 109
 					$qb->exprLt('creation', time() - 900)     // but not too fresh, at least 15 minutes
110 110
 				)
111 111
 			)
Please login to merge, or discard this patch.
lib/Service/ConfigService.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 			return $value;
245 245
 		}
246 246
 
247
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
247
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
248 248
 			return $value;
249 249
 		}
250 250
 
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
498 498
 	 */
499 499
 	public function getTrustedDomains(): array {
500 500
 		return array_map(
501
-			function (string $address) {
501
+			function(string $address) {
502 502
 				return strtolower($address);
503 503
 			}, $this->config->getSystemValue('trusted_domains', [])
504 504
 		);
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
 		}
535 535
 
536 536
 		if (array_key_exists('port', $loopback)) {
537
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
537
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
538 538
 		} else {
539 539
 			$loopbackCloudId = $loopback['host'];
540 540
 		}
@@ -573,13 +573,13 @@  discard block
 block discarded – undo
573 573
 			$path = $this->getAppValue(self::LOOPBACK_CLOUD_PATH);
574 574
 		}
575 575
 
576
-		$base = $scheme . '://' . $instance . $path;
576
+		$base = $scheme.'://'.$instance.$path;
577 577
 
578 578
 		if ($route === '') {
579 579
 			return $base;
580 580
 		}
581 581
 
582
-		return rtrim($base, '/') . $this->linkToRoute($route, $args);
582
+		return rtrim($base, '/').$this->linkToRoute($route, $args);
583 583
 	}
584 584
 
585 585
 
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 	): string {
685 685
 		$name = ($displayName) ? $federatedUser->getDisplayName() : $federatedUser->getUserId();
686 686
 		if ($federatedUser->getUserType() === Member::TYPE_MAIL) {
687
-			return $name . ' ' . $this->displayInstance(
687
+			return $name.' '.$this->displayInstance(
688 688
 				$federatedUser->getInstance(),
689 689
 				self::DISPLAY_PARENTHESIS
690 690
 			);
@@ -694,7 +694,7 @@  discard block
 block discarded – undo
694 694
 			return $name;
695 695
 		}
696 696
 
697
-		return $name . $this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT);
697
+		return $name.$this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT);
698 698
 	}
699 699
 
700 700
 	/**
@@ -710,9 +710,9 @@  discard block
 block discarded – undo
710 710
 
711 711
 		switch ($type) {
712 712
 			case self::DISPLAY_AT:
713
-				return '@' . $instance;
713
+				return '@'.$instance;
714 714
 			case self::DISPLAY_PARENTHESIS:
715
-				return '(' . $instance . ')';
715
+				return '('.$instance.')';
716 716
 		}
717 717
 
718 718
 		return $instance;
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
764 764
 			// when running from the occ command, /index.php is not removed by itself
765 765
 			if (str_starts_with($path, '/index.php/')
766 766
 				&& $this->config->getSystemValueString('htaccess.RewriteBase', '') !== '') {
767
-				$path = $this->config->getSystemValueString('htaccess.RewriteBase', '/') . substr($path, 11);
767
+				$path = $this->config->getSystemValueString('htaccess.RewriteBase', '/').substr($path, 11);
768 768
 			}
769 769
 
770 770
 			$knownPath = parse_url($this->config->getSystemValue('overwrite.cli.url'), PHP_URL_PATH);
Please login to merge, or discard this patch.
lib/Command/CirclesRemote.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -173,19 +173,19 @@  discard block
 block discarded – undo
173 173
 
174 174
 		$webfinger = $this->getWebfinger($host, Application::APP_SUBJECT);
175 175
 		if ($this->input->getOption('all')) {
176
-			$this->output->writeln('- Webfinger on <info>' . $host . '</info>');
176
+			$this->output->writeln('- Webfinger on <info>'.$host.'</info>');
177 177
 			$this->output->writeln(json_encode($webfinger, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
178 178
 			$this->output->writeln('');
179 179
 		}
180 180
 
181 181
 		if ($this->input->getOption('all')) {
182 182
 			$circleLink = $this->extractLink(Application::APP_REL, $webfinger);
183
-			$this->output->writeln('- Information about Circles app on <info>' . $host . '</info>');
183
+			$this->output->writeln('- Information about Circles app on <info>'.$host.'</info>');
184 184
 			$this->output->writeln(json_encode($circleLink, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
185 185
 			$this->output->writeln('');
186 186
 		}
187 187
 
188
-		$this->output->writeln('- Available services on <info>' . $host . '</info>');
188
+		$this->output->writeln('- Available services on <info>'.$host.'</info>');
189 189
 		foreach ($webfinger->getLinks() as $link) {
190 190
 			$app = $link->getProperty('name');
191 191
 			$ver = $link->getProperty('version');
@@ -193,14 +193,14 @@  discard block
 block discarded – undo
193 193
 				$app .= ' ';
194 194
 			}
195 195
 			if ($ver !== '') {
196
-				$ver = 'v' . $ver;
196
+				$ver = 'v'.$ver;
197 197
 			}
198 198
 
199
-			$this->output->writeln(' * ' . $link->getRel() . ' ' . $app . $ver);
199
+			$this->output->writeln(' * '.$link->getRel().' '.$app.$ver);
200 200
 		}
201 201
 		$this->output->writeln('');
202 202
 
203
-		$this->output->writeln('- Resources related to Circles on <info>' . $host . '</info>');
203
+		$this->output->writeln('- Resources related to Circles on <info>'.$host.'</info>');
204 204
 		$resource = $this->getResourceData($host, Application::APP_SUBJECT, Application::APP_REL);
205 205
 		$this->output->writeln(json_encode($resource, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
206 206
 		$this->output->writeln('');
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 
209 209
 		$tempUid = $resource->g('uid');
210 210
 		$this->output->writeln(
211
-			'- Confirming UID=' . $tempUid . ' from parsed Signatory at <info>' . $host . '</info>'
211
+			'- Confirming UID='.$tempUid.' from parsed Signatory at <info>'.$host.'</info>'
212 212
 		);
213 213
 
214 214
 		try {
@@ -217,15 +217,15 @@  discard block
 block discarded – undo
217 217
 			$this->output->writeln(' * No SignatureException: <info>Identity authed</info>');
218 218
 		} catch (SignatureException $e) {
219 219
 			$this->output->writeln(
220
-				'<error>' . $host . ' cannot auth its identity: ' . $e->getMessage() . '</error>'
220
+				'<error>'.$host.' cannot auth its identity: '.$e->getMessage().'</error>'
221 221
 			);
222 222
 
223 223
 			return;
224 224
 		}
225 225
 
226
-		$this->output->writeln(' * Found <info>' . $remoteSignatory->getUid() . '</info>');
226
+		$this->output->writeln(' * Found <info>'.$remoteSignatory->getUid().'</info>');
227 227
 		if ($remoteSignatory->getUid(true) !== $tempUid) {
228
-			$this->output->writeln('<error>looks like ' . $host . ' is faking its identity');
228
+			$this->output->writeln('<error>looks like '.$host.' is faking its identity');
229 229
 
230 230
 			return;
231 231
 		}
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 		$this->output->writeln('');
234 234
 
235 235
 		$testUrl = $resource->g('test');
236
-		$this->output->writeln('- Testing signed payload on <info>' . $testUrl . '</info>');
236
+		$this->output->writeln('- Testing signed payload on <info>'.$testUrl.'</info>');
237 237
 
238 238
 		try {
239 239
 			$localSignatory = $this->remoteStreamService->getAppSignatory();
@@ -255,18 +255,18 @@  discard block
 block discarded – undo
255 255
 		$this->output->writeln('');
256 256
 
257 257
 		$this->output->writeln(' * Clear Signature: ');
258
-		$this->output->writeln('<comment>' . $signedRequest->getClearSignature() . '</comment>');
258
+		$this->output->writeln('<comment>'.$signedRequest->getClearSignature().'</comment>');
259 259
 		$this->output->writeln('');
260 260
 
261 261
 		$this->output->writeln(' * Signed Signature (base64 encoded): ');
262 262
 		$this->output->writeln(
263
-			'<comment>' . base64_encode($signedRequest->getSignedSignature()) . '</comment>'
263
+			'<comment>'.base64_encode($signedRequest->getSignedSignature()).'</comment>'
264 264
 		);
265 265
 		$this->output->writeln('');
266 266
 
267 267
 		$result = $signedRequest->getOutgoingRequest()->getResult();
268 268
 		$code = $result->getStatusCode();
269
-		$this->output->writeln(' * Result: ' . (($code === 200) ? '<info>' . $code . '</info>' : $code));
269
+		$this->output->writeln(' * Result: '.(($code === 200) ? '<info>'.$code.'</info>' : $code));
270 270
 		$this->output->writeln(
271 271
 			json_encode(json_decode($result->getContent(), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
272 272
 		);
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 				$stored = new RemoteInstance();
289 289
 				$this->remoteStreamService->confirmValidRemote($remoteSignatory, $stored);
290 290
 				$this->output->writeln(
291
-					'<info>The remote instance ' . $host
291
+					'<info>The remote instance '.$host
292 292
 					. ' is already known with this current identity</info>'
293 293
 				);
294 294
 
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 
299 299
 				if ($remoteSignatory->getType() !== $stored->getType()) {
300 300
 					$this->output->writeln(
301
-						'- updating type from ' . $stored->getType() . ' to '
301
+						'- updating type from '.$stored->getType().' to '
302 302
 						. $remoteSignatory->getType()
303 303
 					);
304 304
 					$this->remoteStreamService->update(
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 
309 309
 				if ($remoteSignatory->getInstance() !== $stored->getInstance()) {
310 310
 					$this->output->writeln(
311
-						'- updating host from ' . $stored->getInstance() . ' to '
311
+						'- updating host from '.$stored->getInstance().' to '
312 312
 						. $remoteSignatory->getInstance()
313 313
 					);
314 314
 					$this->remoteStreamService->update(
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 				}
318 318
 				if ($remoteSignatory->getId() !== $stored->getId()) {
319 319
 					$this->output->writeln(
320
-						'- updating href/Id from ' . $stored->getId() . ' to '
320
+						'- updating href/Id from '.$stored->getId().' to '
321 321
 						. $remoteSignatory->getId()
322 322
 					);
323 323
 					$this->remoteStreamService->update($remoteSignatory, RemoteStreamService::UPDATE_HREF);
@@ -341,10 +341,10 @@  discard block
 block discarded – undo
341 341
 		$helper = $this->getHelper('question');
342 342
 
343 343
 		$this->output->writeln(
344
-			'The remote instance <info>' . $remoteSignatory->getInstance() . '</info> looks good.'
344
+			'The remote instance <info>'.$remoteSignatory->getInstance().'</info> looks good.'
345 345
 		);
346 346
 		$question = new ConfirmationQuestion(
347
-			'Would you like to identify this remote instance as \'<comment>' . $remoteSignatory->getType()
347
+			'Would you like to identify this remote instance as \'<comment>'.$remoteSignatory->getType()
348 348
 			. '</comment>\' using interface \'<comment>'
349 349
 			. InterfaceService::$LIST_IFACE[$remoteSignatory->getInterface()]
350 350
 			. '</comment>\' ? (y/N) ',
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 		$helper = $this->getHelper('question');
373 373
 
374 374
 		$this->output->writeln(
375
-			'The remote instance <info>' . $remoteSignatory->getInstance()
375
+			'The remote instance <info>'.$remoteSignatory->getInstance()
376 376
 			. '</info> is known but <error>its identity has changed.</error>'
377 377
 		);
378 378
 		$this->output->writeln(
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
 	private function verifyGSInstances(): void {
435 435
 		$instances = $this->globalScaleService->getGlobalScaleInstances();
436 436
 		$known = array_map(
437
-			function (RemoteInstance $instance): string {
437
+			function(RemoteInstance $instance): string {
438 438
 				return $instance->getInstance();
439 439
 			}, $this->remoteRequest->getFromType(RemoteInstance::TYPE_GLOBALSCALE)
440 440
 		);
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 	 * @param string $instance
451 451
 	 */
452 452
 	private function syncGSInstance(string $instance): void {
453
-		$this->output->write('Adding <comment>' . $instance . '</comment>: ');
453
+		$this->output->write('Adding <comment>'.$instance.'</comment>: ');
454 454
 		if ($this->configService->isLocalInstance($instance)) {
455 455
 			$this->output->writeln('<comment>instance is local</comment>');
456 456
 			return;
@@ -465,8 +465,8 @@  discard block
 block discarded – undo
465 465
 			);
466 466
 			$this->output->writeln('<info>ok</info>');
467 467
 		} catch (Exception $e) {
468
-			$msg = ($e->getMessage() === '') ? '' : ' (' . $e->getMessage() . ')';
469
-			$this->output->writeln('<error>' . get_class($e) . $msg . '</error>');
468
+			$msg = ($e->getMessage() === '') ? '' : ' ('.$e->getMessage().')';
469
+			$this->output->writeln('<error>'.get_class($e).$msg.'</error>');
470 470
 		}
471 471
 	}
472 472
 
@@ -484,12 +484,12 @@  discard block
 block discarded – undo
484 484
 			try {
485 485
 				$current = $this->remoteStreamService->retrieveRemoteInstance($instance->getInstance());
486 486
 				if ($current->getUid(true) === $instance->getUid(true)) {
487
-					$currentUid = '<info>' . $current->getUid(true) . '</info>';
487
+					$currentUid = '<info>'.$current->getUid(true).'</info>';
488 488
 				} else {
489
-					$currentUid = '<error>' . $current->getUid(true) . '</error>';
489
+					$currentUid = '<error>'.$current->getUid(true).'</error>';
490 490
 				}
491 491
 			} catch (Exception $e) {
492
-				$currentUid = '<error>' . $e->getMessage() . '</error>';
492
+				$currentUid = '<error>'.$e->getMessage().'</error>';
493 493
 			}
494 494
 
495 495
 			$table->appendRow(
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 			}
517 517
 		}
518 518
 
519
-		throw new Exception('Unknown type: ' . implode(', ', RemoteInstance::$LIST_TYPE));
519
+		throw new Exception('Unknown type: '.implode(', ', RemoteInstance::$LIST_TYPE));
520 520
 	}
521 521
 
522 522
 	/**
@@ -529,6 +529,6 @@  discard block
 block discarded – undo
529 529
 			}
530 530
 		}
531 531
 
532
-		throw new Exception('Unknown interface: ' . implode(', ', InterfaceService::$LIST_IFACE));
532
+		throw new Exception('Unknown interface: '.implode(', ', InterfaceService::$LIST_IFACE));
533 533
 	}
534 534
 }
Please login to merge, or discard this patch.
lib/Api/v1/Circles.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -252,7 +252,7 @@
 block discarded – undo
252 252
 			try {
253 253
 				$circleService->getCircle($uniqueId); // checking current user have access to said circle
254 254
 				$files = array_map(
255
-					function (ShareWrapper $wrapper): int {
255
+					function(ShareWrapper $wrapper): int {
256 256
 						return $wrapper->getFileSource();
257 257
 					}, $shareWrapperService->getSharesToCircle($uniqueId)
258 258
 				);
Please login to merge, or discard this patch.
lib/AppInfo/Application.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@
 block discarded – undo
168 168
 	public function registerFilesNavigation() {
169 169
 		$appManager = FilesApp::getNavigationManager();
170 170
 		$appManager->add(
171
-			function () {
171
+			function() {
172 172
 				$l = OC::$server->getL10N('circles');
173 173
 
174 174
 				return [
Please login to merge, or discard this patch.