فهرست منبع

Restore the old regex

François Pluchino 13 سال پیش
والد
کامیت
9b0e50cdc2

+ 2 - 3
src/Composer/Repository/Vcs/GitBitbucketDriver.php

@@ -22,7 +22,6 @@ use Symfony\Component\Console\Input\InputInterface;
  */
 class GitBitbucketDriver extends VcsDriver implements VcsDriverInterface
 {
-    //protected $url;
     protected $owner;
     protected $repository;
     protected $tags;
@@ -32,7 +31,7 @@ class GitBitbucketDriver extends VcsDriver implements VcsDriverInterface
 
     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->repository = $match[2];
 
@@ -162,6 +161,6 @@ class GitBitbucketDriver extends VcsDriver implements VcsDriverInterface
      */
     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);
     }
 }

+ 1 - 1
src/Composer/Repository/Vcs/GitHubDriver.php

@@ -21,7 +21,7 @@ class GitHubDriver extends VcsDriver implements VcsDriverInterface
 
     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->repository = $match[2];
 

+ 1 - 1
src/Composer/Repository/Vcs/HgBitbucketDriver.php

@@ -31,7 +31,7 @@ class HgBitbucketDriver extends VcsDriver implements VcsDriverInterface
 
     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->repository = $match[2];