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

Make sure github driver is used for all github urls

pull/592/merge
Jordi Boggiano 2012-05-12 18:24:07 +02:00
parent 160d2e0847
commit c2933028e8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Downloader/GitDownloader.php
View File

@ -129,9 +129,16 @@ class GitDownloader extends VcsDownloader
if (0 === $this->process->execute($command, $handler)) { if (0 === $this->process->execute($command, $handler)) {
return; return;
} }
if (null !== $path) {
$this->filesystem->removeDirectory($path);
}
$retrying = true; $retrying = true;
} while (--$retries); } while (--$retries);
} }
if (null !== $path) {
$this->filesystem->removeDirectory($path);
}
$this->throwException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput(), $url); $this->throwException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput(), $url);
} }
} }

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

@ -43,7 +43,7 @@ class GitHubDriver extends VcsDriver
*/ */
public function initialize() public function initialize()
{ {
preg_match('#^(?:https?|git)://github\.com/([^/]+)/(.+?)(?:\.git)?$#', $this->url, $match); preg_match('#^(?:(?:https?|git)://github\.com/|git@github\.com:)([^/]+)/(.+?)(?:\.git)?$#', $this->url, $match);
$this->owner = $match[1]; $this->owner = $match[1];
$this->repository = $match[2]; $this->repository = $match[2];
$this->originUrl = 'github.com'; $this->originUrl = 'github.com';
@ -177,7 +177,7 @@ class GitHubDriver extends VcsDriver
*/ */
public static function supports(IOInterface $io, $url, $deep = false) public static function supports(IOInterface $io, $url, $deep = false)
{ {
if (!preg_match('#^(?:https?|git)://github\.com/([^/]+)/(.+?)(?:\.git)?$#', $url)) { if (!preg_match('#^((?:https?|git)://github\.com/|git@github\.com:)([^/]+)/(.+?)(?:\.git)?$#', $url)) {
return false; return false;
} }