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

Fix VCS drivers to always use identifiers and not tag names since those can change or disappear

pull/1947/merge
Jordi Boggiano 2013-08-18 22:55:54 +02:00
parent 30f94365f0
commit 444bdb2e25
4 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Composer/Repository/Vcs/GitBitbucketDriver.php
View File

@ -65,9 +65,7 @@ class GitBitbucketDriver extends VcsDriver implements VcsDriverInterface
*/ */
public function getSource($identifier) public function getSource($identifier)
{ {
$label = array_search($identifier, $this->getTags()) ?: $identifier; return array('type' => 'git', 'url' => $this->getUrl(), 'reference' => $identifier);
return array('type' => 'git', 'url' => $this->getUrl(), 'reference' => $label);
} }
/** /**
@ -75,10 +73,9 @@ class GitBitbucketDriver extends VcsDriver implements VcsDriverInterface
*/ */
public function getDist($identifier) public function getDist($identifier)
{ {
$label = array_search($identifier, $this->getTags()) ?: $identifier; $url = $this->getScheme() . '://bitbucket.org/'.$this->owner.'/'.$this->repository.'/get/'.$identifier.'.zip';
$url = $this->getScheme() . '://bitbucket.org/'.$this->owner.'/'.$this->repository.'/get/'.$label.'.zip';
return array('type' => 'zip', 'url' => $url, 'reference' => $label, 'shasum' => ''); return array('type' => 'zip', 'url' => $url, 'reference' => $identifier, 'shasum' => '');
} }
/** /**

8
src/Composer/Repository/Vcs/GitHubDriver.php
View File

@ -87,7 +87,6 @@ class GitHubDriver extends VcsDriver
if ($this->gitDriver) { if ($this->gitDriver) {
return $this->gitDriver->getSource($identifier); return $this->gitDriver->getSource($identifier);
} }
$label = array_search($identifier, $this->getTags()) ?: $identifier;
if ($this->isPrivate) { if ($this->isPrivate) {
// Private GitHub repositories should be accessed using the // Private GitHub repositories should be accessed using the
// SSH version of the URL. // SSH version of the URL.
@ -96,7 +95,7 @@ class GitHubDriver extends VcsDriver
$url = $this->getUrl(); $url = $this->getUrl();
} }
return array('type' => 'git', 'url' => $url, 'reference' => $label); return array('type' => 'git', 'url' => $url, 'reference' => $identifier);
} }
/** /**
@ -107,10 +106,9 @@ class GitHubDriver extends VcsDriver
if ($this->gitDriver) { if ($this->gitDriver) {
return $this->gitDriver->getDist($identifier); return $this->gitDriver->getDist($identifier);
} }
$label = array_search($identifier, $this->getTags()) ?: $identifier; $url = 'https://api.github.com/repos/'.$this->owner.'/'.$this->repository.'/zipball/'.$identifier;
$url = 'https://api.github.com/repos/'.$this->owner.'/'.$this->repository.'/zipball/'.$label;
return array('type' => 'zip', 'url' => $url, 'reference' => $label, 'shasum' => ''); return array('type' => 'zip', 'url' => $url, 'reference' => $identifier, 'shasum' => '');
} }
/** /**

9
src/Composer/Repository/Vcs/HgBitbucketDriver.php
View File

@ -68,9 +68,7 @@ class HgBitbucketDriver extends VcsDriver
*/ */
public function getSource($identifier) public function getSource($identifier)
{ {
$label = array_search($identifier, $this->getTags()) ?: $identifier; return array('type' => 'hg', 'url' => $this->getUrl(), 'reference' => $identifier);
return array('type' => 'hg', 'url' => $this->getUrl(), 'reference' => $label);
} }
/** /**
@ -78,10 +76,9 @@ class HgBitbucketDriver extends VcsDriver
*/ */
public function getDist($identifier) public function getDist($identifier)
{ {
$label = array_search($identifier, $this->getTags()) ?: $identifier; $url = $this->getScheme() . '://bitbucket.org/'.$this->owner.'/'.$this->repository.'/get/'.$identifier.'.zip';
$url = $this->getScheme() . '://bitbucket.org/'.$this->owner.'/'.$this->repository.'/get/'.$label.'.zip';
return array('type' => 'zip', 'url' => $url, 'reference' => $label, 'shasum' => ''); return array('type' => 'zip', 'url' => $url, 'reference' => $identifier, 'shasum' => '');
} }
/** /**

4
src/Composer/Repository/Vcs/HgDriver.php
View File

@ -98,9 +98,7 @@ class HgDriver extends VcsDriver
*/ */
public function getSource($identifier) public function getSource($identifier)
{ {
$label = array_search($identifier, (array) $this->tags) ? : $identifier; return array('type' => 'hg', 'url' => $this->getUrl(), 'reference' => $identifier);
return array('type' => 'hg', 'url' => $this->getUrl(), 'reference' => $label);
} }
/** /**