Completed
Pull Request — master (#609)
by Maxence
02:38
created
lib/Service/ConfigService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 			return $value;
176 176
 		}
177 177
 
178
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
178
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
179 179
 			return $value;
180 180
 		}
181 181
 
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 		}
430 430
 
431 431
 		if (array_key_exists('port', $loopback)) {
432
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
432
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
433 433
 		} else {
434 434
 			$loopbackCloudId = $loopback['host'];
435 435
 		}
@@ -458,12 +458,12 @@  discard block
 block discarded – undo
458 458
 			$scheme = $this->getAppValue(self::LOOPBACK_CLOUD_SCHEME);
459 459
 		}
460 460
 
461
-		$base = $scheme . '://' . $instance;
461
+		$base = $scheme.'://'.$instance;
462 462
 		if ($route === '') {
463 463
 			return $base;
464 464
 		}
465 465
 
466
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
466
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
467 467
 	}
468 468
 
469 469
 
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
 			return '';
564 564
 		}
565 565
 
566
-		return (($showAt) ? '@' : '') . $instance;
566
+		return (($showAt) ? '@' : '').$instance;
567 567
 	}
568 568
 
569 569
 
Please login to merge, or discard this patch.
lib/Model/Member.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -811,29 +811,29 @@  discard block
 block discarded – undo
811 811
 	 * @throws MemberNotFoundException
812 812
 	 */
813 813
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
814
-		if ($this->get($prefix . 'single_id', $data) === '') {
814
+		if ($this->get($prefix.'single_id', $data) === '') {
815 815
 			throw new MemberNotFoundException();
816 816
 		}
817 817
 
818
-		$this->setId($this->get($prefix . 'member_id', $data));
819
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
820
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
821
-		$this->setUserId($this->get($prefix . 'user_id', $data));
822
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
823
-		$this->setInstance($this->get($prefix . 'instance', $data));
824
-		$this->setLevel($this->getInt($prefix . 'level', $data));
825
-		$this->setStatus($this->get($prefix . 'status', $data));
826
-		$this->setDisplayName($this->get($prefix . 'cached_name', $data));
827
-		$this->setNotes($this->getArray($prefix . 'note', $data));
828
-		$this->setContactId($this->get($prefix . 'contact_id', $data));
829
-		$this->setContactMeta($this->get($prefix . 'contact_meta', $data));
830
-
831
-		$cachedUpdate = $this->get($prefix . 'cached_update', $data);
818
+		$this->setId($this->get($prefix.'member_id', $data));
819
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
820
+		$this->setSingleId($this->get($prefix.'single_id', $data));
821
+		$this->setUserId($this->get($prefix.'user_id', $data));
822
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
823
+		$this->setInstance($this->get($prefix.'instance', $data));
824
+		$this->setLevel($this->getInt($prefix.'level', $data));
825
+		$this->setStatus($this->get($prefix.'status', $data));
826
+		$this->setDisplayName($this->get($prefix.'cached_name', $data));
827
+		$this->setNotes($this->getArray($prefix.'note', $data));
828
+		$this->setContactId($this->get($prefix.'contact_id', $data));
829
+		$this->setContactMeta($this->get($prefix.'contact_meta', $data));
830
+
831
+		$cachedUpdate = $this->get($prefix.'cached_update', $data);
832 832
 		if ($cachedUpdate !== '') {
833 833
 			$this->setDisplayUpdate(DateTime::createFromFormat('Y-m-d H:i:s', $cachedUpdate)->getTimestamp());
834 834
 		}
835 835
 
836
-		$joined = $this->get($prefix . 'joined', $data);
836
+		$joined = $this->get($prefix.'joined', $data);
837 837
 		if ($joined !== '') {
838 838
 			$this->setJoined(DateTime::createFromFormat('Y-m-d H:i:s', $joined)->getTimestamp());
839 839
 		}
@@ -924,7 +924,7 @@  discard block
 block discarded – undo
924 924
 	public static function parseLevelInt(int $level): int {
925 925
 		if (!array_key_exists($level, self::$DEF_LEVEL)) {
926 926
 			$all = implode(', ', array_keys(self::$DEF_LEVEL));
927
-			throw new ParseMemberLevelException('Available levels: ' . $all, 121);
927
+			throw new ParseMemberLevelException('Available levels: '.$all, 121);
928 928
 		}
929 929
 
930 930
 		return $level;
@@ -943,7 +943,7 @@  discard block
 block discarded – undo
943 943
 
944 944
 		if (!$level) {
945 945
 			$all = implode(', ', array_values(self::$DEF_LEVEL));
946
-			throw new ParseMemberLevelException('Available levels: ' . $all, 121);
946
+			throw new ParseMemberLevelException('Available levels: '.$all, 121);
947 947
 		}
948 948
 
949 949
 		return (int)$level;
@@ -964,7 +964,7 @@  discard block
 block discarded – undo
964 964
 		$type = array_search($typeString, Member::$TYPE);
965 965
 		if ($type === false) {
966 966
 			$all = implode(', ', array_values(self::$TYPE));
967
-			throw new UserTypeNotFoundException('Available types: ' . $all);
967
+			throw new UserTypeNotFoundException('Available types: '.$all);
968 968
 		}
969 969
 
970 970
 		return (int)$type;
Please login to merge, or discard this patch.
lib/Db/CoreQueryBuilder.php 1 patch
Spacing   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 		}
362 362
 
363 363
 		if ($circle->getDisplayName() !== '') {
364
-			$this->searchInDBField('display_name', '%' . $circle->getDisplayName() . '%');
364
+			$this->searchInDBField('display_name', '%'.$circle->getDisplayName().'%');
365 365
 		}
366 366
 	}
