From ea2d46bcffa033f10f266f885229375f303b4b3b Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 20 Mar 2012 17:42:37 +0100 Subject: [PATCH] Fix ComposerRepository calls, fixes #475 --- src/Composer/Command/CreateProjectCommand.php | 4 ++-- src/Composer/Command/InitCommand.php | 2 +- src/Composer/Command/SearchCommand.php | 3 ++- src/Composer/Command/ShowCommand.php | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php index 88da8adc8..0c98f5f27 100644 --- a/src/Composer/Command/CreateProjectCommand.php +++ b/src/Composer/Command/CreateProjectCommand.php @@ -85,11 +85,11 @@ EOT } if (null === $repositoryUrl) { - $sourceRepo = new ComposerRepository(array('url' => 'http://packagist.org')); + $sourceRepo = new ComposerRepository(array('url' => 'http://packagist.org'), $this->getIO()); } elseif (".json" === substr($repositoryUrl, -5)) { $sourceRepo = new FilesystemRepository(new JsonFile($repositoryUrl, new RemoteFilesystem($io))); } elseif (0 === strpos($repositoryUrl, 'http')) { - $sourceRepo = new ComposerRepository(array('url' => $repositoryUrl)); + $sourceRepo = new ComposerRepository(array('url' => $repositoryUrl), $this->getIO()); } else { throw new \InvalidArgumentException("Invalid repository url given. Has to be a .json file or an http url."); } diff --git a/src/Composer/Command/InitCommand.php b/src/Composer/Command/InitCommand.php index cdd5c4e34..290898c7e 100644 --- a/src/Composer/Command/InitCommand.php +++ b/src/Composer/Command/InitCommand.php @@ -229,7 +229,7 @@ EOT if (!$this->repos) { $this->repos = new CompositeRepository(array( new PlatformRepository, - new ComposerRepository(array('url' => 'http://packagist.org')) + new ComposerRepository(array('url' => 'http://packagist.org'), $this->getIO()) )); } diff --git a/src/Composer/Command/SearchCommand.php b/src/Composer/Command/SearchCommand.php index 0a4779ea5..2a25dc66c 100644 --- a/src/Composer/Command/SearchCommand.php +++ b/src/Composer/Command/SearchCommand.php @@ -54,7 +54,8 @@ EOT } else { $output->writeln('No composer.json found in the current directory, showing packages from packagist.org'); $installedRepo = $platformRepo; - $repos = new CompositeRepository(array($installedRepo, new ComposerRepository(array('url' => 'http://packagist.org')))); + $packagist = new ComposerRepository(array('url' => 'http://packagist.org'), $this->getIO()); + $repos = new CompositeRepository(array($installedRepo, $packagist)); } $tokens = $input->getArgument('tokens'); diff --git a/src/Composer/Command/ShowCommand.php b/src/Composer/Command/ShowCommand.php index 042ff420b..167d34b30 100644 --- a/src/Composer/Command/ShowCommand.php +++ b/src/Composer/Command/ShowCommand.php @@ -65,7 +65,8 @@ EOT } else { $output->writeln('No composer.json found in the current directory, showing packages from packagist.org'); $installedRepo = $platformRepo; - $repos = new CompositeRepository(array($installedRepo, new ComposerRepository(array('url' => 'http://packagist.org')))); + $packagist = new ComposerRepository(array('url' => 'http://packagist.org'), $this->getIO()); + $repos = new CompositeRepository(array($installedRepo, $packagist)); } // show single package or single version