Browse Source

Per request from Jordi Boggiano (Seldaek) making Config 2nd parameter in supports()

Gennady Feldman 11 years ago
parent
commit
e5045ce215

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

@@ -141,7 +141,7 @@ class GitBitbucketDriver extends VcsDriver implements VcsDriverInterface
     /**
      * {@inheritDoc}
      */
-    public static function supports(IOInterface $io, $url, Config $config, $deep = false)
+    public static function supports(IOInterface $io, Config $config, $url, $deep = false)
     {
         if (!preg_match('#^https://bitbucket\.org/([^/]+)/(.+?)\.git$#', $url)) {
             return false;

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

@@ -212,7 +212,7 @@ class GitDriver extends VcsDriver
     /**
      * {@inheritDoc}
      */
-    public static function supports(IOInterface $io, $url, Config $config, $deep = false)
+    public static function supports(IOInterface $io, Config $config, $url, $deep = false)
     {
         if (preg_match('#(^git://|\.git$|git(?:olite)?@|//git\.|//github.com/)#i', $url)) {
             return true;

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

@@ -232,7 +232,7 @@ class GitHubDriver extends VcsDriver
     /**
      * {@inheritDoc}
      */
-    public static function supports(IOInterface $io, $url, Config $config, $deep = false)
+    public static function supports(IOInterface $io, Config $config, $url, $deep = false)
     {
         if (!preg_match('#^((?:https?|git)://([^/]+)/|git@([^:]+):)([^/]+)/(.+?)(?:\.git)?$#', $url, $matches)) {
             return false;

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

@@ -151,7 +151,7 @@ class HgBitbucketDriver extends VcsDriver
     /**
      * {@inheritDoc}
      */
-    public static function supports(IOInterface $io, $url, Config $config, $deep = false)
+    public static function supports(IOInterface $io, Config $config, $url, $deep = false)
     {
         if (!preg_match('#^https://bitbucket\.org/([^/]+)/([^/]+)/?$#', $url)) {
             return false;

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

@@ -190,7 +190,7 @@ class HgDriver extends VcsDriver
     /**
      * {@inheritDoc}
      */
-    public static function supports(IOInterface $io, $url, Config $config, $deep = false)
+    public static function supports(IOInterface $io, Config $config, $url, $deep = false)
     {
         if (preg_match('#(^(?:https?|ssh)://(?:[^@]@)?bitbucket.org|https://(?:.*?)\.kilnhg.com)#i', $url)) {
             return true;

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

@@ -159,7 +159,7 @@ class PerforceDriver extends VcsDriver
     /**
      * {@inheritDoc}
      */
-    public static function supports(IOInterface $io, $url, Config $config, $deep = false)
+    public static function supports(IOInterface $io, Config $config, $url, $deep = false)
     {
         if ($deep || preg_match('#\b(perforce|p4)\b#i', $url)) {
             return Perforce::checkServerExists($url, new ProcessExecutor);

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

@@ -242,7 +242,7 @@ class SvnDriver extends VcsDriver
     /**
      * {@inheritDoc}
      */
-    public static function supports(IOInterface $io, $url, Config $config, $deep = false)
+    public static function supports(IOInterface $io, Config $config, $url, $deep = false)
     {
         $url = self::normalizeUrl($url);
         if (preg_match('#(^svn://|^svn\+ssh://|svn\.)#i', $url)) {

+ 2 - 2
src/Composer/Repository/Vcs/VcsDriverInterface.php

@@ -92,10 +92,10 @@ interface VcsDriverInterface
      * Checks if this driver can handle a given url
      *
      * @param  IOInterface $io     IO instance
-     * @param  string      $url    URL to validate/check
      * @param  Config      $config current $config
+     * @param  string      $url    URL to validate/check
      * @param  bool        $deep   unless true, only shallow checks (url matching typically) should be done
      * @return bool
      */
-    public static function supports(IOInterface $io, $url, Config $config, $deep = false);
+    public static function supports(IOInterface $io, Config $config, $url, $deep = false);
 }

+ 2 - 2
src/Composer/Repository/VcsRepository.php

@@ -80,7 +80,7 @@ class VcsRepository extends ArrayRepository
         }
 
         foreach ($this->drivers as $driver) {
-            if ($driver::supports($this->io, $this->url, $this->config)) {
+            if ($driver::supports($this->io, $this->config, $this->url)) {
                 $driver = new $driver($this->repoConfig, $this->io, $this->config);
                 $driver->initialize();
 
@@ -89,7 +89,7 @@ class VcsRepository extends ArrayRepository
         }
 
         foreach ($this->drivers as $driver) {
-            if ($driver::supports($this->io, $this->url, $this->config, true)) {
+            if ($driver::supports($this->io, $this->config, $this->url, true)) {
                 $driver = new $driver($this->repoConfig, $this->io, $this->config);
                 $driver->initialize();
 

+ 1 - 1
tests/Composer/Test/Repository/Vcs/PerforceDriverTest.php

@@ -141,6 +141,6 @@ class PerforceDriverTest extends \PHPUnit_Framework_TestCase
     public function testSupportsReturnsFalseNoDeepCheck()
     {
         $this->expectOutputString('');
-        $this->assertFalse(PerforceDriver::supports($this->io, 'existing.url', $this->config));
+        $this->assertFalse(PerforceDriver::supports($this->io, $this->config, 'existing.url'));
     }
 }

+ 1 - 1
tests/Composer/Test/Repository/Vcs/SvnDriverTest.php

@@ -81,7 +81,7 @@ class SvnDriverTest extends \PHPUnit_Framework_TestCase
     public function testSupport($url, $assertion)
     {
         $config = new Config();
-        $result = SvnDriver::supports($this->getMock('Composer\IO\IOInterface'), $url, $config);
+        $result = SvnDriver::supports($this->getMock('Composer\IO\IOInterface'), $config, $url);
         $this->assertEquals($assertion, $result);
     }
 }