@@ -104,16 +104,16 @@ |
||
104 | 104 | } catch (Exception $e) { |
105 | 105 | $this->e($e); |
106 | 106 | |
107 | - return $membership->getSingleId() . ' is now ' . $inheritance . ' of ' |
|
107 | + return $membership->getSingleId().' is now '.$inheritance.' of ' |
|
108 | 108 | . $membership->getCircleId(); |
109 | 109 | } |
110 | 110 | |
111 | - return $federatedUser->getUserId() . ' (' . Member::$TYPE[$federatedUser->getUserType()] |
|
112 | - . ') is now ' . $inheritance . ' of ' . $membership->getCircleId(); |
|
111 | + return $federatedUser->getUserId().' ('.Member::$TYPE[$federatedUser->getUserType()] |
|
112 | + . ') is now '.$inheritance.' of '.$membership->getCircleId(); |
|
113 | 113 | }, $event->getMemberships() |
114 | 114 | ); |
115 | 115 | |
116 | - $this->log(3, $prefix . implode('. ', $memberships)); |
|
116 | + $this->log(3, $prefix.implode('. ', $memberships)); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | } |
@@ -96,13 +96,13 @@ discard block |
||
96 | 96 | $circle = $event->getCircle(); |
97 | 97 | $eventType = ($event->getType() === CircleGenericEvent::INVITED) ? 'invited' : 'joined'; |
98 | 98 | |
99 | - $info = 'A new member have been added (' . $eventType . ') to a Circle. '; |
|
99 | + $info = 'A new member have been added ('.$eventType.') to a Circle. '; |
|
100 | 100 | |
101 | - $info .= 'userId: ' . $member->getUserId() . '; userType: ' . Member::$TYPE[$member->getUserType( |
|
101 | + $info .= 'userId: '.$member->getUserId().'; userType: '.Member::$TYPE[$member->getUserType( |
|
102 | 102 | )] |
103 | - . '; singleId: ' . $member->getSingleId() . '; memberId: ' . $member->getId() |
|
104 | - . '; isLocal: ' . json_encode($member->isLocal()) . '; level: ' |
|
105 | - . Member::$DEF_LEVEL[$member->getLevel()] . '; '; |
|
103 | + . '; singleId: '.$member->getSingleId().'; memberId: '.$member->getId() |
|
104 | + . '; isLocal: '.json_encode($member->isLocal()).'; level: ' |
|
105 | + . Member::$DEF_LEVEL[$member->getLevel()].'; '; |
|
106 | 106 | |
107 | 107 | $memberships = array_map( |
108 | 108 | function(Membership $membership) { |
@@ -111,22 +111,22 @@ discard block |
||
111 | 111 | ); |
112 | 112 | |
113 | 113 | $listMemberships = (count($memberships) > 0) ? implode(', ', $memberships) : 'none'; |
114 | - $info .= 'circleName: ' . $circle->getDisplayName() . '; circleId: ' . $circle->getSingleId() |
|
115 | - . '; Circle memberships: ' . $listMemberships . '.'; |
|
114 | + $info .= 'circleName: '.$circle->getDisplayName().'; circleId: '.$circle->getSingleId() |
|
115 | + . '; Circle memberships: '.$listMemberships.'.'; |
|
116 | 116 | |
117 | 117 | if ($member->getUserType() === Member::TYPE_CIRCLE) { |
118 | 118 | $basedOn = $member->getBasedOn(); |
119 | 119 | $members = array_map( |
120 | 120 | function(Member $member) { |
121 | - return $member->getUserId() . ' (' . Member::$TYPE[$member->getUserType()] . ')'; |
|
121 | + return $member->getUserId().' ('.Member::$TYPE[$member->getUserType()].')'; |
|
122 | 122 | }, $basedOn->getInheritedMembers() |
123 | 123 | ); |
124 | 124 | |
125 | - $info .= ' Member is a Circle (singleId: ' . $basedOn->getSingleId() |
|
126 | - . ') that contains those inherited members: ' . implode(', ', $members); |
|
125 | + $info .= ' Member is a Circle (singleId: '.$basedOn->getSingleId() |
|
126 | + . ') that contains those inherited members: '.implode(', ', $members); |
|
127 | 127 | } |
128 | 128 | |
129 | - $this->log(3, $prefix . $info); |
|
129 | + $this->log(3, $prefix.$info); |
|
130 | 130 | } |
131 | 131 | } |
132 | 132 |
@@ -717,29 +717,29 @@ discard block |
||
717 | 717 | * @throws MemberNotFoundException |
718 | 718 | */ |
719 | 719 | public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { |
720 | - if ($this->get($prefix . 'single_id', $data) === '') { |
|
720 | + if ($this->get($prefix.'single_id', $data) === '') { |
|
721 | 721 | throw new MemberNotFoundException(); |
722 | 722 | } |
723 | 723 | |
724 | - $this->setId($this->get($prefix . 'member_id', $data)); |
|
725 | - $this->setCircleId($this->get($prefix . 'circle_id', $data)); |
|
726 | - $this->setSingleId($this->get($prefix . 'single_id', $data)); |
|
727 | - $this->setUserId($this->get($prefix . 'user_id', $data)); |
|
728 | - $this->setUserType($this->getInt($prefix . 'user_type', $data)); |
|
729 | - $this->setInstance($this->get($prefix . 'instance', $data)); |
|
730 | - $this->setLevel($this->getInt($prefix . 'level', $data)); |
|
731 | - $this->setStatus($this->get($prefix . 'status', $data)); |
|
732 | - $this->setDisplayName($this->get($prefix . 'cached_name', $data)); |
|
733 | - $this->setNote($this->get($prefix . 'note', $data)); |
|
734 | - $this->setContactId($this->get($prefix . 'contact_id', $data)); |
|
735 | - $this->setContactMeta($this->get($prefix . 'contact_meta', $data)); |
|
736 | - |
|
737 | - $cachedUpdate = $this->get($prefix . 'cached_update', $data); |
|
724 | + $this->setId($this->get($prefix.'member_id', $data)); |
|
725 | + $this->setCircleId($this->get($prefix.'circle_id', $data)); |
|
726 | + $this->setSingleId($this->get($prefix.'single_id', $data)); |
|
727 | + $this->setUserId($this->get($prefix.'user_id', $data)); |
|
728 | + $this->setUserType($this->getInt($prefix.'user_type', $data)); |
|
729 | + $this->setInstance($this->get($prefix.'instance', $data)); |
|
730 | + $this->setLevel($this->getInt($prefix.'level', $data)); |
|
731 | + $this->setStatus($this->get($prefix.'status', $data)); |
|
732 | + $this->setDisplayName($this->get($prefix.'cached_name', $data)); |
|
733 | + $this->setNote($this->get($prefix.'note', $data)); |
|
734 | + $this->setContactId($this->get($prefix.'contact_id', $data)); |
|
735 | + $this->setContactMeta($this->get($prefix.'contact_meta', $data)); |
|
736 | + |
|
737 | + $cachedUpdate = $this->get($prefix.'cached_update', $data); |
|
738 | 738 | if ($cachedUpdate !== '') { |
739 | 739 | $this->setDisplayUpdate(DateTime::createFromFormat('Y-m-d H:i:s', $cachedUpdate)->getTimestamp()); |
740 | 740 | } |
741 | 741 | |
742 | - $joined = $this->get($prefix . 'joined', $data); |
|
742 | + $joined = $this->get($prefix.'joined', $data); |
|
743 | 743 | if ($joined !== '') { |
744 | 744 | $this->setJoined(DateTime::createFromFormat('Y-m-d H:i:s', $joined)->getTimestamp()); |
745 | 745 | } |
@@ -813,7 +813,7 @@ discard block |
||
813 | 813 | public static function parseLevelInt(int $level): int { |
814 | 814 | if (!array_key_exists($level, self::$DEF_LEVEL)) { |
815 | 815 | $all = implode(', ', array_keys(self::$DEF_LEVEL)); |
816 | - throw new ParseMemberLevelException('Available levels: ' . $all, 121); |
|
816 | + throw new ParseMemberLevelException('Available levels: '.$all, 121); |
|
817 | 817 | } |
818 | 818 | |
819 | 819 | return $level; |
@@ -832,7 +832,7 @@ discard block |
||
832 | 832 | |
833 | 833 | if (!$level) { |
834 | 834 | $all = implode(', ', array_values(self::$DEF_LEVEL)); |
835 | - throw new ParseMemberLevelException('Available levels: ' . $all, 121); |
|
835 | + throw new ParseMemberLevelException('Available levels: '.$all, 121); |
|
836 | 836 | } |
837 | 837 | |
838 | 838 | return (int)$level; |
@@ -853,7 +853,7 @@ discard block |
||
853 | 853 | $type = array_search($typeString, Member::$TYPE); |
854 | 854 | if ($type === false) { |
855 | 855 | $all = implode(', ', array_values(self::$TYPE)); |
856 | - throw new UserTypeNotFoundException('Available types: ' . $all); |
|
856 | + throw new UserTypeNotFoundException('Available types: '.$all); |
|
857 | 857 | } |
858 | 858 | |
859 | 859 | return (int)$type; |