@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | * @param string $circleUniqueId |
| 104 | 104 | * @param string $name |
| 105 | 105 | * |
| 106 | - * @return array |
|
| 106 | + * @return Member[] |
|
| 107 | 107 | * @throws \Exception |
| 108 | 108 | */ |
| 109 | 109 | public function addLocalMember($circleUniqueId, $name) { |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | * @param string $circleUniqueId |
| 141 | 141 | * @param string $email |
| 142 | 142 | * |
| 143 | - * @return array |
|
| 143 | + * @return Member[] |
|
| 144 | 144 | * @throws \Exception |
| 145 | 145 | */ |
| 146 | 146 | public function addEmailAddress($circleUniqueId, $email) { |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | * @param string $circleUniqueId |
| 189 | 189 | * @param string $groupId |
| 190 | 190 | * |
| 191 | - * @return array |
|
| 191 | + * @return Member[] |
|
| 192 | 192 | * @throws \Exception |
| 193 | 193 | */ |
| 194 | 194 | public function importMembersFromGroup($circleUniqueId, $groupId) { |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | * @param string $name |
| 267 | 267 | * @param int $level |
| 268 | 268 | * |
| 269 | - * @return array |
|
| 269 | + * @return Member[] |
|
| 270 | 270 | * @throws \Exception |
| 271 | 271 | */ |
| 272 | 272 | public function levelLocalMember($circleUniqueId, $name, $level) { |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | /** |
| 307 | 307 | * @param Circle $circle |
| 308 | 308 | * @param Member $member |
| 309 | - * @param $level |
|
| 309 | + * @param integer $level |
|
| 310 | 310 | * |
| 311 | 311 | * @throws \Exception |
| 312 | 312 | */ |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | * @param string $name |
| 360 | 360 | * @param $type |
| 361 | 361 | * |
| 362 | - * @return array |
|
| 362 | + * @return Member[] |
|
| 363 | 363 | * @throws \Exception |
| 364 | 364 | */ |
| 365 | 365 | public function removeMember($circleUniqueId, $name, $type) { |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | |
| 77 | - private function setIcon(IEvent &$event, Circle $circle) { |
|
| 77 | + private function setIcon(IEvent & $event, Circle $circle) { |
|
| 78 | 78 | $event->setIcon( |
| 79 | 79 | CirclesService::getCircleIcon( |
| 80 | 80 | $circle->getType(), |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | * |
| 92 | 92 | * @return IEvent |
| 93 | 93 | */ |
| 94 | - private function parseAsMember(IEvent &$event, Circle $circle, $params) { |
|
| 94 | + private function parseAsMember(IEvent & $event, Circle $circle, $params) { |
|
| 95 | 95 | if ($event->getType() !== 'circles_as_member') { |
| 96 | 96 | return $event; |
| 97 | 97 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * |
| 127 | 127 | * @return IEvent |
| 128 | 128 | */ |
| 129 | - private function parseMemberAsMember(IEvent &$event, Circle $circle) { |
|
| 129 | + private function parseMemberAsMember(IEvent & $event, Circle $circle) { |
|
| 130 | 130 | $params = $event->getSubjectParameters(); |
| 131 | 131 | $member = Member::fromJSON($params['member']); |
| 132 | 132 | |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | * |
| 159 | 159 | * @return IEvent |
| 160 | 160 | */ |
| 161 | - private function parseSubjectMemberJoin(IEvent &$event, Circle $circle, Member $member) { |
|
| 161 | + private function parseSubjectMemberJoin(IEvent & $event, Circle $circle, Member $member) { |
|
| 162 | 162 | if ($circle->getType() === Circle::CIRCLES_CLOSED) { |
| 163 | 163 | return $this->parseCircleMemberEvent( |
| 164 | 164 | $event, $circle, $member, |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | * |
| 186 | 186 | * @return IEvent |
| 187 | 187 | */ |
| 188 | - private function parseSubjectMemberAdd(IEvent &$event, Circle $circle, Member $member) { |
|
| 188 | + private function parseSubjectMemberAdd(IEvent & $event, Circle $circle, Member $member) { |
|
| 189 | 189 | if ($circle->getType() === Circle::CIRCLES_CLOSED) { |
| 190 | 190 | return $this->parseCircleMemberAdvancedEvent( |
| 191 | 191 | $event, $circle, $member, |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | * |
| 216 | 216 | * @return IEvent |
| 217 | 217 | */ |
| 218 | - private function parseSubjectMemberLeft(IEvent &$event, Circle $circle, Member $member) { |
|
| 218 | + private function parseSubjectMemberLeft(IEvent & $event, Circle $circle, Member $member) { |
|
| 219 | 219 | if ($circle->getType() === Circle::CIRCLES_CLOSED |
| 220 | 220 | && $member->getLevel() === Member::LEVEL_NONE) { |
| 221 | 221 | return $this->parseSubjectNonMemberLeftClosedCircle($event, $circle, $member); |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | * @return IEvent |
| 241 | 241 | */ |
| 242 | 242 | private function parseSubjectNonMemberLeftClosedCircle( |
| 243 | - IEvent &$event, Circle $circle, Member $member |
|
| 243 | + IEvent & $event, Circle $circle, Member $member |
|
| 244 | 244 | ) { |
| 245 | 245 | if ($member->getStatus() === Member::STATUS_INVITED) { |
| 246 | 246 | return $this->parseCircleMemberEvent( |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | * |
| 270 | 270 | * @return IEvent |
| 271 | 271 | */ |
| 272 | - private function parseSubjectMemberRemove(IEvent &$event, Circle $circle, Member $member) { |
|
| 272 | + private function parseSubjectMemberRemove(IEvent & $event, Circle $circle, Member $member) { |
|
| 273 | 273 | if ($circle->getType() === Circle::CIRCLES_CLOSED |
| 274 | 274 | && $member->getLevel() === Member::LEVEL_NONE) { |
| 275 | 275 | return $this->parseSubjectNonMemberRemoveClosedCircle($event, $circle, $member); |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | * @return IEvent |
| 298 | 298 | */ |
| 299 | 299 | private function parseSubjectNonMemberRemoveClosedCircle( |
| 300 | - IEvent &$event, Circle $circle, Member $member |
|
| 300 | + IEvent & $event, Circle $circle, Member $member |
|
| 301 | 301 | ) { |
| 302 | 302 | if ($member->getStatus() === Member::STATUS_REQUEST) { |
| 303 | 303 | return $this->parseCircleMemberAdvancedEvent( |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | * @return IEvent |
| 326 | 326 | * @throws Exception |
| 327 | 327 | */ |
| 328 | - private function parseAsModerator(IEvent &$event, Circle $circle, $params) { |
|
| 328 | + private function parseAsModerator(IEvent & $event, Circle $circle, $params) { |
|
| 329 | 329 | if ($event->getType() !== 'circles_as_moderator') { |
| 330 | 330 | return $event; |
| 331 | 331 | } |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | * |
| 357 | 357 | * @return IEvent |
| 358 | 358 | */ |
| 359 | - private function parseGroupAsModerator(IEvent &$event, Circle $circle) { |
|
| 359 | + private function parseGroupAsModerator(IEvent & $event, Circle $circle) { |
|
| 360 | 360 | |
| 361 | 361 | $params = $event->getSubjectParameters(); |
| 362 | 362 | $group = Member::fromJSON($params['group']); |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | * |
| 404 | 404 | * @return IEvent |
| 405 | 405 | */ |
| 406 | - private function parseMemberAsModerator(IEvent &$event, Circle $circle) { |
|
| 406 | + private function parseMemberAsModerator(IEvent & $event, Circle $circle) { |
|
| 407 | 407 | |
| 408 | 408 | $params = $event->getSubjectParameters(); |
| 409 | 409 | $member = Member::fromJSON($params['member']); |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | * |
| 453 | 453 | * @return IEvent |
| 454 | 454 | */ |
| 455 | - private function parseLinkAsModerator(IEvent &$event, Circle $circle) { |
|
| 455 | + private function parseLinkAsModerator(IEvent & $event, Circle $circle) { |
|
| 456 | 456 | |
| 457 | 457 | $params = $event->getSubjectParameters(); |
| 458 | 458 | $remote = FederatedLink::fromJSON($params['link']); |
@@ -551,7 +551,7 @@ discard block |
||
| 551 | 551 | * @return IEvent |
| 552 | 552 | */ |
| 553 | 553 | private function parseCircleEvent( |
| 554 | - IEvent &$event, Circle $circle, $remote, $ownEvent, $othersEvent |
|
| 554 | + IEvent & $event, Circle $circle, $remote, $ownEvent, $othersEvent |
|
| 555 | 555 | ) { |
| 556 | 556 | $data = [ |
| 557 | 557 | 'author' => $this->generateViewerParameter($circle), |
@@ -579,7 +579,7 @@ discard block |
||
| 579 | 579 | * @return IEvent |
| 580 | 580 | */ |
| 581 | 581 | private function parseMemberEvent( |
| 582 | - IEvent &$event, Circle $circle, Member $member, $ownEvent, $othersEvent |
|
| 582 | + IEvent & $event, Circle $circle, Member $member, $ownEvent, $othersEvent |
|
| 583 | 583 | ) { |
| 584 | 584 | $data = [ |
| 585 | 585 | 'circle' => $this->generateCircleParameter($circle), |
@@ -605,7 +605,7 @@ discard block |
||
| 605 | 605 | * |
| 606 | 606 | * @return IEvent |
| 607 | 607 | */ |
| 608 | - private function parseLinkEvent(IEvent &$event, Circle $circle, FederatedLink $remote, $line) { |
|
| 608 | + private function parseLinkEvent(IEvent & $event, Circle $circle, FederatedLink $remote, $line) { |
|
| 609 | 609 | $data = [ |
| 610 | 610 | 'circle' => $this->generateCircleParameter($circle), |
| 611 | 611 | 'remote' => $this->generateRemoteCircleParameter($remote) |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | * @return IEvent |
| 628 | 628 | */ |
| 629 | 629 | private function parseCircleMemberEvent( |
| 630 | - IEvent &$event, Circle $circle, Member $member, $ownEvent, $othersEvent |
|
| 630 | + IEvent & $event, Circle $circle, Member $member, $ownEvent, $othersEvent |
|
| 631 | 631 | ) { |
| 632 | 632 | $data = [ |
| 633 | 633 | 'author' => $this->generateViewerParameter($circle), |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | * @return IEvent |
| 659 | 659 | */ |
| 660 | 660 | private function parseCircleMemberAdvancedEvent( |
| 661 | - IEvent &$event, Circle $circle, Member $member, $ownEvent, $targetEvent, $othersEvent |
|
| 661 | + IEvent & $event, Circle $circle, Member $member, $ownEvent, $targetEvent, $othersEvent |
|
| 662 | 662 | ) { |
| 663 | 663 | $data = [ |
| 664 | 664 | 'author' => $this->generateViewerParameter($circle), |
@@ -681,13 +681,13 @@ discard block |
||
| 681 | 681 | /** |
| 682 | 682 | * @param IEvent $event |
| 683 | 683 | */ |
| 684 | - private function generateParsedSubject(IEvent &$event) { |
|
| 684 | + private function generateParsedSubject(IEvent & $event) { |
|
| 685 | 685 | $subject = $event->getRichSubject(); |
| 686 | 686 | $params = $event->getRichSubjectParameters(); |
| 687 | 687 | $ak = array_keys($params); |
| 688 | 688 | foreach ($ak as $k) { |
| 689 | 689 | if (is_array($params[$k])) { |
| 690 | - $subject = str_replace('{' . $k . '}', $params[$k]['parsed'], $subject); |
|
| 690 | + $subject = str_replace('{'.$k.'}', $params[$k]['parsed'], $subject); |
|
| 691 | 691 | } |
| 692 | 692 | } |
| 693 | 693 | |
@@ -754,8 +754,8 @@ discard block |
||
| 754 | 754 | return [ |
| 755 | 755 | 'type' => 'circle', |
| 756 | 756 | 'id' => $link->getUniqueId(), |
| 757 | - 'name' => $link->getToken() . '@' . $link->getAddress(), |
|
| 758 | - 'parsed' => $link->getToken() . '@' . $link->getAddress() |
|
| 757 | + 'name' => $link->getToken().'@'.$link->getAddress(), |
|
| 758 | + 'parsed' => $link->getToken().'@'.$link->getAddress() |
|
| 759 | 759 | ]; |
| 760 | 760 | } |
| 761 | 761 | |