Completed
Push — master ( 6a9ced...4a1ba1 )
by Maxence
02:12
created
lib/Activity/Provider.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	}
73 73
 
74 74
 
75
-	private function setIcon(IEvent &$event, Circle $circle) {
75
+	private function setIcon(IEvent & $event, Circle $circle) {
76 76
 		$event->setIcon(
77 77
 			CirclesService::getCircleIcon(
78 78
 				$circle->getType(),
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 *
90 90
 	 * @return IEvent
91 91
 	 */
92
-	private function parseAsMember(IEvent &$event, Circle $circle, $params) {
92
+	private function parseAsMember(IEvent & $event, Circle $circle, $params) {
93 93
 		if ($event->getType() !== 'circles_as_member') {
94 94
 			return $event;
95 95
 		}
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 	 * @return IEvent
127 127
 	 * @throws Exception
128 128
 	 */
129
-	private function parseAsModerator(IEvent &$event, Circle $circle, $params) {
129
+	private function parseAsModerator(IEvent & $event, Circle $circle, $params) {
130 130
 		if ($event->getType() !== 'circles_as_moderator') {
131 131
 			return $event;
132 132
 		}
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 	 *
158 158
 	 * @return IEvent
159 159
 	 */
160
-	private function parseMemberAsMember(IEvent &$event, Circle $circle) {
160
+	private function parseMemberAsMember(IEvent & $event, Circle $circle) {
161 161
 		$params = $event->getSubjectParameters();
162 162
 		$member = Member::fromJSON($params['member']);
163 163
 
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 	 *
186 186
 	 * @throws FakeException
187 187
 	 */
188
-	private function parseSubjectMemberJoin(IEvent &$event, Circle $circle, Member $member) {
188
+	private function parseSubjectMemberJoin(IEvent & $event, Circle $circle, Member $member) {
189 189
 
190 190
 		if ($event->getSubject() !== 'member_request_invitation') {
191 191
 			return;
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 	 *
209 209
 	 * @throws FakeException
210 210
 	 */
211
-	private function parseSubjectMemberJoinClosedCircle(IEvent &$event, Circle $circle, Member $member) {
211
+	private function parseSubjectMemberJoinClosedCircle(IEvent & $event, Circle $circle, Member $member) {
212 212
 		if ($circle->getType() !== Circle::CIRCLES_CLOSED) {
213 213
 			return;
214 214
 		}
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 	 *
234 234
 	 * @throws FakeException
235 235
 	 */
236
-	private function parseSubjectMemberAdd(IEvent &$event, Circle $circle, Member $member) {
236
+	private function parseSubjectMemberAdd(IEvent & $event, Circle $circle, Member $member) {
237 237
 		if ($event->getSubject() !== 'member_add') {
238 238
 			return;
239 239
 		}
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 	 *
258 258
 	 * @throws FakeException
259 259
 	 */
260
-	private function parseSubjectMemberAddClosedCircle(IEvent &$event, Circle $circle, Member $member) {
260
+	private function parseSubjectMemberAddClosedCircle(IEvent & $event, Circle $circle, Member $member) {
261 261
 		if ($circle->getType() !== Circle::CIRCLES_CLOSED) {
262 262
 			return;
263 263
 		}
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
 	 *
285 285
 	 * @throws FakeException
286 286
 	 */
287
-	private function parseSubjectMemberLeft(IEvent &$event, Circle $circle, Member $member) {
287
+	private function parseSubjectMemberLeft(IEvent & $event, Circle $circle, Member $member) {
288 288
 
289 289
 		if ($event->getSubject() !== 'member_left') {
290 290
 			return;
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 	 *
313 313
 	 * @throws FakeException
314 314
 	 */
315
-	private function parseSubjectNonMemberLeftClosedCircle(IEvent &$event, Circle $circle, Member $member
315
+	private function parseSubjectNonMemberLeftClosedCircle(IEvent & $event, Circle $circle, Member $member
316 316
 	) {
317 317
 		if ($circle->getType() !== Circle::CIRCLES_CLOSED
318 318
 			|| $member->getLevel() !== Member::LEVEL_NONE) {
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 	 *
349 349
 	 * @throws FakeException
350 350
 	 */
351
-	private function parseSubjectMemberRemove(IEvent &$event, Circle $circle, Member $member) {
351
+	private function parseSubjectMemberRemove(IEvent & $event, Circle $circle, Member $member) {
352 352
 
353 353
 		if ($event->getSubject() !== 'member_remove') {
354 354
 			return;
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 	 * @return IEvent
384 384
 	 */
385 385
 	private function parseSubjectNonMemberRemoveClosedCircle(
386
-		IEvent &$event, Circle $circle, Member $member
386
+		IEvent & $event, Circle $circle, Member $member
387 387
 	) {
388 388
 		if ($member->getStatus() === Member::STATUS_REQUEST) {
389 389
 			return $this->parseCircleMemberAdvancedEvent(
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
 	 *
410 410
 	 * @return IEvent
411 411
 	 */
412
-	private function parseGroupAsModerator(IEvent &$event, Circle $circle) {
412
+	private function parseGroupAsModerator(IEvent & $event, Circle $circle) {
413 413
 
414 414
 		$params = $event->getSubjectParameters();
415 415
 		$group = Member::fromJSON($params['group']);
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
 	 *
433 433
 	 * @return IEvent
434 434
 	 */
435
-	private function parseMemberAsModerator(IEvent &$event, Circle $circle) {
435
+	private function parseMemberAsModerator(IEvent & $event, Circle $circle) {
436 436
 
437 437
 		$params = $event->getSubjectParameters();
438 438
 		$member = Member::fromJSON($params['member']);
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 	 *
457 457
 	 * @return IEvent
458 458
 	 */
459
-	private function parseLinkAsModerator(IEvent &$event, Circle $circle) {
459
+	private function parseLinkAsModerator(IEvent & $event, Circle $circle) {
460 460
 
461 461
 		$params = $event->getSubjectParameters();
462 462
 		$remote = FederatedLink::fromJSON($params['link']);
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
 	 *
489 489
 	 * @throws FakeException
490 490
 	 */
491
-	private function parseGroupLink(IEvent &$event, Circle $circle, Member $group) {
491
+	private function parseGroupLink(IEvent & $event, Circle $circle, Member $group) {
492 492
 		if ($event->getSubject() !== 'group_link') {
493 493
 			return;
494 494
 		}
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 	 *
510 510
 	 * @throws FakeException
511 511
 	 */
512
-	private function parseGroupUnlink(IEvent &$event, Circle $circle, Member $group) {
512
+	private function parseGroupUnlink(IEvent & $event, Circle $circle, Member $group) {
513 513
 		if ($event->getSubject() !== 'group_unlink') {
514 514
 			return;
515 515
 		}
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
530 530
 	 *
531 531
 	 * @throws FakeException
532 532
 	 */
533
-	private function parseGroupLevel(IEvent &$event, Circle $circle, Member $group) {
533
+	private function parseGroupLevel(IEvent & $event, Circle $circle, Member $group) {
534 534
 		if ($event->getSubject() !== 'group_level') {
535 535
 			return;
536 536
 		}
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 	 *
556 556
 	 * @throws FakeException
557 557
 	 */
558
-	private function parseMemberInvited(IEvent &$event, Circle $circle, Member $member) {
558
+	private function parseMemberInvited(IEvent & $event, Circle $circle, Member $member) {
559 559
 		if ($event->getSubject() !== 'member_invited') {
560 560
 			return;
561 561
 		}
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
578 578
 	 *
579 579
 	 * @throws FakeException
580 580
 	 */
581
-	private function parseMemberLevel(IEvent &$event, Circle $circle, Member $member) {
581
+	private function parseMemberLevel(IEvent & $event, Circle $circle, Member $member) {
582 582
 		if ($event->getSubject() !== 'member_level') {
583 583
 			return;
584 584
 		}
@@ -602,7 +602,7 @@  discard block
 block discarded – undo
602 602
 	 *
603 603
 	 * @throws FakeException
604 604
 	 */
605
-	private function parseMemberRequestInvitation(IEvent &$event, Circle $circle, Member $member) {
605
+	private function parseMemberRequestInvitation(IEvent & $event, Circle $circle, Member $member) {
606 606
 		if ($event->getSubject() !== 'member_request_invitation') {
607 607
 			return;
608 608
 		}
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
 	 *
625 625
 	 * @throws FakeException
626 626
 	 */
627
-	private function parseMemberOwner(IEvent &$event, Circle $circle, Member $member) {
627
+	private function parseMemberOwner(IEvent & $event, Circle $circle, Member $member) {
628 628
 		if ($event->getSubject() !== 'member_owner') {
629 629
 			return;
630 630
 		}
@@ -645,7 +645,7 @@  discard block
 block discarded – undo
645 645
 	 *
646 646
 	 * @throws FakeException
647 647
 	 */
648
-	private function parseLinkRequestSent(IEvent &$event, Circle $circle, FederatedLink $remote) {
648
+	private function parseLinkRequestSent(IEvent & $event, Circle $circle, FederatedLink $remote) {
649 649
 		if ($event->getSubject() !== 'link_request_sent') {
650 650
 			return;
651 651
 		}
@@ -667,7 +667,7 @@  discard block
 block discarded – undo
667 667
 	 *
668 668
 	 * @throws FakeException
669 669
 	 */
670
-	private function parseLinkRequestReceived(IEvent &$event, Circle $circle, FederatedLink $remote) {
670
+	private function parseLinkRequestReceived(IEvent & $event, Circle $circle, FederatedLink $remote) {
671 671
 		if ($event->getSubject() !== 'link_request_received') {
672 672
 			return;
673 673
 		}
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
 	 *
688 688
 	 * @throws FakeException
689 689
 	 */
690
-	private function parseLinkRequestRejected(IEvent &$event, Circle $circle, FederatedLink $remote) {
690
+	private function parseLinkRequestRejected(IEvent & $event, Circle $circle, FederatedLink $remote) {
691 691
 		if ($event->getSubject() !== 'link_request_rejected') {
692 692
 			return;
693 693
 		}
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
 	 *
709 709
 	 * @throws FakeException
710 710
 	 */
711
-	private function parseLinkRequestCanceled(IEvent &$event, Circle $circle, FederatedLink $remote) {
711
+	private function parseLinkRequestCanceled(IEvent & $event, Circle $circle, FederatedLink $remote) {
712 712
 		if ($event->getSubject() !== 'link_request_canceled') {
713 713
 			return;
714 714
 		}
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
 	 *
732 732
 	 * @throws FakeException
733 733
 	 */
734
-	private function parseLinkRequestAccepted(IEvent &$event, Circle $circle, FederatedLink $remote) {
734
+	private function parseLinkRequestAccepted(IEvent & $event, Circle $circle, FederatedLink $remote) {
735 735
 		if ($event->getSubject() !== 'link_request_accepted') {
736 736
 			return;
737 737
 		}
@@ -752,7 +752,7 @@  discard block
 block discarded – undo
752 752
 	 *
753 753
 	 * @throws FakeException
754 754
 	 */
755
-	private function parseLinkRequestRemoved(IEvent &$event, Circle $circle, FederatedLink $remote) {
755
+	private function parseLinkRequestRemoved(IEvent & $event, Circle $circle, FederatedLink $remote) {
756 756
 		if ($event->getSubject() !== 'link_request_removed') {
757 757
 			return;
758 758
 		}
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
774 774
 	 *
775 775
 	 * @throws FakeException
776 776
 	 */
777
-	private function parseLinkRequestCanceling(IEvent &$event, Circle $circle, FederatedLink $remote) {
777
+	private function parseLinkRequestCanceling(IEvent & $event, Circle $circle, FederatedLink $remote) {
778 778
 		if ($event->getSubject() !== 'link_request_canceling') {
779 779
 			return;
780 780
 		}
@@ -796,7 +796,7 @@  discard block
 block discarded – undo
796 796
 	 *
797 797
 	 * @throws FakeException
798 798
 	 */
799
-	private function parseLinkRequestAccepting(IEvent &$event, Circle $circle, FederatedLink $remote) {
799
+	private function parseLinkRequestAccepting(IEvent & $event, Circle $circle, FederatedLink $remote) {
800 800
 		if ($event->getSubject() !== 'link_request_accepting') {
801 801
 			return;
802 802
 		}
@@ -818,7 +818,7 @@  discard block
 block discarded – undo
818 818
 	 *
819 819
 	 * @throws FakeException
820 820
 	 */
821
-	private function parseLinkUp(IEvent &$event, Circle $circle, FederatedLink $remote) {
821
+	private function parseLinkUp(IEvent & $event, Circle $circle, FederatedLink $remote) {
822 822
 		if ($event->getSubject() !== 'link_up') {
823 823
 			return;
824 824
 		}
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
 	 *
840 840
 	 * @throws FakeException
841 841
 	 */
842
-	private function parseLinkDown(IEvent &$event, Circle $circle, FederatedLink $remote) {
842
+	private function parseLinkDown(IEvent & $event, Circle $circle, FederatedLink $remote) {
843 843
 		if ($event->getSubject() !== 'link_down') {
844 844
 			return;
845 845
 		}
@@ -862,7 +862,7 @@  discard block
 block discarded – undo
862 862
 	 *
863 863
 	 * @throws FakeException
864 864
 	 */
865
-	private function parseLinkRemove(IEvent &$event, Circle $circle, FederatedLink $remote) {
865
+	private function parseLinkRemove(IEvent & $event, Circle $circle, FederatedLink $remote) {
866 866
 		if ($event->getSubject() !== 'link_remove') {
867 867
 			return;
868 868
 		}
Please login to merge, or discard this patch.
lib/Activity/BaseProvider.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	 * @return IEvent
76 76
 	 */
77 77
 	protected function parseCircleEvent(
78
-		IEvent &$event, Circle $circle, FederatedLink $remote, $ownEvent, $othersEvent
78
+		IEvent & $event, Circle $circle, FederatedLink $remote, $ownEvent, $othersEvent
79 79
 	) {
80 80
 		$data = [
81 81
 			'author' => $this->generateViewerParameter($circle),
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 	 * @return IEvent
104 104
 	 */
105 105
 	protected function parseMemberEvent(
106
-		IEvent &$event, Circle $circle, Member $member, $ownEvent, $othersEvent
106
+		IEvent & $event, Circle $circle, Member $member, $ownEvent, $othersEvent
107 107
 	) {
108 108
 		$data = [
109 109
 			'circle' => $this->generateCircleParameter($circle),
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	 *
130 130
 	 * @return IEvent
131 131
 	 */
132
-	protected function parseLinkEvent(IEvent &$event, Circle $circle, FederatedLink $remote, $line
132
+	protected function parseLinkEvent(IEvent & $event, Circle $circle, FederatedLink $remote, $line
133 133
 	) {
134 134
 		$data = [
135 135
 			'circle' => $this->generateCircleParameter($circle),
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	 * @return IEvent
153 153
 	 */
154 154
 	protected function parseCircleMemberEvent(
155
-		IEvent &$event, Circle $circle, Member $member, $ownEvent, $othersEvent
155
+		IEvent & $event, Circle $circle, Member $member, $ownEvent, $othersEvent
156 156
 	) {
157 157
 		$data = [
158 158
 			'author' => $this->generateViewerParameter($circle),
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 	 * @return IEvent
184 184
 	 */
185 185
 	protected function parseCircleMemberAdvancedEvent(
186
-		IEvent &$event, Circle $circle, Member $member, $ownEvent, $targetEvent, $othersEvent
186
+		IEvent & $event, Circle $circle, Member $member, $ownEvent, $targetEvent, $othersEvent
187 187
 	) {
188 188
 		$data = [
189 189
 			'author' => $this->generateViewerParameter($circle),
@@ -206,13 +206,13 @@  discard block
 block discarded – undo
206 206
 	/**
207 207
 	 * @param IEvent $event
208 208
 	 */
209
-	protected function generateParsedSubject(IEvent &$event) {
209
+	protected function generateParsedSubject(IEvent & $event) {
210 210
 		$subject = $event->getRichSubject();
211 211
 		$params = $event->getRichSubjectParameters();
212 212
 		$ak = array_keys($params);
213 213
 		foreach ($ak as $k) {
214 214
 			if (is_array($params[$k])) {
215
-				$subject = str_replace('{' . $k . '}', $params[$k]['parsed'], $subject);
215
+				$subject = str_replace('{'.$k.'}', $params[$k]['parsed'], $subject);
216 216
 			}
217 217
 		}
218 218
 
@@ -279,8 +279,8 @@  discard block
 block discarded – undo
279 279
 		return [
280 280
 			'type'   => 'circle',
281 281
 			'id'     => $link->getUniqueId(),
282
-			'name'   => $link->getToken() . '@' . $link->getAddress(),
283
-			'parsed' => $link->getToken() . '@' . $link->getAddress()
282
+			'name'   => $link->getToken().'@'.$link->getAddress(),
283
+			'parsed' => $link->getToken().'@'.$link->getAddress()
284 284
 		];
285 285
 	}
286 286
 
Please login to merge, or discard this patch.