367 367
 
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
 			$this->generateRemoteInstanceSelectAlias($aliasRemoteInstance)
378 378
 				 ->leftJoin(
379 379
 					 $alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance,
380
-					 $expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance')
380
+					 $expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance')
381 381
 				 );
382 382
 		} catch (RequestBuilderException $e) {
383 383
 		}
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
 		$expr = $this->expr();
431 431
 		$this->leftJoin(
432 432
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote,
433
-			$expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance()))
433
+			$expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance()))
434 434
 		);
435 435
 	}
436 436
 
@@ -458,12 +458,12 @@  discard block
 block discarded – undo
458 458
 		$this->leftJoin(
459 459
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember,
460 460
 			$expr->andX(
461
-				$expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'),
461
+				$expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'),
462 462
 				$expr->eq(
463
-					$aliasRemoteMember . '.instance',
463
+					$aliasRemoteMember.'.instance',
464 464
 					$this->createNamedParameter($remoteInstance->getInstance())
465 465
 				),
466
-				$expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
466
+				$expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
467 467
 			)
468 468
 		);
469 469
 	}
@@ -495,21 +495,21 @@  discard block
 block discarded – undo
495 495
 		$this->leftJoin(
496 496
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle,
497 497
 			$expr->andX(
498
-				$expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'),
499
-				$expr->emptyString($aliasRemoteCircle . '.instance'),
500
-				$expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
498
+				$expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'),
499
+				$expr->emptyString($aliasRemoteCircle.'.instance'),
500
+				$expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
501 501
 			)
502 502
 		);
503 503
 		$this->leftJoin(
504 504
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner,
505 505
 			$expr->andX(
506
-				$expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'),
506
+				$expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'),
507 507
 				$expr->eq(
508
-					$aliasRemoteCircleOwner . '.instance',
508
+					$aliasRemoteCircleOwner.'.instance',
509 509
 					$this->createNamedParameter($remoteInstance->getInstance())
510 510
 				),
511 511
 				$expr->eq(
512
-					$aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)
512
+					$aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)
513 513
 				)
514 514
 			)
515 515
 		);
@@ -542,16 +542,16 @@  discard block
 block discarded – undo
542 542
 		$expr = $this->expr();
543 543
 		$orX = $expr->orX();
544 544
 		$orX->add(
545
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))
545
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))
546 546
 		);
547 547
 
548 548
 		$orExtOrPassive = $expr->orX();
549 549
 		$orExtOrPassive->add(
550
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
550
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
551 551
 		);
552 552
 		if (!$sensitive) {
553 553
 			$orExtOrPassive->add(
554
-				$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
554
+				$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
555 555
 			);
556 556
 		} else {
557 557
 			if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) {
@@ -560,8 +560,8 @@  discard block
 block discarded – undo
560 560
 		}
561 561
 
562 562
 		$orInstance = $expr->orX();
