From 49414a9790d239ac44a2c37d00dee112fc658b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draic=20Brady?= Date: Sun, 2 Mar 2014 17:43:31 +0000 Subject: [PATCH] Remove InputInterface passing from previous commits - no longer necessary with IOInterface update --- src/Composer/Command/Command.php | 4 ++-- src/Composer/Console/Application.php | 4 ++-- src/Composer/Factory.php | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Composer/Command/Command.php b/src/Composer/Command/Command.php index fb8c8c814..56690d987 100644 --- a/src/Composer/Command/Command.php +++ b/src/Composer/Command/Command.php @@ -43,13 +43,13 @@ abstract class Command extends BaseCommand * @throws \RuntimeException * @return Composer */ - public function getComposer($required = true, $disablePlugins = false, InputInterface $input = null) + public function getComposer($required = true, $disablePlugins = false) { if (null === $this->composer) { $application = $this->getApplication(); if ($application instanceof Application) { /* @var $application Application */ - $this->composer = $application->getComposer($required, $disablePlugins, $input); + $this->composer = $application->getComposer($required, $disablePlugins); } elseif ($required) { throw new \RuntimeException( 'Could not create a Composer\Composer instance, you must inject '. diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php index 32cbe8c6d..9d622cf67 100644 --- a/src/Composer/Console/Application.php +++ b/src/Composer/Console/Application.php @@ -169,11 +169,11 @@ class Application extends BaseApplication * @throws JsonValidationException * @return \Composer\Composer */ - public function getComposer($required = true, $disablePlugins = false, InputInterface $input = null) + public function getComposer($required = true, $disablePlugins = false) { if (null === $this->composer) { try { - $this->composer = Factory::create($this->io, null, $disablePlugins, $input); + $this->composer = Factory::create($this->io, null, $disablePlugins); } catch (\InvalidArgumentException $e) { if ($required) { $this->io->write($e->getMessage()); diff --git a/src/Composer/Factory.php b/src/Composer/Factory.php index 69a40a60a..818808a72 100644 --- a/src/Composer/Factory.php +++ b/src/Composer/Factory.php @@ -185,7 +185,7 @@ class Factory * @throws \UnexpectedValueException * @return Composer */ - public function createComposer(IOInterface $io, $localConfig = null, $disablePlugins = false, InputInterface $input = null) + public function createComposer(IOInterface $io, $localConfig = null, $disablePlugins = false) { // load Composer configuration if (null === $localConfig) { @@ -444,11 +444,11 @@ class Factory * @param bool $disablePlugins Whether plugins should not be loaded * @return Composer */ - public static function create(IOInterface $io, $config = null, $disablePlugins = false, InputInterface $input = null) + public static function create(IOInterface $io, $config = null, $disablePlugins = false) { $factory = new static(); - return $factory->createComposer($io, $config, $disablePlugins, $input); + return $factory->createComposer($io, $config, $disablePlugins); } /**