@@ -17,16 +17,12 @@ class IssueListener implements EventSubscriberInterface
1717 'needs comments ' => Status::NEEDS_COMMENTS ,
1818 ];
1919
20- private static $ privateTriggerWordToStatus = [
21- 'ready ' => Status::READY ,
22- ];
23-
2420 /**
2521 * @var StatusApi
2622 */
2723 private $ statusApi ;
2824
29- final public function __construct (StatusApi $ statusApi )
25+ public function __construct (StatusApi $ statusApi )
3026 {
3127 $ this ->statusApi = $ statusApi ;
3228 }
@@ -43,22 +39,16 @@ public function onIssueComment(GitHubEvent $event)
4339 $ repository = $ event ->getRepository ();
4440 $ newStatus = null ;
4541 $ issueNumber = $ data ['issue ' ]['number ' ];
46- $ user = $ data ['comment ' ]['user ' ]['login ' ];
47- $ statuses = static ::$ triggerWordToStatus ;
48-
49- if (in_array ($ user , $ event ->getMaintainers (), true )) {
50- $ statuses += static ::$ privateTriggerWordToStatus ;
51- }
5242
53- $ triggerWord = implode ('| ' , array_keys ($ statuses ));
43+ $ triggerWord = implode ('| ' , array_keys (static :: $ triggerWordToStatus ));
5444 $ formatting = '[ \\s \\*]* ' ;
5545 // Match first character after "status:"
5646 // Case insensitive ("i"), ignores formatting with "*" before or after the ":"
5747 $ pattern = "~(?= \n|^) $ {formatting}status $ {formatting}: $ {formatting}[ \"']?( $ triggerWord)[ \"']? $ {formatting}[.!]? $ {formatting}(?<= \r\n| \n|$)~i " ;
5848
5949 if (preg_match_all ($ pattern , $ data ['comment ' ]['body ' ], $ matches )) {
6050 // Second subpattern = first status character
61- $ newStatus = $ statuses [strtolower (end ($ matches [1 ]))];
51+ $ newStatus = static :: $ triggerWordToStatus [strtolower (end ($ matches [1 ]))];
6252
6353 $ this ->setIssueStatus ($ issueNumber , $ newStatus , $ repository );
6454 }
@@ -79,20 +69,20 @@ public function onPullRequest(GitHubEvent $event)
7969 $ data = $ event ->getData ();
8070 $ repository = $ event ->getRepository ();
8171 if ('opened ' !== $ action = $ data ['action ' ]) {
82- $ responseData = array ('unsupported_action ' => $ action );
83- } else {
84- $ pullRequestNumber = $ data ['pull_request ' ]['number ' ];
85- $ newStatus = Status::NEEDS_REVIEW ;
86-
87- $ this ->setIssueStatus ($ pullRequestNumber , $ newStatus , $ repository );
72+ $ event ->setResponseData (array ('unsupported_action ' => $ action ));
8873
89- $ responseData = array (
90- 'pull_request ' => $ pullRequestNumber ,
91- 'status_change ' => $ newStatus ,
92- );
74+ return ;
9375 }
9476
95- $ event ->setResponseData ($ responseData );
77+ $ pullRequestNumber = $ data ['pull_request ' ]['number ' ];
78+ $ newStatus = Status::NEEDS_REVIEW ;
79+
80+ $ this ->setIssueStatus ($ pullRequestNumber , $ newStatus , $ repository );
81+
82+ $ event ->setResponseData (array (
83+ 'pull_request ' => $ pullRequestNumber ,
84+ 'status_change ' => $ newStatus ,
85+ ));
9686 }
9787
9888 /**
0 commit comments