563
-		$orInstance->add($expr->isNotNull($aliasRemoteMember . '.instance'));
564
-		$orInstance->add($expr->isNotNull($aliasRemoteCircleOwner . '.instance'));
563
+		$orInstance->add($expr->isNotNull($aliasRemoteMember.'.instance'));
564
+		$orInstance->add($expr->isNotNull($aliasRemoteCircleOwner.'.instance'));
565 565
 
566 566
 		$andExternal = $expr->andX();
567 567
 		$andExternal->add($orExtOrPassive);
@@ -570,13 +570,13 @@  discard block
 block discarded – undo
570 570
 		$orExtOrTrusted = $expr->orX();
571 571
 		$orExtOrTrusted->add($andExternal);
572 572
 		$orExtOrTrusted->add(
573
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
573
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
574 574
 		);
575 575
 
576 576
 		$andTrusted = $expr->andX();
577 577
 		$andTrusted->add($orExtOrTrusted);
578 578
 		$andTrusted->add($this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle));
579
-		$andTrusted->add($expr->emptyString($aliasOwner . '.instance'));
579
+		$andTrusted->add($expr->emptyString($aliasOwner.'.instance'));
580 580
 		$orX->add($andTrusted);
581 581
 
582 582
 		$this->andWhere($orX);
@@ -603,7 +603,7 @@  discard block
 block discarded – undo
603 603
 		}
604 604
 		$this->leftJoin(
605 605
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
606
-			$expr->eq($aliasMember . '.circle_id', $alias . '.unique_id')
606
+			$expr->eq($aliasMember.'.circle_id', $alias.'.unique_id')
607 607
 		);
608 608
 
609 609
 		$this->filterDirectMembership($aliasMember, $member);
@@ -624,30 +624,30 @@  discard block
 block discarded – undo
624 624
 
625 625
 		if ($member->getUserId() !== '') {
626 626
 			$andX->add(
627
-				$expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId()))
627
+				$expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId()))
628 628
 			);
629 629
 		}
630 630
 
631 631
 		if ($member->getSingleId() !== '') {
632 632
 			$andX->add(
633
-				$expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId()))
633
+				$expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId()))
634 634
 			);
635 635
 		}
636 636
 
637 637
 		if ($member->getUserType() > 0) {
638 638
 			$andX->add(
639
-				$expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType()))
639
+				$expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType()))
640 640
 			);
641 641
 		}
642 642
 
643 643
 		$andX->add(
644
-			$expr->eq($aliasMember . '.instance', $this->createNamedParameter($this->getInstance($member)))
644
+			$expr->eq($aliasMember.'.instance', $this->createNamedParameter($this->getInstance($member)))
645 645
 		);
646 646
 
647 647
 		if ($member->getLevel() > 0) {
648 648
 			$andX->add(
649 649
 				$expr->gte(
650
-					$aliasMember . '.level',
650
+					$aliasMember.'.level',
651 651
 					$this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT)
652 652
 				)
653 653
 			);
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
688 688
 			$helperAlias,
689 689
 			CoreRequestBuilder::TABLE_CIRCLE,
690 690
 			$aliasCircle,
691
-			$expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field)
691
+			$expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field)
692 692
 		);
693 693
 
694 694
 		if (!is_null($initiator)) {
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 		$this->generateCircleSelectAlias($aliasInvitedBy)
720 720
 			 ->leftJoin(
721 721
 				 $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy,
722
-				 $expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id')
722
+				 $expr->eq($aliasMember.'.invited_by', $aliasInvitedBy.'.unique_id')
723 723
 			 );
724 724
 
725 725
 		$this->leftJoinOwner($aliasInvitedBy);
@@ -750,7 +750,7 @@  discard block
 block discarded – undo
750 750
 		$this->generateCircleSelectAlias($aliasBasedOn)
751 751
 			 ->leftJoin(
752 752
 				 $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn,
753
-				 $expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id')
753
+				 $expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id')
754 754
 			 );
755 755
 
756 756
 		if (!is_null($initiator)) {
@@ -783,9 +783,9 @@  discard block
 block discarded – undo
783 783
 			 ->leftJoin(
784 784
 				 $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
785 785
 				 $expr->andX(
786
-					 $expr->eq($aliasMember . '.circle_id', $alias . '.' . $field),
786
+					 $expr->eq($aliasMember.'.circle_id', $alias.'.'.$field),
787 787
 					 $expr->eq(
788
-						 $aliasMember . '.level',
788
+						 $aliasMember.'.level',
789 789
 						 $this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT)
790 790
 					 )
791 791
 				 )
@@ -823,10 +823,10 @@  discard block
 block discarded – undo
823 823
 			 ->leftJoin(
824 824
 				 $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
825 825
 				 $expr->andX(
826
-					 $expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId),
827
-					 $expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId),
826
+					 $expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId),
827
+					 $expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId),
828 828
 					 $expr->gte(
829
-						 $aliasMember . '.level',
829
+						 $aliasMember.'.level',
830 830
 						 $this->createNamedParameter(Member::LEVEL_MEMBER, self::PARAM_INT)
831 831
 					 )
