Skip to content

Commit 0bddebb

Browse files
committed
greptile feedback
1 parent 00db877 commit 0bddebb

3 files changed

Lines changed: 27 additions & 4 deletions

File tree

src/VCS/Adapter/Git/GitHub.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -989,8 +989,13 @@ public function getEvent(string $event, string $payload): array
989989
$baseLogin = $payloadPullRequestBaseUser['login'] ?? '';
990990
$external = $headLogin !== $baseLogin;
991991

992-
$prFiles = $this->getPullRequestFiles($owner, $repositoryName, (int)$pullRequestNumber);
993-
$affectedFiles = array_column($prFiles, 'filename');
992+
try {
993+
$prFiles = $this->getPullRequestFiles($owner, $repositoryName, (int)$pullRequestNumber);
994+
$affectedFiles = array_column($prFiles, 'filename');
995+
} catch (Exception $e) {
996+
// In case of any error while fetching pull request files, we will return an empty list of affected files.
997+
$affectedFiles = [];
998+
}
994999

9951000
return [
9961001
'branch' => $branch,

src/VCS/Adapter/Git/Gitea.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,8 +1037,12 @@ public function getEvent(string $event, string $payload): array
10371037
$baseRepoFullName = $payloadRepository['full_name'] ?? '';
10381038
$external = !empty($headRepoFullName) && !empty($baseRepoFullName) && $headRepoFullName !== $baseRepoFullName;
10391039

1040-
$prFiles = $this->getPullRequestFiles($owner, $repositoryName, (int)$pullRequestNumber);
1041-
$affectedFiles = array_column($prFiles, 'filename');
1040+
try {
1041+
$prFiles = $this->getPullRequestFiles($owner, $repositoryName, (int)$pullRequestNumber);
1042+
$affectedFiles = array_column($prFiles, 'filename');
1043+
} catch (Exception $e) {
1044+
$affectedFiles = [];
1045+
}
10421046

10431047
return [
10441048
'branch' => $branch,

tests/VCS/Adapter/GiteaTest.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -962,9 +962,19 @@ public function testGetEventPullRequest(): void
962962
'sender' => ['html_url' => "{$giteaUrl}/" . self::$owner],
963963
]);
964964

965+
if ($payload === false) {
966+
$this->fail('Failed to encode JSON payload');
967+
}
968+
965969
$result = $this->vcsAdapter->getEvent('pull_request', $payload);
966970

967971
$this->assertIsArray($result);
972+
$this->assertArrayHasKey('branch', $result);
973+
$this->assertArrayHasKey('pullRequestNumber', $result);
974+
$this->assertArrayHasKey('action', $result);
975+
$this->assertArrayHasKey('commitHash', $result);
976+
$this->assertArrayHasKey('external', $result);
977+
968978
$this->assertSame('feature-branch', $result['branch']);
969979
$this->assertSame($prNumber, $result['pullRequestNumber']);
970980
$this->assertSame('opened', $result['action']);
@@ -1018,6 +1028,10 @@ public function testGetEventPullRequestExternal(): void
10181028
'sender' => ['html_url' => "{$giteaUrl}/external-user"],
10191029
]);
10201030

1031+
if ($payload === false) {
1032+
$this->fail('Failed to encode JSON payload');
1033+
}
1034+
10211035
$result = $this->vcsAdapter->getEvent('pull_request', $payload);
10221036

10231037
$this->assertTrue($result['external']);

0 commit comments

Comments
 (0)