From 1c7016de456b836c7670145336a83b216cf87d23 Mon Sep 17 00:00:00 2001 From: Rob Bast Date: Tue, 13 Oct 2015 12:37:15 +0200 Subject: [PATCH] remove dead code/class --- .../DependencyResolver/DebugSolver.php | 83 ------------------- src/Composer/DependencyResolver/Pool.php | 5 -- src/Composer/DependencyResolver/Solver.php | 7 -- 3 files changed, 95 deletions(-) delete mode 100644 src/Composer/DependencyResolver/DebugSolver.php diff --git a/src/Composer/DependencyResolver/DebugSolver.php b/src/Composer/DependencyResolver/DebugSolver.php deleted file mode 100644 index d02679e8c..000000000 --- a/src/Composer/DependencyResolver/DebugSolver.php +++ /dev/null @@ -1,83 +0,0 @@ - - * Jordi Boggiano - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Composer\DependencyResolver; - -/** - * @author Nils Adermann - */ -class DebugSolver extends Solver -{ - protected function printDecisionMap() - { - echo "\nDecisionMap: \n"; - foreach ($this->decisionMap as $packageId => $level) { - if ($packageId === 0) { - continue; - } - if ($level > 0) { - echo ' +' . $this->pool->packageById($packageId)."\n"; - } elseif ($level < 0) { - echo ' -' . $this->pool->packageById($packageId)."\n"; - } else { - echo ' ?' . $this->pool->packageById($packageId)."\n"; - } - } - echo "\n"; - } - - protected function printDecisionQueue() - { - echo "DecisionQueue: \n"; - foreach ($this->decisionQueue as $i => $literal) { - echo ' ' . $this->pool->literalToString($literal) . ' ' . $this->decisionQueueWhy[$i]." level ".$this->decisionMap[abs($literal)]."\n"; - } - echo "\n"; - } - - protected function printWatches() - { - echo "\nWatches:\n"; - foreach ($this->watches as $literalId => $watch) { - echo ' '.$this->literalFromId($literalId)."\n"; - $queue = array(array(' ', $watch)); - - while (!empty($queue)) { - list($indent, $watch) = array_pop($queue); - - echo $indent.$watch; - - if ($watch) { - echo ' [id='.$watch->getId().',watch1='.$this->literalFromId($watch->watch1).',watch2='.$this->literalFromId($watch->watch2)."]"; - } - - echo "\n"; - - if ($watch && ($watch->next1 == $watch || $watch->next2 == $watch)) { - if ($watch->next1 == $watch) { - echo $indent." 1 *RECURSION*"; - } - if ($watch->next2 == $watch) { - echo $indent." 2 *RECURSION*"; - } - } elseif ($watch && ($watch->next1 || $watch->next2)) { - $indent = str_replace(array('1', '2'), ' ', $indent); - - array_push($queue, array($indent.' 2 ', $watch->next2)); - array_push($queue, array($indent.' 1 ', $watch->next1)); - } - } - - echo "\n"; - } - } -} diff --git a/src/Composer/DependencyResolver/Pool.php b/src/Composer/DependencyResolver/Pool.php index 96e46c531..1a7da84a2 100644 --- a/src/Composer/DependencyResolver/Pool.php +++ b/src/Composer/DependencyResolver/Pool.php @@ -278,11 +278,6 @@ class Pool implements \Countable return $this->packageById($packageId); } - public function literalToString($literal) - { - return ($literal > 0 ? '+' : '-') . $this->literalToPackage($literal); - } - public function literalToPrettyString($literal, $installedMap) { $package = $this->literalToPackage($literal); diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index 712e1b5cd..5f7f7e54c 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -235,13 +235,6 @@ class Solver return $transaction->getOperations(); } - protected function literalFromId($id) - { - $package = $this->pool->packageById(abs($id)); - - return new Literal($package, $id > 0); - } - /** * Makes a decision and propagates it to all rules. *