Skip to content

feat(gitlab): add getPullRequest, getPullRequestFiles, getPullRequestFromBranch, createComment, getComment, updateComment and getUser #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jaysomani wants to merge 7 commits into
base: main
Choose a base branch
from
Open

feat(gitlab): add getPullRequest, getPullRequestFiles, getPullRequestFromBranch, createComment, getComment, updateComment and getUser #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
76df5e7
feat(gitlab): add pull request, comment and user support
jaysomani Apr 27, 2026
d56ec3b
updated with suggestions
jaysomani Apr 27, 2026
8a688e8
fixed the lint issue and stan issue
jaysomani Apr 27, 2026
e86e659
updated with suggestions
jaysomani Apr 27, 2026
7fb6a4b
Merge branch 'utopia-php:main' into feat/gitlab-adapter-pullrequest
jaysomani Apr 28, 2026
4374e22
Merge branch 'main' of https://github.com/jaysomani/vcs into feat/git…
jaysomani May 13, 2026
c6f5ac4
updated the ID fix for comments
jaysomani May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/VCS/Adapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ abstract public function getComment(string $owner, string $repositoryName, strin
*
* @param string $owner The owner of the repository
* @param string $repositoryName The name of the repository
* @param int $commentId The ID of the comment to update
* @param string $commentId The ID of the comment to update
* @param string $comment The updated comment content
* @return string The ID of the updated comment
*/
abstract public function updateComment(string $owner, string $repositoryName, int $commentId, string $comment): string;
abstract public function updateComment(string $owner, string $repositoryName, string $commentId, string $comment): string;

/**
* Generates a clone command using app access token
Expand Down
4 changes: 2 additions & 2 deletions src/VCS/Adapter/Git/GitHub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,13 +579,13 @@ public function getComment(string $owner, string $repositoryName, string $commen
*
* @param string $owner The owner of the repository
* @param string $repositoryName The name of the repository
* @param int $commentId The ID of the comment to update
* @param string $commentId The ID of the comment to update
* @param string $comment The updated comment content
* @return string The ID of the updated comment
*
* @throws Exception
*/
public function updateComment(string $owner, string $repositoryName, int $commentId, string $comment): string
public function updateComment(string $owner, string $repositoryName, string $commentId, string $comment): string
{
$url = '/repos/' . $owner . '/' . $repositoryName . '/issues/comments/' . $commentId;

Expand Down
199 changes: 189 additions & 10 deletions src/VCS/Adapter/Git/GitLab.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,22 +465,85 @@ public function createWebhook(string $owner, string $repositoryName, string $url

public function createComment(string $owner, string $repositoryName, int $pullRequestNumber, string $comment): string
{
throw new Exception("Not implemented");
$ownerPath = $this->getOwnerPath($owner);
$projectPath = urlencode("{$ownerPath}/{$repositoryName}");
$url = "/projects/{$projectPath}/merge_requests/{$pullRequestNumber}/notes";

$response = $this->call(self::METHOD_POST, $url, ['PRIVATE-TOKEN' => $this->accessToken], ['body' => $comment]);

$responseHeaders = $response['headers'] ?? [];
$statusCode = $responseHeaders['status-code'] ?? 0;
if ($statusCode >= 400) {
throw new Exception("Failed to create comment: HTTP {$statusCode}");
}

$responseBody = $response['body'] ?? [];
if (!array_key_exists('id', $responseBody)) {
throw new Exception("Comment creation response is missing comment ID.");
}

return $pullRequestNumber . ':' . ($responseBody['id'] ?? '');
}

public function getComment(string $owner, string $repositoryName, string $commentId): string
{
throw new Exception("Not implemented");
$ownerPath = $this->getOwnerPath($owner);
$projectPath = urlencode("{$ownerPath}/{$repositoryName}");

$parts = explode(':', $commentId, 2);
if (count($parts) !== 2) {
return '';
}

[$mrIid, $noteId] = $parts;
$url = "/projects/{$projectPath}/merge_requests/{$mrIid}/notes/{$noteId}";
$response = $this->call(self::METHOD_GET, $url, ['PRIVATE-TOKEN' => $this->accessToken]);

return $response['body']['body'] ?? '';
}

public function updateComment(string $owner, string $repositoryName, int $commentId, string $comment): string
public function updateComment(string $owner, string $repositoryName, string $commentId, string $comment): string
{
throw new Exception("Not implemented");
$ownerPath = $this->getOwnerPath($owner);
$projectPath = urlencode("{$ownerPath}/{$repositoryName}");

$parts = explode(':', $commentId, 2);
if (count($parts) !== 2) {
throw new Exception("Invalid comment ID format: {$commentId}");
}

[$mrIid, $noteId] = $parts;
$url = "/projects/{$projectPath}/merge_requests/{$mrIid}/notes/{$noteId}";
$response = $this->call(self::METHOD_PUT, $url, ['PRIVATE-TOKEN' => $this->accessToken], ['body' => $comment]);

$responseHeaders = $response['headers'] ?? [];
if (($responseHeaders['status-code'] ?? 0) !== 200) {
throw new Exception("Failed to update comment: HTTP " . ($responseHeaders['status-code'] ?? 0));
}

return $commentId;
}

public function getUser(string $username): array
{
throw new Exception("Not implemented");
$url = "/users?username=" . rawurlencode($username);

$response = $this->call(self::METHOD_GET, $url, ['PRIVATE-TOKEN' => $this->accessToken]);

$responseHeaders = $response['headers'] ?? [];
$statusCode = $responseHeaders['status-code'] ?? 0;
if ($statusCode >= 400) {
throw new Exception("Failed to get user: HTTP {$statusCode}");
}

$body = $response['body'] ?? [];

// GitLab returns an array of users — return first match
if (empty($body[0])) {
throw new Exception("User not found: {$username}");
}

return $body[0];
}

public function getOwnerName(string $installationId, ?int $repositoryId = null): string
Expand Down Expand Up @@ -511,17 +574,123 @@ public function getOwnerName(string $installationId, ?int $repositoryId = null):

public function getPullRequest(string $owner, string $repositoryName, int $pullRequestNumber): array
{
throw new Exception("Not implemented");
$ownerPath = $this->getOwnerPath($owner);
$projectPath = urlencode("{$ownerPath}/{$repositoryName}");
$url = "/projects/{$projectPath}/merge_requests/{$pullRequestNumber}";

$response = $this->call(self::METHOD_GET, $url, ['PRIVATE-TOKEN' => $this->accessToken]);

$responseHeaders = $response['headers'] ?? [];
$statusCode = $responseHeaders['status-code'] ?? 0;
if ($statusCode >= 400) {
throw new Exception("Failed to get merge request: HTTP {$statusCode}");
}

$mr = $response['body'] ?? [];

// Normalize to match expected shape (consistent with Gitea/GitHub)
return [
'number' => $mr['iid'] ?? 0,
'title' => $mr['title'] ?? '',
'state' => $mr['state'] ?? '',
Comment thread
jaysomani marked this conversation as resolved.
'head' => [
'ref' => $mr['source_branch'] ?? '',
'sha' => $mr['sha'] ?? '',
],
'base' => [
'ref' => $mr['target_branch'] ?? '',
],
];
}

public function getPullRequestFiles(string $owner, string $repositoryName, int $pullRequestNumber): array
{
throw new Exception("Not implemented");
$ownerPath = $this->getOwnerPath($owner);
$projectPath = urlencode("{$ownerPath}/{$repositoryName}");

// Poll until diff is ready (patch_id_sha not null)
$maxAttempts = 10;
for ($attempt = 0; $attempt < $maxAttempts; $attempt++) {
$mrResponse = $this->call(
self::METHOD_GET,
"/projects/{$projectPath}/merge_requests/{$pullRequestNumber}",
['PRIVATE-TOKEN' => $this->accessToken]
);
$mrBody = $mrResponse['body'] ?? [];
if (($mrBody['patch_id_sha'] ?? null) !== null) {
break;
}
usleep(1000000); // 1 second
}
Comment thread
jaysomani marked this conversation as resolved.

// Fetch diffs with pagination
$allFiles = [];
$page = 1;
$perPage = 100;

while (true) {
$url = "/projects/{$projectPath}/merge_requests/{$pullRequestNumber}/diffs?page={$page}&per_page={$perPage}";
$response = $this->call(self::METHOD_GET, $url, ['PRIVATE-TOKEN' => $this->accessToken]);

$responseHeaders = $response['headers'] ?? [];
$statusCode = $responseHeaders['status-code'] ?? 0;
if ($statusCode >= 400) {
throw new Exception("Failed to get merge request files: HTTP {$statusCode}");
}

$files = $response['body'] ?? [];
if (!is_array($files) || empty($files)) {
break;
}

foreach ($files as $diff) {
$allFiles[] = [
'filename' => $diff['new_path'] ?? $diff['old_path'] ?? '',
];
}

if (count($files) < $perPage) {
break;
}
$page++;
}

return $allFiles;
}

public function getPullRequestFromBranch(string $owner, string $repositoryName, string $branch): array
{
throw new Exception("Not implemented");
$ownerPath = $this->getOwnerPath($owner);
$projectPath = urlencode("{$ownerPath}/{$repositoryName}");
$url = "/projects/{$projectPath}/merge_requests?state=opened&source_branch=" . urlencode($branch);

$response = $this->call(self::METHOD_GET, $url, ['PRIVATE-TOKEN' => $this->accessToken]);

$responseHeaders = $response['headers'] ?? [];
$statusCode = $responseHeaders['status-code'] ?? 0;
if ($statusCode >= 400) {
throw new Exception("Failed to list merge requests: HTTP {$statusCode}");
}

$body = $response['body'] ?? [];
if (empty($body[0])) {
return [];
}

$mr = $body[0];

return [
'number' => $mr['iid'] ?? 0,
'title' => $mr['title'] ?? '',
'state' => $mr['state'] ?? '',
'head' => [
'ref' => $mr['source_branch'] ?? '',
'sha' => $mr['sha'] ?? '',
],
'base' => [
'ref' => $mr['target_branch'] ?? '',
],
];
}

public function listBranches(string $owner, string $repositoryName): array
Expand Down Expand Up @@ -704,14 +873,24 @@ public function generateCloneCommand(string $owner, string $repositoryName, stri
public function getEvent(string $event, string $payload): array
{
$payloadArray = json_decode($payload, true);
if ($payloadArray === false || $payloadArray === null) {
if ($payloadArray === null || !is_array($payloadArray)) {
return [];
}

switch ($event) {
case 'Push Hook':
$commits = $payloadArray['commits'] ?? [];
$latestCommit = !empty($commits) ? $commits[0] : [];
$checkoutSha = $payloadArray['checkout_sha'] ?? '';
$latestCommit = [];
foreach ($commits as $c) {
if (($c['id'] ?? '') === $checkoutSha) {
$latestCommit = $c;
break;
}
}
if (empty($latestCommit) && !empty($commits)) {
$latestCommit = $commits[0];
}
$ref = $payloadArray['ref'] ?? '';
// ref format: refs/heads/main
$branch = str_replace('refs/heads/', '', $ref);
Expand Down
2 changes: 1 addition & 1 deletion src/VCS/Adapter/Git/Gitea.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ public function getComment(string $owner, string $repositoryName, string $commen
return $responseBody['body'] ?? '';
}

public function updateComment(string $owner, string $repositoryName, int $commentId, string $comment): string
public function updateComment(string $owner, string $repositoryName, string $commentId, string $comment): string
{
$url = "/repos/{$owner}/{$repositoryName}/issues/comments/{$commentId}";

Expand Down
Loading