832 832
 				 )
@@ -859,7 +859,7 @@  discard block
 block discarded – undo
859 859
 
860 860
 		$this->leftJoin(
861 861
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
862
-			$expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field)
862
+			$expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field)
863 863
 		);
864 864
 
865 865
 //		if (!$this->getBool('getData', $options, false)) {
@@ -873,8 +873,8 @@  discard block
 block discarded – undo
873 873
 			 ->leftJoin(
874 874
 				 $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy,
875 875
 				 $expr->andX(
876
-					 $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'),
877
-					 $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id')
876
+					 $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'),
877
+					 $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id')
878 878
 				 )
879 879
 			 );
880 880
 
@@ -891,12 +891,12 @@  discard block
 block discarded – undo
891 891
 		$aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options);
892 892
 		$this->leftJoin(
893 893
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership,
894
-			$expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId))
894
+			$expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId))
895 895
 		);
896 896
 
897 897
 		$orX = $expr->orX(
898
-			$expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field),
899
-			$expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId))
898
+			$expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field),
899
+			$expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId))
900 900
 		);
901 901
 
902 902
 		$this->andWhere($orX);
@@ -916,7 +916,7 @@  discard block
 block discarded – undo
916 916
 
917 917
 		$expr = $this->expr();
918 918
 		$aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS);
919
-		$this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId)));
919
+		$this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId)));
920 920
 	}
921 921
 
922 922
 
@@ -940,7 +940,7 @@  discard block
 block discarded – undo
940 940
 		$this->leftJoin(
941 941
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
942 942
 //			$expr->andX(
943
-			$expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field)
943
+			$expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field)
944 944
 //				$expr->eq($aliasMembership . '.single_id', $alias . '.single_id')
945 945
 //			)
946 946
 		);
@@ -954,8 +954,8 @@  discard block
 block discarded – undo
954 954
 			 ->leftJoin(
955 955
 				 $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom,
956 956
 				 $expr->andX(
957
-					 $expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'),
958
-					 $expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id')
957
+					 $expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'),
958
+					 $expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id')
959 959
 				 )
960 960
 			 );
961 961
 	}
@@ -1021,7 +1021,7 @@  discard block
 block discarded – undo
1021 1021
 			$aliasMembership,
1022 1022
 			$expr->andX(
1023 1023
 				$this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership),
1024
-				$expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field)
1024
+				$expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field)
1025 1025
 			)
1026 1026
 		);
1027 1027
 
@@ -1034,8 +1034,8 @@  discard block
 block discarded – undo
1034 1034
 			$this->leftJoin(
1035 1035
 				$aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator,
1036 1036
 				$expr->andX(
1037
-					$expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'),
1038
-					$expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id')
1037
+					$expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'),
1038
+					$expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id')
1039 1039
 				)
1040 1040
 			);
1041 1041
 
@@ -1043,8 +1043,8 @@  discard block
 block discarded – undo
1043 1043
 			$this->leftJoin(
1044 1044
 				$aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy,
1045 1045
 				$expr->andX(
1046
-					$expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'),
1047
-					$expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id')
1046
+					$expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'),
1047
+					$expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id')
1048 1048
 				)
1049 1049
 			);
1050 1050
 
@@ -1063,7 +1063,7 @@  discard block
 block discarded – undo
1063 1063
 			$aliasInheritedByMembership = $this->generateAlias($aliasInheritedBy, self::MEMBERSHIPS);
1064 1064
 			$this->generateMembershipSelectAlias($aliasMembership, $aliasInheritedByMembership);
1065 1065
 		} catch (RequestBuilderException $e) {
1066
-			\OC::$server->getLogger()->log(3, '-- ' . $e->getMessage());
1066
+			\OC::$server->getLogger()->log(3, '-- '.$e->getMessage());
1067 1067
 		}
