From edf948454bcf5e5f5b6724e34c0a390a9b9bace7 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 17 Jan 2012 22:39:36 +0100 Subject: [PATCH] Remove IO from Solver, debug methods don't need it --- src/Composer/Command/InstallCommand.php | 2 +- src/Composer/DependencyResolver/Solver.php | 24 +++++++++------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/Composer/Command/InstallCommand.php b/src/Composer/Command/InstallCommand.php index 086108698..bf8bca726 100644 --- a/src/Composer/Command/InstallCommand.php +++ b/src/Composer/Command/InstallCommand.php @@ -123,7 +123,7 @@ EOT // prepare solver $installationManager = $composer->getInstallationManager(); $policy = new DependencyResolver\DefaultPolicy(); - $solver = new DependencyResolver\Solver($policy, $pool, $installedRepo, $this->getApplication()->getIO()); + $solver = new DependencyResolver\Solver($policy, $pool, $installedRepo); // solve dependencies $operations = $solver->solve($request); diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index 9afb231fa..567df0273 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -12,7 +12,6 @@ namespace Composer\DependencyResolver; -use Composer\IO\IOInterface; use Composer\Repository\RepositoryInterface; use Composer\Package\PackageInterface; use Composer\DependencyResolver\Operation; @@ -56,15 +55,12 @@ class Solver protected $packageToUpdateRule = array(); protected $packageToFeatureRule = array(); - protected $io; - - public function __construct(PolicyInterface $policy, Pool $pool, RepositoryInterface $installed, IOInterface $io) + public function __construct(PolicyInterface $policy, Pool $pool, RepositoryInterface $installed) { $this->policy = $policy; $this->pool = $pool; $this->installed = $installed; $this->rules = new RuleSet; - $this->io = $io; } /** @@ -2048,28 +2044,28 @@ class Solver } } - public function printDecisionMap() + private function printDecisionMap() { - $this->io->writeln("\nDecisionMap: "); + echo "\nDecisionMap: \n"; foreach ($this->decisionMap as $packageId => $level) { if ($packageId === 0) { continue; } if ($level > 0) { - $this->io->writeln(' +' . $this->pool->packageById($packageId)); + echo ' +' . $this->pool->packageById($packageId)."\n"; } else { - $this->io->writeln(' -' . $this->pool->packageById($packageId)); + echo ' -' . $this->pool->packageById($packageId)."\n"; } } - $this->io->writeln(''); + echo "\n"; } - public function printDecisionQueue() + private function printDecisionQueue() { - $this->io->writeln("DecisionQueue: "); + echo "DecisionQueue: \n"; foreach ($this->decisionQueue as $i => $literal) { - $this->io->writeln(' ' . $literal . ' ' . $this->decisionQueueWhy[$i]); + echo ' ' . $literal . ' ' . $this->decisionQueueWhy[$i]."\n"; } - $this->io->writeln(''); + echo "\n"; } }