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

Tweak bitbucket driver to uniformize regexes

pull/10083/head
Jordi Boggiano 2021-11-11 12:21:19 +01:00
parent ba1814f306
commit 68847ed609
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Composer/Repository/Vcs/GitBitbucketDriver.php
View File

@ -26,9 +26,9 @@ use Composer\Util\Http\Response;
class GitBitbucketDriver extends VcsDriver class GitBitbucketDriver extends VcsDriver
{ {
/** @var string */ /** @var string */
private $owner; protected $owner;
/** @var string */ /** @var string */
private $repository; protected $repository;
/** @var bool */ /** @var bool */
private $hasIssues = false; private $hasIssues = false;
/** @var ?string */ /** @var ?string */
@ -51,7 +51,7 @@ class GitBitbucketDriver extends VcsDriver
/** /**
* @var ?VcsDriver * @var ?VcsDriver
*/ */
private $fallbackDriver = null; protected $fallbackDriver = null;
/** @var string|null if set either git or hg */ /** @var string|null if set either git or hg */
private $vcsType; private $vcsType;
@ -60,7 +60,7 @@ class GitBitbucketDriver extends VcsDriver
*/ */
public function initialize() public function initialize()
{ {
preg_match('#^https?://bitbucket\.org/([^/]+)/([^/]+?)(\.git|/?)$#i', $this->url, $match); preg_match('#^https?://bitbucket\.org/([^/]+)/([^/]+?)(\.git|/?)?$#i', $this->url, $match);
$this->owner = $match[1]; $this->owner = $match[1];
$this->repository = $match[2]; $this->repository = $match[2];
$this->originUrl = 'bitbucket.org'; $this->originUrl = 'bitbucket.org';
@ -521,7 +521,7 @@ class GitBitbucketDriver extends VcsDriver
*/ */
public static function supports(IOInterface $io, Config $config, $url, $deep = false) public static function supports(IOInterface $io, Config $config, $url, $deep = false)
{ {
if (!preg_match('#^https?://bitbucket\.org/([^/]+)/(.+?)(?:\.git)?$#i', $url)) { if (!preg_match('#^https?://bitbucket\.org/([^/]+)/([^/]+?)(\.git|/?)?$#i', $url)) {
return false; return false;
} }