From 1cced223d8e5a93bf2f15b022572dbef10cd95a9 Mon Sep 17 00:00:00 2001
From: golodnyi <ochen@golodnyi.ru>
Date: Thu, 8 Dec 2016 22:04:38 +0700
Subject: [PATCH 1/2] Not actual parameters

---
 src/Composer/Command/StatusCommand.php          | 2 +-
 src/Composer/Downloader/FossilDownloader.php    | 2 +-
 src/Composer/Repository/CompositeRepository.php | 2 +-
 src/Composer/Repository/Vcs/PerforceDriver.php  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Composer/Command/StatusCommand.php b/src/Composer/Command/StatusCommand.php
index f381c6136..9e348ef29 100644
--- a/src/Composer/Command/StatusCommand.php
+++ b/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;
                 }
             }
diff --git a/src/Composer/Downloader/FossilDownloader.php b/src/Composer/Downloader/FossilDownloader.php
index 35dfa5cb7..fd8a7f554 100644
--- a/src/Composer/Downloader/FossilDownloader.php
+++ b/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());
diff --git a/src/Composer/Repository/CompositeRepository.php b/src/Composer/Repository/CompositeRepository.php
index ce57504f0..38258175c 100644
--- a/src/Composer/Repository/CompositeRepository.php
+++ b/src/Composer/Repository/CompositeRepository.php
@@ -102,7 +102,7 @@ class CompositeRepository extends BaseRepository
         $matches = array();
         foreach ($this->repositories as $repository) {
             /* @var $repository RepositoryInterface */
-            $matches[] = $repository->search($query, $mode, $type);
+            $matches[] = $repository->search($query, $mode);
         }
 
         return $matches ? call_user_func_array('array_merge', $matches) : array();
diff --git a/src/Composer/Repository/Vcs/PerforceDriver.php b/src/Composer/Repository/Vcs/PerforceDriver.php
index 7aaa6efb4..e6411a412 100644
--- a/src/Composer/Repository/Vcs/PerforceDriver.php
+++ b/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();

From 64f3079c53a46f6418f29df69e397862f88dec5e Mon Sep 17 00:00:00 2001
From: golodnyi <ochen@golodnyi.ru>
Date: Thu, 8 Dec 2016 22:53:03 +0700
Subject: [PATCH 2/2] rollback changes, since the implementation of the method
 "search" in the class  "ComposerRepository" has parameter "type "

---
 src/Composer/Repository/CompositeRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Composer/Repository/CompositeRepository.php b/src/Composer/Repository/CompositeRepository.php
index 38258175c..ce57504f0 100644
--- a/src/Composer/Repository/CompositeRepository.php
+++ b/src/Composer/Repository/CompositeRepository.php
@@ -102,7 +102,7 @@ class CompositeRepository extends BaseRepository
         $matches = array();
         foreach ($this->repositories as $repository) {
             /* @var $repository RepositoryInterface */
-            $matches[] = $repository->search($query, $mode);
+            $matches[] = $repository->search($query, $mode, $type);
         }
 
         return $matches ? call_user_func_array('array_merge', $matches) : array();