From a892e6a3bde9c5403b17c7f169bf9804153dc890 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Wed, 6 Nov 2013 21:37:20 +0000 Subject: [PATCH 1/2] Pass IO instance to ProcessExecutor for logging --- src/Composer/Repository/Vcs/PerforceDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Repository/Vcs/PerforceDriver.php b/src/Composer/Repository/Vcs/PerforceDriver.php index 484f1e96f..79500f1d6 100644 --- a/src/Composer/Repository/Vcs/PerforceDriver.php +++ b/src/Composer/Repository/Vcs/PerforceDriver.php @@ -162,7 +162,7 @@ class PerforceDriver extends VcsDriver 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); + return Perforce::checkServerExists($url, new ProcessExecutor($io)); } return false; From c0316aa9571f3c58edc59eea628ad6ee0e813d97 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Wed, 6 Nov 2013 21:37:38 +0000 Subject: [PATCH 2/2] Capture output, stopping errors showing up if p4 is not available --- src/Composer/Util/Perforce.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Composer/Util/Perforce.php b/src/Composer/Util/Perforce.php index ecaf3a720..cf663be10 100644 --- a/src/Composer/Util/Perforce.php +++ b/src/Composer/Util/Perforce.php @@ -372,7 +372,9 @@ class Perforce 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)