diff --git a/src/Composer/Repository/Vcs/GitLabDriver.php b/src/Composer/Repository/Vcs/GitLabDriver.php index 00f656f30..a4db638dc 100644 --- a/src/Composer/Repository/Vcs/GitLabDriver.php +++ b/src/Composer/Repository/Vcs/GitLabDriver.php @@ -62,6 +62,9 @@ class GitLabDriver extends VcsDriver */ protected $gitDriver; + const URL_REGEX = '#^((https?)://(.*)/|git@([^:]+):)([^/]+)/(.+?)(?:\.git|/)?$#'; + + /** * Extracts information from the repository url. * SSH urls uses https by default. @@ -70,7 +73,7 @@ class GitLabDriver extends VcsDriver */ public function initialize() { - if (!preg_match('#^((https?)://([^/]+)/|git@([^:]+):)([^/]+)/(.+?)(?:\.git|/)?$#', $this->url, $match)) { + if (!preg_match(static::URL_REGEX, $this->url, $match)) { throw new \InvalidArgumentException('The URL provided is invalid. It must be the HTTP URL of a GitLab project.'); } @@ -343,7 +346,7 @@ class GitLabDriver extends VcsDriver */ public static function supports(IOInterface $io, Config $config, $url, $deep = false) { - if (!preg_match('#^((https?)://([^/]+)/|git@([^:]+):)([^/]+)/(.+?)(?:\.git|/)?$#', $url, $match)) { + if (!preg_match(static::URL_REGEX, $url, $match)) { return false; } diff --git a/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php b/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php index d5d6ed832..0b8441514 100644 --- a/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php +++ b/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php @@ -26,6 +26,7 @@ class GitLabDriverTest extends \PHPUnit_Framework_TestCase $this->config->merge(array( 'config' => array( 'home' => sys_get_temp_dir().'/composer-test', + 'gitlab-domains' => array('mycompany.com/gitlab', 'gitlab.com') ), )); @@ -215,6 +216,17 @@ JSON; array('git@gitlab.com:foo/bar.git', extension_loaded('openssl')), array('git@example.com:foo/bar.git', false), array('http://example.com/foo/bar', false), + array('https://mycompany.com/gitlab/mygroup/myproject', true), ); } + + public function testGitlabSubDirectory() + { + $url = 'https://mycompany.com/gitlab/mygroup/myproject'; + $apiUrl = 'https://mycompany.com/gitlab/api/v3/projects/mygroup%2Fmyproject'; + + $driver = new GitLabDriver(array('url' => $url), $this->io->reveal(), $this->config, $this->process->reveal(), $this->remoteFilesystem->reveal()); + $driver->initialize(); + $this->assertEquals($apiUrl, $driver->getApiUrl(), 'API URL is derived from the repository URL'); + } }