From 1d29fa04b168f4423699baefee2a9ff8ec682752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steve=20M=C3=BCller?= Date: Wed, 26 Apr 2017 16:59:50 +0200 Subject: [PATCH] forward GitLab driver options to remote filesystem --- src/Composer/Repository/Vcs/VcsDriver.php | 4 +- .../Test/Repository/Vcs/GitLabDriverTest.php | 49 +++++++++++++++++-- 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/src/Composer/Repository/Vcs/VcsDriver.php b/src/Composer/Repository/Vcs/VcsDriver.php index a59472fde..3d7185a34 100644 --- a/src/Composer/Repository/Vcs/VcsDriver.php +++ b/src/Composer/Repository/Vcs/VcsDriver.php @@ -160,7 +160,9 @@ abstract class VcsDriver implements VcsDriverInterface */ protected function getContents($url) { - return $this->remoteFilesystem->getContents($this->originUrl, $url, false); + $options = isset($this->repoConfig['options']) ? $this->repoConfig['options'] : array(); + + return $this->remoteFilesystem->getContents($this->originUrl, $url, false, $options); } /** diff --git a/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php b/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php index fa0cd6ac2..4c6d74810 100644 --- a/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php +++ b/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php @@ -16,6 +16,7 @@ use Composer\Repository\Vcs\GitLabDriver; use Composer\Config; use Composer\TestCase; use Composer\Util\Filesystem; +use Prophecy\Argument; /** * @author Jérôme Tamarelle @@ -82,7 +83,7 @@ class GitLabDriverTest extends TestCase JSON; $this->remoteFilesystem - ->getContents('gitlab.com', $apiUrl, false) + ->getContents('gitlab.com', $apiUrl, false, array()) ->willReturn($projectData) ->shouldBeCalledTimes(1) ; @@ -121,7 +122,7 @@ JSON; JSON; $this->remoteFilesystem - ->getContents('gitlab.com', $apiUrl, false) + ->getContents('gitlab.com', $apiUrl, false, array()) ->willReturn($projectData) ->shouldBeCalledTimes(1) ; @@ -207,7 +208,7 @@ JSON; JSON; $this->remoteFilesystem - ->getContents('gitlab.com', $apiUrl, false) + ->getContents('gitlab.com', $apiUrl, false, array()) ->willReturn($tagData) ->shouldBeCalledTimes(1) ; @@ -249,7 +250,7 @@ JSON; JSON; $this->remoteFilesystem - ->getContents('gitlab.com', $apiUrl, false) + ->getContents('gitlab.com', $apiUrl, false, array()) ->willReturn($branchData) ->shouldBeCalledTimes(1) ; @@ -310,7 +311,7 @@ JSON; JSON; $this->remoteFilesystem - ->getContents('mycompany.com/gitlab', $apiUrl, false) + ->getContents('mycompany.com/gitlab', $apiUrl, false, array()) ->willReturn($projectData) ->shouldBeCalledTimes(1) ; @@ -320,4 +321,42 @@ JSON; $this->assertEquals($apiUrl, $driver->getApiUrl(), 'API URL is derived from the repository URL'); } + + public function testForwardsOptions() + { + $options = array( + 'ssl' => array( + 'verify_peer' => false, + ) + ); + $projectData = <<remoteFilesystem + ->getContents(Argument::cetera(), $options) + ->willReturn($projectData) + ->shouldBeCalled(); + + $driver = new GitLabDriver( + array('url' => 'https://gitlab.mycompany.local/mygroup/myproject', 'options' => $options), + $this->io->reveal(), + $this->config, + $this->process->reveal(), + $this->remoteFilesystem->reveal() + ); + $driver->initialize(); + } }