1068 1068
 	}
1069 1069
 
@@ -1087,7 +1087,7 @@  discard block
 block discarded – undo
1087 1087
 		$orX = $expr->orX();
1088 1088
 		$orX->add(
1089 1089
 			$expr->andX(
1090
-				$expr->gte($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
1090
+				$expr->gte($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
1091 1091
 			)
1092 1092
 		);
1093 1093
 
@@ -1095,7 +1095,7 @@  discard block
 block discarded – undo
1095 1095
 			$orX->add(
1096 1096
 				$expr->andX(
1097 1097
 					$this->exprLimitBitwise('config', Circle::CFG_PERSONAL, $alias),
1098
-					$expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
1098
+					$expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
1099 1099
 				)
1100 1100
 			);
1101 1101
 		}
@@ -1104,7 +1104,7 @@  discard block
 block discarded – undo
1104 1104
 		}
1105 1105
 		if ($this->getBool('canBeVisitor', $options, false)) {
1106 1106
 			// TODO: should find a better way, also filter on remote initiator on non-federated ?
1107
-			$orX->add($expr->gte($alias . '.config', $this->createNamedParameter(0)));
1107
+			$orX->add($expr->gte($alias.'.config', $this->createNamedParameter(0)));
1108 1108
 		}
1109 1109
 		if ($this->getBool('canBeVisitorOnOpen', $options, false)) {
1110 1110
 			$andOpen = $expr->andX();
@@ -1172,21 +1172,21 @@  discard block
 block discarded – undo
1172 1172
 		$expr = $this->expr();
1173 1173
 		$andPassive = $expr->andX();
1174 1174
 		$andPassive->add(
1175
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
1175
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
1176 1176
 		);
1177 1177
 
1178 1178
 		$orMemberOrLevel = $expr->orX();
1179 1179
 		$orMemberOrLevel->add(
1180
-			$expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance')
1180
+			$expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance')
1181 1181
 		);
1182 1182
 		// TODO: do we need this ? (display members from the local instance)
1183 1183
 		$orMemberOrLevel->add(
1184
-			$expr->emptyString($this->getDefaultSelectAlias() . '.instance')
1184
+			$expr->emptyString($this->getDefaultSelectAlias().'.instance')
1185 1185
 		);
1186 1186
 
1187 1187
 		$orMemberOrLevel->add(
1188 1188
 			$expr->eq(
1189
-				$this->getDefaultSelectAlias() . '.level',
1189
+				$this->getDefaultSelectAlias().'.level',
1190 1190
 				$this->createNamedParameter(Member::LEVEL_OWNER)
1191 1191
 			)
1192 1192
 		);
@@ -1224,11 +1224,11 @@  discard block
 block discarded – undo
1224 1224
 			 )
1225 1225
 			 ->leftJoin(
1226 1226
 				 $aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache,
1227
-				 $expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid')
1227
+				 $expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid')
1228 1228
 			 )
1229 1229
 			 ->leftJoin(
1230 1230
 				 $aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages,
1231
-				 $expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id')
1231
+				 $expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id')
1232 1232
 			 );
1233 1233
 	}
1234 1234
 
@@ -1250,8 +1250,8 @@  discard block
 block discarded – undo
1250 1250
 		$this->leftJoin(
1251 1251
 			$aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild,
1252 1252
 			$expr->andX(
1253
-				$expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'),
1254
-				$expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id')
1253
+				$expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'),
1254
+				$expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id')
1255 1255
 			)
1256 1256
 		);
1257 1257
 
@@ -1301,13 +1301,13 @@  discard block
 block discarded – undo
1301 1301
 		$this->leftJoin(
1302 1302
 			$aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint,
1303 1303
 			$expr->andX(
1304
-				$expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'),
1305
-				$expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id')
1304
+				$expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'),
1305
+				$expr->eq($aliasMountpoint.'.single_id', $aliasMountMemberships.'.single_id')
1306 1306
 			)
1307 1307
 		);
1308 1308
 
1309
-		$this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint');
1310
-		$this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash');
1309
+		$this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint');
1310
+		$this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash');
1311 1311
 	}
1312 1312
 
1313 1313
 
@@ -1411,10 +1411,10 @@  discard block
 block discarded – undo
1411 1411
 	 */
