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

Restore the old regex

pull/198/head
François Pluchino 2012-01-11 01:09:30 +01:00
parent 9c7e7a2c4a
commit 9b0e50cdc2
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,6 @@ use Symfony\Component\Console\Input\InputInterface;
*/ */
class GitBitbucketDriver extends VcsDriver implements VcsDriverInterface class GitBitbucketDriver extends VcsDriver implements VcsDriverInterface
{ {
//protected $url;
protected $owner; protected $owner;
protected $repository; protected $repository;
protected $tags; protected $tags;
@ -32,7 +31,7 @@ class GitBitbucketDriver extends VcsDriver implements VcsDriverInterface
public function __construct($url, InputInterface $input, OutputInterface $output) public function __construct($url, InputInterface $input, OutputInterface $output)
{ {
preg_match('#^(?:https?|http)://bitbucket\.org/([^/]+)/(.+?)\.git$#', $url, $match); preg_match('#^https://bitbucket\.org/([^/]+)/(.+?)\.git$#', $url, $match);
$this->owner = $match[1]; $this->owner = $match[1];
$this->repository = $match[2]; $this->repository = $match[2];
@ -162,6 +161,6 @@ class GitBitbucketDriver extends VcsDriver implements VcsDriverInterface
*/ */
public static function supports($url, $deep = false) public static function supports($url, $deep = false)
{ {
return preg_match('#^(?:https?|http)://bitbucket\.org/([^/]+)/(.+?)\.git$#', $url, $match); return preg_match('#^https://bitbucket\.org/([^/]+)/(.+?)\.git$#', $url, $match);
} }
} }

2
src/Composer/Repository/Vcs/GitHubDriver.php
View File

@ -21,7 +21,7 @@ class GitHubDriver extends VcsDriver implements VcsDriverInterface
public function __construct($url, InputInterface $input, OutputInterface $output) public function __construct($url, InputInterface $input, OutputInterface $output)
{ {
preg_match('#^(?:https?|http|git)://github\.com/([^/]+)/(.+?)(?:\.git)?$#', $url, $match); preg_match('#^(?:https?|git)://github\.com/([^/]+)/(.+?)(?:\.git)?$#', $url, $match);
$this->owner = $match[1]; $this->owner = $match[1];
$this->repository = $match[2]; $this->repository = $match[2];

2
src/Composer/Repository/Vcs/HgBitbucketDriver.php
View File

@ -31,7 +31,7 @@ class HgBitbucketDriver extends VcsDriver implements VcsDriverInterface
public function __construct($url, InputInterface $input, OutputInterface $output) public function __construct($url, InputInterface $input, OutputInterface $output)
{ {
preg_match('#^(?:https?|http)://bitbucket\.org/([^/]+)/([^/]+)/?$#', $url, $match); preg_match('#^https://bitbucket\.org/([^/]+)/([^/]+)/?$#', $url, $match);
$this->owner = $match[1]; $this->owner = $match[1];
$this->repository = $match[2]; $this->repository = $match[2];