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

Use github protocols setting for push urls

pull/2009/head
Stéphane Klein 2013-06-16 04:50:16 +02:00
parent d498e73363
commit 42119dde6b
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,7 +380,8 @@ class GitDownloader extends VcsDownloader
{ {
// set push url for github projects // set push url for github projects
if (preg_match('{^(?:https?|git)://github.com/([^/]+)/([^/]+?)(?:\.git)?$}', $package->getSourceUrl(), $match)) { if (preg_match('{^(?:https?|git)://github.com/([^/]+)/([^/]+?)(?:\.git)?$}', $package->getSourceUrl(), $match)) {
$pushUrl = 'git@github.com:'.$match[1].'/'.$match[2].'.git'; $protocols = $this->config->get('github-protocols');
$pushUrl = $protocols[0] === 'git' ? 'git@github.com:'.$match[1].'/'.$match[2].'.git' : $package->getSourceUrl();
$cmd = sprintf('git remote set-url --push origin %s', escapeshellarg($pushUrl)); $cmd = sprintf('git remote set-url --push origin %s', escapeshellarg($pushUrl));
$this->process->execute($cmd, $ignoredOutput, $path); $this->process->execute($cmd, $ignoredOutput, $path);
} }

24
tests/Composer/Test/Downloader/GitDownloaderTest.php
View File

@ -137,7 +137,19 @@ class GitDownloaderTest extends \PHPUnit_Framework_TestCase
$downloader->download($packageMock, 'composerPath'); $downloader->download($packageMock, 'composerPath');
} }
public function testDownloadUsesCustomVariousProtocolsForGithub() public function pushUrlProvider()
{
return array(
array('git', 'git@github.com:composer/composer.git'),
array('https', 'https://github.com/composer/composer'),
array('http', 'https://github.com/composer/composer')
);
}
/**
* @dataProvider pushUrlProvider
*/
public function testDownloadAndSetPushUrlUseCustomVariousProtocolsForGithub($protocol, $pushUrl)
{ {
$packageMock = $this->getMock('Composer\Package\PackageInterface'); $packageMock = $this->getMock('Composer\Package\PackageInterface');
$packageMock->expects($this->any()) $packageMock->expects($this->any())
@ -151,18 +163,24 @@ class GitDownloaderTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue('1.0.0')); ->will($this->returnValue('1.0.0'));
$processExecutor = $this->getMock('Composer\Util\ProcessExecutor'); $processExecutor = $this->getMock('Composer\Util\ProcessExecutor');
$expectedGitCommand = $this->winCompat("git clone 'http://github.com/composer/composer' 'composerPath' && cd 'composerPath' && git remote add composer 'http://github.com/composer/composer' && git fetch composer"); $expectedGitCommand = $this->winCompat("git clone '{$protocol}://github.com/composer/composer' 'composerPath' && cd 'composerPath' && git remote add composer '{$protocol}://github.com/composer/composer' && git fetch composer");
$processExecutor->expects($this->at(0)) $processExecutor->expects($this->at(0))
->method('execute') ->method('execute')
->with($this->equalTo($expectedGitCommand)) ->with($this->equalTo($expectedGitCommand))
->will($this->returnValue(0)); ->will($this->returnValue(0));
$expectedGitCommand = $this->winCompat("git remote set-url --push origin '{$pushUrl}'");
$processExecutor->expects($this->at(1))
->method('execute')
->with($this->equalTo($expectedGitCommand), $this->equalTo(null), $this->equalTo($this->winCompat('composerPath')))
->will($this->returnValue(0));
$processExecutor->expects($this->exactly(4)) $processExecutor->expects($this->exactly(4))
->method('execute') ->method('execute')
->will($this->returnValue(0)); ->will($this->returnValue(0));
$config = new Config(); $config = new Config();
$config->merge(array('config' => array('github-protocols' => array('http')))); $config->merge(array('config' => array('github-protocols' => array($protocol))));
$downloader = $this->getDownloaderMock(null, $config, $processExecutor); $downloader = $this->getDownloaderMock(null, $config, $processExecutor);
$downloader->download($packageMock, 'composerPath'); $downloader->download($packageMock, 'composerPath');