public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge remote-tracking branch 'hjanuschka/gitlab_paging'

pull/6595/head
Jordi Boggiano 2017-08-08 10:03:28 +02:00
parent 2bbabe3578 ae42e4f8a3
commit 086b750b76
2 changed files with 84 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Composer/Repository/Vcs/GitLabDriver.php
View File

@ -280,17 +280,20 @@ class GitLabDriver extends VcsDriver
{
$resource = $this->getApiUrl().'/repository/'.$type;
$data = JsonFile::parseJson($this->getContents($resource), $resource);
do {
$data = JsonFile::parseJson($this->getContents($resource), $resource);
$references = array();
$references = array();
foreach ($data as $datum) {
$references[$datum['name']] = $datum['commit']['id'];
foreach ($data as $datum) {
$references[$datum['name']] = $datum['commit']['id'];
// Keep the last commit date of a reference to avoid
// unnecessary API call when retrieving the composer file.
$this->commits[$datum['commit']['id']] = $datum['commit'];
}
// Keep the last commit date of a reference to avoid
// unnecessary API call when retrieving the composer file.
$this->commits[$datum['commit']['id']] = $datum['commit'];
}
$resource = $this->getNextPage();
} while ($resource);
return $references;
}
@ -444,6 +447,21 @@ class GitLabDriver extends VcsDriver
return true;
}
protected function getNextPage()
{
$headers = $this->remoteFilesystem->getLastHeaders();
foreach ($headers as $header) {
if (substr($header, 0, 5) === 'Link:') {
$links = explode(',', substr($header, 5));
foreach ($links as $link) {
if (preg_match('{<(.+?)>; *rel="next"}', $link, $match)) {
return $match[1];
}
}
}
}
}
/**
* @param array $configuredDomains
* @param string $guessedDomain

58
tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php
View File

@ -216,6 +216,9 @@ JSON;
->willReturn($tagData)
->shouldBeCalledTimes(1)
;
$this->remoteFilesystem->getLastHeaders()
->willReturn(array());
$driver->setRemoteFilesystem($this->remoteFilesystem->reveal());
$expected = array(
@ -227,6 +230,58 @@ JSON;
$this->assertEquals($expected, $driver->getTags(), 'Tags are cached');
}
public function testGetPaginatedRefs() {
$driver = $this->testInitialize('https://gitlab.com/mygroup/myproject', 'https://gitlab.com/api/v4/projects/mygroup%2Fmyproject');
$apiUrl = 'https://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/branches';
// @link http://doc.gitlab.com/ce/api/repositories.html#list-project-repository-branches
$branchData = <<<JSON
[
{
"name": "mymaster",
"commit": {
"id": "97eda36b5c1dd953a3792865c222d4e85e5f302e",
"committed_date": "2013-01-03T21:04:07.000+01:00"
}
},
{
"name": "staging",
"commit": {
"id": "502cffe49f136443f2059803f2e7192d1ac066cd",
"committed_date": "2013-03-09T16:35:23.000+01:00"
}
}
]
JSON;
$this->remoteFilesystem
->getContents('gitlab.com', $apiUrl, false, array())
->willReturn($branchData)
->shouldBeCalledTimes(1)
;
$this->remoteFilesystem
->getContents('gitlab.com', "http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=2&per_page=20", false, array())
->willReturn($branchData)
->shouldBeCalledTimes(1)
;
$this->remoteFilesystem->getLastHeaders()
->willReturn(array('Link: <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=2&per_page=20>; rel="next", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=1&per_page=20>; rel="first", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=3&per_page=20>; rel="last"'), array('Link: <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=2&per_page=20>; rel="prev", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=1&per_page=20>; rel="first", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=3&per_page=20>; rel="last"'))
->shouldBeCalledTimes(2);
$driver->setRemoteFilesystem($this->remoteFilesystem->reveal());
$expected = array(
'mymaster' => '97eda36b5c1dd953a3792865c222d4e85e5f302e',
'staging' => '502cffe49f136443f2059803f2e7192d1ac066cd',
);
$this->assertEquals($expected, $driver->getBranches());
$this->assertEquals($expected, $driver->getBranches(), 'Branches are cached');
}
public function testGetBranches()
{
$driver = $this->testInitialize('https://gitlab.com/mygroup/myproject', 'https://gitlab.com/api/v4/projects/mygroup%2Fmyproject');
@ -258,6 +313,9 @@ JSON;
->willReturn($branchData)
->shouldBeCalledTimes(1)
;
$this->remoteFilesystem->getLastHeaders()
->willReturn(array());
$driver->setRemoteFilesystem($this->remoteFilesystem->reveal());
$expected = array(