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

Merge branch '1.4'

pull/6355/head
Jordi Boggiano 2017-04-10 18:47:30 +02:00
parent a6fa6ca64e be201924cd
commit 2c03dab4c3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ class GitLabDriver extends VcsDriver
*/ */
public function getDist($identifier) public function getDist($identifier)
{ {
$url = $this->getApiUrl().'/repository/archive.zip?ref='.$identifier; $url = $this->getApiUrl().'/repository/archive.zip?sha='.$identifier;
return array('type' => 'zip', 'url' => $url, 'reference' => $identifier, 'shasum' => ''); return array('type' => 'zip', 'url' => $url, 'reference' => $identifier, 'shasum' => '');
} }

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

@ -144,7 +144,7 @@ JSON;
$reference = 'c3ebdbf9cceddb82cd2089aaef8c7b992e536363'; $reference = 'c3ebdbf9cceddb82cd2089aaef8c7b992e536363';
$expected = array( $expected = array(
'type' => 'zip', 'type' => 'zip',
'url' => 'https://gitlab.com/api/v3/projects/mygroup%2Fmyproject/repository/archive.zip?ref='.$reference, 'url' => 'https://gitlab.com/api/v3/projects/mygroup%2Fmyproject/repository/archive.zip?sha='.$reference,
'reference' => $reference, 'reference' => $reference,
'shasum' => '', 'shasum' => '',
); );