From d27691a67f6c5be21357a7afe032f796c61c2504 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 21 Sep 2011 23:02:58 +0200
Subject: [PATCH] Fix namespace/use/typo issues

---
 bin/composer                                   | 2 +-
 src/Composer/Command/InstallCommand.php        | 4 +++-
 src/Composer/Composer.php                      | 1 +
 src/Composer/Package/Loader/ArrayLoader.php    | 2 +-
 src/Composer/Repository/PlatformRepository.php | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/composer b/bin/composer
index 5ccd36118..12fbab8d6 100755
--- a/bin/composer
+++ b/bin/composer
@@ -23,7 +23,7 @@ $composer->setRepository('Platform', new Repository\PlatformRepository());
 $composer->setRepository('Packagist', new Repository\ComposerRepository('http://packagist.org'));
 
 // initialize package
-$loader  = new Package\Loader\Json();
+$loader  = new Package\Loader\JsonLoader();
 $package = $loader->load('composer.json');
 
 // initialize lock
diff --git a/src/Composer/Command/InstallCommand.php b/src/Composer/Command/InstallCommand.php
index f183c049b..b2e41a522 100644
--- a/src/Composer/Command/InstallCommand.php
+++ b/src/Composer/Command/InstallCommand.php
@@ -13,6 +13,8 @@
 namespace Composer\Command;
 
 use Composer\DependencyResolver;
+use Composer\DependencyResolver\Pool;
+use Composer\DependencyResolver\Request;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -43,7 +45,7 @@ EOT
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         if ($this->getLock()->isLocked()) {
-            $this->writeln('<info>Found lockfile. Reading</info>');
+            $output->writeln('<info>Found lockfile. Reading</info>');
 
             foreach ($this->getLock()->getLockedPackages() as $package) {
                 $installer = $this->getComposer()->getInstaller($package->getType());
diff --git a/src/Composer/Composer.php b/src/Composer/Composer.php
index ceeb16735..a5ca2a56e 100644
--- a/src/Composer/Composer.php
+++ b/src/Composer/Composer.php
@@ -13,6 +13,7 @@
 namespace Composer;
 
 use Composer\Installer\InstallerInterface;
+use Composer\Repository\RepositoryInterface;
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
diff --git a/src/Composer/Package/Loader/ArrayLoader.php b/src/Composer/Package/Loader/ArrayLoader.php
index 89f2d3307..789db93a2 100644
--- a/src/Composer/Package/Loader/ArrayLoader.php
+++ b/src/Composer/Package/Loader/ArrayLoader.php
@@ -99,7 +99,7 @@ class ArrayLoader
             $links[]    = new Package\Link($srcPackageName, $packageName, $constraint, $description);
         }
 
-        return $requirements;
+        return $links;
     }
 
     private function validateConfig(array $config)
diff --git a/src/Composer/Repository/PlatformRepository.php b/src/Composer/Repository/PlatformRepository.php
index 624cc788b..70910e3ad 100644
--- a/src/Composer/Repository/PlatformRepository.php
+++ b/src/Composer/Repository/PlatformRepository.php
@@ -14,6 +14,7 @@ namespace Composer\Repository;
 
 use Composer\Package\MemoryPackage;
 use Composer\Package\BasePackage;
+use Composer\Package\Version\VersionParser;
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>