1412 1412
 	public function generateAlias(string $base, string $extension, ?array &$options = []): string {
1413 1413
 		$search = str_replace('_', '.', $base);
1414
-		$path = $search . '.' . $extension;
1414
+		$path = $search.'.'.$extension;
1415 1415
 		if (!$this->validKey($path, self::$SQL_PATH)
1416 1416
 			&& !in_array($extension, $this->getArray($search, self::$SQL_PATH))) {
1417
-			throw new RequestBuilderException($extension . ' not found in ' . $search);
1417
+			throw new RequestBuilderException($extension.' not found in '.$search);
1418 1418
 		}
1419 1419
 
1420 1420
 		if (!is_array($options)) {
@@ -1423,15 +1423,15 @@  discard block
 block discarded – undo
1423 1423
 
1424 1424
 		$optionPath = '';
1425 1425
 		foreach (explode('.', $path) as $p) {
1426
-			$optionPath = trim($optionPath . '.' . $p, '.');
1426
+			$optionPath = trim($optionPath.'.'.$p, '.');
1427 1427
 			$options = array_merge(
1428 1428
 				$options,
1429
-				$this->getArray($optionPath . '.' . self::OPTIONS, self::$SQL_PATH),
1430
-				$this->getArray($optionPath . '.' . self::OPTIONS, $this->options)
1429
+				$this->getArray($optionPath.'.'.self::OPTIONS, self::$SQL_PATH),
1430
+				$this->getArray($optionPath.'.'.self::OPTIONS, $this->options)
1431 1431
 			);
1432 1432
 		}
1433 1433
 
1434
-		return $base . '_' . $extension;
1434
+		return $base.'_'.$extension;
1435 1435
 	}
1436 1436
 
1437 1437
 
@@ -1451,7 +1451,7 @@  discard block
 block discarded – undo
1451 1451
 			} else {
1452 1452
 				$k = $arr;
1453 1453
 			}
1454
-			$path[$k] = $prefix . '_' . $k . '_';
1454
+			$path[$k] = $prefix.'_'.$k.'_';
1455 1455
 		}
1456 1456
 
1457 1457
 		return $path;
Please login to merge, or discard this patch.
lib/FederatedItems/SingleMemberAdd.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -331,10 +331,10 @@  discard block
 block discarded – undo
331 331
 	protected function generateMember(FederatedEvent $event, Circle $circle, Member $member): Member {
332 332
 		try {
333 333
 			if ($member->getSingleId() !== '') {
334
-				$userId = $member->getSingleId() . '@' . $member->getInstance();
334
+				$userId = $member->getSingleId().'@'.$member->getInstance();
335 335
 				$federatedUser = $this->federatedUserService->getFederatedUser($userId, Member::TYPE_SINGLE);
336 336
 			} else {
337
-				$userId = $member->getUserId() . '@' . $member->getInstance();
337
+				$userId = $member->getUserId().'@'.$member->getInstance();
338 338
 				$federatedUser =
339 339
 					$this->federatedUserService->getFederatedUser($userId, $member->getUserType());
340 340
 			}
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 		}
448 448
 
449 449
 		$patron = $member->getInvitedBy();
450
-		\OC::$server->getLogger()->log(3, '### ' . $event->getOrigin() . ' - ' . $patron->getInstance());
450
+		\OC::$server->getLogger()->log(3, '### '.$event->getOrigin().' - '.$patron->getInstance());
451 451
 		if ($patron->getInstance() !== $event->getOrigin()) {
452 452
 			throw new FederatedItemBadRequestException(StatusCode::$MEMBER_ADD[130], 130);
453 453
 		}
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
 			$this->sendMailExistingShares($template, $author, $recipient);
640 640
 			$this->sendPasswordExistingShares($author, $recipient, $password);
641 641
 		} catch (Exception $e) {
642
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
642
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
643 643
 		}
644 644
 	}
645 645
 
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
792 792
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
793 793
 
794
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
794
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
795 795
 
796 796
 		$plainBodyPart = $this->l10n->t(
797 797
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -833,7 +833,7 @@  discard block
 block discarded – undo
833 833
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
834 834
 		if ($authorEmail !== null) {
835 835
 			$message->setReplyTo([$authorEmail => $authorName]);
836
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
836
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
837 837
 		} else {
838 838
 			$emailTemplate->addFooter();
839 839
 		}
Please login to merge, or discard this patch.