@@ -17,16 +17,12 @@ class IssueListener implements EventSubscriberInterface
17
17
'needs comments ' => Status::NEEDS_COMMENTS ,
18
18
];
19
19
20
- private static $ privateTriggerWordToStatus = [
21
- 'ready ' => Status::READY ,
22
- ];
23
-
24
20
/**
25
21
* @var StatusApi
26
22
*/
27
23
private $ statusApi ;
28
24
29
- final public function __construct (StatusApi $ statusApi )
25
+ public function __construct (StatusApi $ statusApi )
30
26
{
31
27
$ this ->statusApi = $ statusApi ;
32
28
}
@@ -43,22 +39,16 @@ public function onIssueComment(GitHubEvent $event)
43
39
$ repository = $ event ->getRepository ();
44
40
$ newStatus = null ;
45
41
$ 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
- }
52
42
53
- $ triggerWord = implode ('| ' , array_keys ($ statuses ));
43
+ $ triggerWord = implode ('| ' , array_keys (static :: $ triggerWordToStatus ));
54
44
$ formatting = '[ \\s \\*]* ' ;
55
45
// Match first character after "status:"
56
46
// Case insensitive ("i"), ignores formatting with "*" before or after the ":"
57
47
$ pattern = "~(?= \n|^) $ {formatting}status $ {formatting}: $ {formatting}[ \"']?( $ triggerWord)[ \"']? $ {formatting}[.!]? $ {formatting}(?<= \r\n| \n|$)~i " ;
58
48
59
49
if (preg_match_all ($ pattern , $ data ['comment ' ]['body ' ], $ matches )) {
60
50
// Second subpattern = first status character
61
- $ newStatus = $ statuses [strtolower (end ($ matches [1 ]))];
51
+ $ newStatus = static :: $ triggerWordToStatus [strtolower (end ($ matches [1 ]))];
62
52
63
53
$ this ->setIssueStatus ($ issueNumber , $ newStatus , $ repository );
64
54
}
@@ -79,20 +69,20 @@ public function onPullRequest(GitHubEvent $event)
79
69
$ data = $ event ->getData ();
80
70
$ repository = $ event ->getRepository ();
81
71
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 ));
88
73
89
- $ responseData = array (
90
- 'pull_request ' => $ pullRequestNumber ,
91
- 'status_change ' => $ newStatus ,
92
- );
74
+ return ;
93
75
}
94
76
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
+ ));
96
86
}
97
87
98
88
/**
0 commit comments