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

Fix regex for bitbucket https URLs. 

If the bitbucket URL has the .git extension, the compiling of the authUrl and sshUrl result in invalid URLs.
pull/5272/head
Stefan Grootscholten 2016-05-01 11:41:48 +02:00
parent 591f68288b
commit 9b654048ed
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Util/Git.php
View File

@ -112,7 +112,7 @@ class Git
return; return;
} }
} }
} elseif (preg_match('{^https://(bitbucket.org)/(.*)}', $url, $match)) { //bitbucket oauth } elseif (preg_match('{^https://(bitbucket\.org)/(.*)(\.git)?$}U', $url, $match)) { //bitbucket oauth
$bitbucketUtil = new Bitbucket($this->io, $this->config, $this->process); $bitbucketUtil = new Bitbucket($this->io, $this->config, $this->process);
if (!$this->io->hasAuthentication($match[1])) { if (!$this->io->hasAuthentication($match[1])) {