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

Merge pull request #2402 from cs278/perforce-driver-fixes 

Perforce driver fixes
pull/2405/head
Jordi Boggiano 2013-11-06 14:13:14 -08:00
parent 65d516e427 c0316aa957
commit a045ab3459
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,7 @@ class PerforceDriver 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 ($deep || preg_match('#\b(perforce|p4)\b#i', $url)) { if ($deep || preg_match('#\b(perforce|p4)\b#i', $url)) {
return Perforce::checkServerExists($url, new ProcessExecutor); return Perforce::checkServerExists($url, new ProcessExecutor($io));
} }
return false; return false;

4
src/Composer/Util/Perforce.php
View File

@ -372,7 +372,9 @@ class Perforce
public static function checkServerExists($url, ProcessExecutor $processExecutor) public static function checkServerExists($url, ProcessExecutor $processExecutor)
{ {
return 0 === $processExecutor->execute('p4 -p ' . $url . ' info -s'); $output = null;
return 0 === $processExecutor->execute('p4 -p ' . $url . ' info -s', $output);
} }
public function getComposerInformation($identifier) public function getComposerInformation($identifier)