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

When using the github driver with no-api don't reset to an ssh url

pull/2773/head
Nils Adermann 2014-02-25 15:55:44 +01:00
parent 665a2bd0c0
commit edfaf727e5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ class GitHubDriver extends VcsDriver
$this->cache = new Cache($this->io, $this->config->get('cache-repo-dir').'/'.$this->originUrl.'/'.$this->owner.'/'.$this->repository); $this->cache = new Cache($this->io, $this->config->get('cache-repo-dir').'/'.$this->originUrl.'/'.$this->owner.'/'.$this->repository);
if (isset($this->repoConfig['no-api']) && $this->repoConfig['no-api']) { if (isset($this->repoConfig['no-api']) && $this->repoConfig['no-api']) {
$this->setupGitDriver(); $this->setupGitDriver($this->getUrl());
return; return;
} }
@ -406,7 +406,7 @@ class GitHubDriver extends VcsDriver
// GitHub returns 404 for private repositories) and we // GitHub returns 404 for private repositories) and we
// cannot ask for authentication credentials (because we // cannot ask for authentication credentials (because we
// are not interactive) then we fallback to GitDriver. // are not interactive) then we fallback to GitDriver.
$this->setupGitDriver(); $this->setupGitDriver($this->generateSshUrl());
return; return;
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {
@ -417,10 +417,10 @@ class GitHubDriver extends VcsDriver
} }
} }
protected function setupGitDriver() protected function setupGitDriver($url)
{ {
$this->gitDriver = new GitDriver( $this->gitDriver = new GitDriver(
array('url' => $this->generateSshUrl()), array('url' => $url),
$this->io, $this->io,
$this->config, $this->config,
$this->process, $this->process,