From 8a06e461e5955cf18607875172c9d78f78909154 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Mon, 6 May 2013 11:31:22 +0200
Subject: [PATCH] Fix a few bugs, fixes #1867

---
 src/Composer/Command/ArchiveCommand.php          | 2 +-
 src/Composer/Config/JsonConfigSource.php         | 4 ++--
 src/Composer/Downloader/PearPackageExtractor.php | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Composer/Command/ArchiveCommand.php b/src/Composer/Command/ArchiveCommand.php
index 61a5d8e48..b56d06467 100644
--- a/src/Composer/Command/ArchiveCommand.php
+++ b/src/Composer/Command/ArchiveCommand.php
@@ -95,7 +95,7 @@ EOT
             $repos = new CompositeRepository(array_merge(array($localRepo), $composer->getRepositoryManager()->getRepositories()));
         } else {
             $defaultRepos = Factory::createDefaultRepositories($this->getIO());
-            $output->writeln('No composer.json found in the current directory, searching packages from ' . implode(', ', array_keys($defaultRepos)));
+            $io->write('No composer.json found in the current directory, searching packages from ' . implode(', ', array_keys($defaultRepos)));
             $repos = new CompositeRepository($defaultRepos);
         }
 
diff --git a/src/Composer/Config/JsonConfigSource.php b/src/Composer/Config/JsonConfigSource.php
index 8b8b25e6f..27d922853 100644
--- a/src/Composer/Config/JsonConfigSource.php
+++ b/src/Composer/Config/JsonConfigSource.php
@@ -81,7 +81,7 @@ class JsonConfigSource implements ConfigSourceInterface
      */
     public function addLink($type, $name, $value)
     {
-        $this->manipulateJson('addLink', $type, $name, $value, function (&$config, $key) {
+        $this->manipulateJson('addLink', $type, $name, $value, function (&$config, $type, $name, $value) {
             $config[$type][$name] = $value;
         });
     }
@@ -91,7 +91,7 @@ class JsonConfigSource implements ConfigSourceInterface
      */
     public function removeLink($type, $name)
     {
-        $this->manipulateJson('removeSubNode', $type, $name, function (&$config, $key) {
+        $this->manipulateJson('removeSubNode', $type, $name, function (&$config, $type, $name) {
             unset($config[$type][$name]);
         });
     }
diff --git a/src/Composer/Downloader/PearPackageExtractor.php b/src/Composer/Downloader/PearPackageExtractor.php
index 9268bd66d..5310c7ab7 100644
--- a/src/Composer/Downloader/PearPackageExtractor.php
+++ b/src/Composer/Downloader/PearPackageExtractor.php
@@ -194,7 +194,7 @@ class PearPackageExtractor
         }
     }
 
-    private function buildSourceList10($children, $targetRoles, $source = '', $target = '', $role = null, $packageName)
+    private function buildSourceList10($children, $targetRoles, $source, $target, $role, $packageName)
     {
         $result = array();
 
@@ -224,7 +224,7 @@ class PearPackageExtractor
         return $result;
     }
 
-    private function buildSourceList20($children, $targetRoles, $source = '', $target = '', $role = null, $packageName)
+    private function buildSourceList20($children, $targetRoles, $source, $target, $role, $packageName)
     {
         $result = array();