Skip to content

Commit 632ccc1

Browse files
committed
sharing a function, renaming it, and also checking review permission in
more places
1 parent f5edb09 commit 632ccc1

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

src/AppBundle/Subscriber/AbstractStatusChangeSubscriber.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected function parseStatusFromText($body)
4444
}
4545
}
4646

47-
private function checkUserIsAllowedToReview(array $data)
47+
protected function isUserAllowedToReview(array $data)
4848
{
4949
return $data['issue']['user']['login'] !== $data['comment']['user']['login'];
5050
}

src/AppBundle/Subscriber/StatusChangeByCommentSubscriber.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function onIssueComment(GitHubEvent $event)
3131
$issueNumber = $data['issue']['number'];
3232
$newStatus = $this->parseStatusFromText($data['comment']['body']);
3333

34-
if (Status::REVIEWED === $newStatus && false === $this->checkUserIsAllowedToReview($data)) {
34+
if (Status::REVIEWED === $newStatus && false === $this->isUserAllowedToReview($data)) {
3535
$newStatus = null;
3636
}
3737

@@ -54,9 +54,4 @@ public static function getSubscribedEvents()
5454
GitHubEvents::ISSUE_COMMENT => 'onIssueComment',
5555
);
5656
}
57-
58-
private function checkUserIsAllowedToReview(array $data)
59-
{
60-
return $data['issue']['user']['login'] !== $data['comment']['user']['login'];
61-
}
6257
}

src/AppBundle/Subscriber/StatusChangeByReviewSubscriber.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ public function onReview(GitHubEvent $event)
5454
break;
5555
default:
5656
$newStatus = $this->parseStatusFromText($data['review']['body']);
57+
}
5758

58-
if (Status::REVIEWED === $newStatus && false === $this->checkUserIsAllowedToReview($data)) {
59-
$newStatus = null;
60-
}
59+
if (Status::REVIEWED === $newStatus && false === $this->isUserAllowedToReview($data)) {
60+
$newStatus = null;
6161
}
6262

6363
$event->setResponseData(array(
@@ -107,9 +107,4 @@ public static function getSubscribedEvents()
107107
GitHubEvents::PULL_REQUEST => 'onReviewRequested',
108108
);
109109
}
110-
111-
private function checkUserIsAllowedToReview(array $data)
112-
{
113-
return $data['pull_request']['user']['login'] !== $data['review']['user']['login'];
114-
}
115110
}

0 commit comments

Comments
 (0)