Explorar el Código

Merge pull request #5954 from Golodnyi/master

Not actual parameters
Jordi Boggiano hace 8 años
padre
commit
9b0ddcd9dd

+ 1 - 1
src/Composer/Command/StatusCommand.php

@@ -89,7 +89,7 @@ EOT
                     $errors[$targetDir] = $targetDir . ' is a symbolic link.';
                 }
 
-                if ($changes = $downloader->getLocalChanges($package, $targetDir, true)) {
+                if ($changes = $downloader->getLocalChanges($package, $targetDir)) {
                     $errors[$targetDir] = $changes;
                 }
             }

+ 1 - 1
src/Composer/Downloader/FossilDownloader.php

@@ -31,7 +31,7 @@ class FossilDownloader extends VcsDownloader
         $url = ProcessExecutor::escape($url);
         $ref = ProcessExecutor::escape($package->getSourceReference());
         $repoFile = $path . '.fossil';
-        $this->io->writeError("    Cloning ".$package->getSourceReference($repoFile));
+        $this->io->writeError("    Cloning ".$package->getSourceReference());
         $command = sprintf('fossil clone %s %s', $url, ProcessExecutor::escape($repoFile));
         if (0 !== $this->process->execute($command, $ignoredOutput)) {
             throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput());

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

@@ -38,8 +38,8 @@ class PerforceDriver extends VcsDriver
         }
 
         $this->initPerforce($this->repoConfig);
-        $this->perforce->p4Login($this->io);
-        $this->perforce->checkStream($this->depot);
+        $this->perforce->p4Login();
+        $this->perforce->checkStream();
 
         $this->perforce->writeP4ClientSpec();
         $this->perforce->connectClient();