Browse Source

Minor tweaks to perforce support, refs #2329

Jordi Boggiano 11 years ago
parent
commit
ce8b475f4c
2 changed files with 5 additions and 4 deletions
  1. 1 0
      src/Composer/Factory.php
  2. 4 4
      src/Composer/Repository/Vcs/PerforceDriver.php

+ 1 - 0
src/Composer/Factory.php

@@ -292,6 +292,7 @@ class Factory
         $rm->setRepositoryClass('pear', 'Composer\Repository\PearRepository');
         $rm->setRepositoryClass('git', 'Composer\Repository\VcsRepository');
         $rm->setRepositoryClass('svn', 'Composer\Repository\VcsRepository');
+        $rm->setRepositoryClass('perforce', 'Composer\Repository\VcsRepository');
         $rm->setRepositoryClass('hg', 'Composer\Repository\VcsRepository');
         $rm->setRepositoryClass('artifact', 'Composer\Repository\ArtifactRepository');
 

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

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