From a5df2851efac41cdb8e6776a2201b0d2114e7c32 Mon Sep 17 00:00:00 2001 From: matt-whittom Date: Wed, 31 Jul 2013 13:30:55 -0500 Subject: [PATCH] Finished cleanup of debug messages. --- src/Composer/Downloader/PerforceDownloader.php | 1 - src/Composer/Repository/Vcs/PerforceDriver.php | 9 --------- src/Composer/Util/Perforce.php | 10 ---------- 3 files changed, 20 deletions(-) diff --git a/src/Composer/Downloader/PerforceDownloader.php b/src/Composer/Downloader/PerforceDownloader.php index ccc53b9ef..59adadfaf 100644 --- a/src/Composer/Downloader/PerforceDownloader.php +++ b/src/Composer/Downloader/PerforceDownloader.php @@ -27,7 +27,6 @@ class PerforceDownloader extends VcsDownloader { $ref = $package->getSourceReference(); $label = $package->getPrettyVersion(); - print ("PerforceDownloader: doDownload: ref:$ref, label:$label\n"); $perforce = new Perforce("", "", $package->getSourceUrl(), $path); $perforce->setStream($ref); diff --git a/src/Composer/Repository/Vcs/PerforceDriver.php b/src/Composer/Repository/Vcs/PerforceDriver.php index 4fdaa38f2..e75e5d181 100644 --- a/src/Composer/Repository/Vcs/PerforceDriver.php +++ b/src/Composer/Repository/Vcs/PerforceDriver.php @@ -33,7 +33,6 @@ class PerforceDriver extends VcsDriver */ public function initialize() { - print ("PerforceDriver:initialize\n"); $this->depot = $this->repoConfig['depot']; $this->branch = ""; if (isset($this->repoConfig['branch'])){ @@ -60,7 +59,6 @@ class PerforceDriver extends VcsDriver */ public function getComposerInformation($identifier) { - print("\nPerforceDriver:getComposerInformation - identifier: $identifier\n"); $composer_info =$this->perforce->getComposerInformation($identifier); return $composer_info; } @@ -70,7 +68,6 @@ class PerforceDriver extends VcsDriver */ public function getRootIdentifier() { - print ("PerforceDriver:getRootIdentifier\n"); return $this->branch; } @@ -79,7 +76,6 @@ class PerforceDriver extends VcsDriver */ public function getBranches() { - print ("PerforceDriver:getBranches\n"); $branches = $this->perforce->getBranches(); return $branches; } @@ -89,7 +85,6 @@ class PerforceDriver extends VcsDriver */ public function getTags() { - print ("PerforceDriver:getTags\n"); $tags = $this->perforce->getTags(); return $tags; } @@ -120,7 +115,6 @@ class PerforceDriver extends VcsDriver */ public function getUrl() { - print ("PerforceDriver:getUrl\n"); return $this->url; } @@ -129,9 +123,7 @@ class PerforceDriver extends VcsDriver */ public function hasComposerFile($identifier) { - print ("PerforceDriver:hasComposerFile - identifier: $identifier\n"); $composerFile = $this->perforce->getComposerFilePath($identifier); - print ("composerFile: $composerFile\n"); if (!file_exists(filename)){ $composer_info = $this->perforce->getComposerInformation(); $result = strlen(trim($composer_info))>0; @@ -154,7 +146,6 @@ class PerforceDriver extends VcsDriver */ public static function supports(IOInterface $io, $url, $deep = false) { - print ("PerforceDriver:supports - url: $url\n"); return Perforce::checkServerExists($url); } } diff --git a/src/Composer/Util/Perforce.php b/src/Composer/Util/Perforce.php index f80a4bb72..245dd182e 100644 --- a/src/Composer/Util/Perforce.php +++ b/src/Composer/Util/Perforce.php @@ -135,7 +135,6 @@ class Perforce { public function syncCodeBase($label){ $p4CreateClientCommand = $this->generateP4Command( "client -i < " . $this->getP4ClientSpec()); - print ("Perforce: syncCodeBase - client command:$p4CreateClientCommand \n"); $result = shell_exec($p4CreateClientCommand); $prevDir = getcwd(); @@ -149,14 +148,12 @@ class Perforce { $p4SyncCommand = $p4SyncCommand . "@" . $label; } } - print ("Perforce: syncCodeBase - sync command:$p4SyncCommand \n"); $result = shell_exec($p4SyncCommand); chdir($prevDir); } public function writeP4ClientSpec(){ - print ("Perforce: writeP4ClientSpec\n"); $spec = fopen($this->getP4ClientSpec(), 'w'); try { fwrite($spec, "Client: " . $this->getClient() . "\n\n"); @@ -193,7 +190,6 @@ class Perforce { } public function p4Login(IOInterface $io){ - print ("Perforce: P4Login\n"); $this->queryP4User($io); if (!$this->isLoggedIn()){ $password = $this->queryP4Password($io); @@ -204,7 +200,6 @@ class Perforce { public static function checkServerExists($url) { - print ("Perforce: checkServerExists\n"); $result = shell_exec("p4 -p $url info -s"); $index = strpos($result, "error"); if ($index === false){ @@ -226,7 +221,6 @@ class Perforce { public function getComposerInformationFromPath($composer_json) { $command = $this->generateP4Command(" print $composer_json", false); - print ("Perforce: getComposerInformation: command: $command\n"); $result = shell_exec($command); $index = strpos($result, "{"); if ($index === false){ @@ -244,9 +238,7 @@ class Perforce { { $composer_json_path = substr($identifier, 0, $index) . "/composer.json" . substr($identifier, $index); $command = $this->generateP4Command(" files $composer_json_path", false); - print("Perforce: getComposerInformationFromTag: $identifier, command:\n $command\n"); $result = shell_exec($command); - print("Perforce: getComposerInformationFromTag: result: \n $result\n"); $index2 = strpos($result, "no such file(s)."); if ($index2 === false){ $index3 = strpos($result, "change"); @@ -280,7 +272,6 @@ class Perforce { } $branches = array(); $branches['master'] = $possible_branches[$this->p4branch]; - print ("Perforce: getBranches: returning: \n" . var_export($branches, true) . "\n"); return $branches; } @@ -289,7 +280,6 @@ class Perforce { $command = $this->generateP4Command("labels"); $result = shell_exec($command); $resArray = explode("\n", $result); - print("Perforce:getTags - result:\n$result\n"); $tags = array(); foreach ($resArray as $line){ $index = strpos($line, "Label");