From e3a23f4ae6c12a2ac52719f41e2d986d38db0acd Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Tue, 10 Jul 2018 20:49:24 +0200 Subject: [PATCH 1/3] Remove unnecessary abs() calls Literal cannot be negative at this point --- src/Composer/DependencyResolver/Solver.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index 862411c61..0b8e983ed 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -796,10 +796,10 @@ class Solver continue 2; // next rule } } else { - if ($this->decisions->decidedInstall(abs($literal))) { + if ($this->decisions->decidedInstall($literal)) { continue 2; // next rule } - if ($this->decisions->undecided(abs($literal))) { + if ($this->decisions->undecided($literal)) { $decisionQueue[] = $literal; } } From 0e16dbabde469752c2f9db8ce086aa9c762d6693 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Tue, 10 Jul 2018 20:55:14 +0200 Subject: [PATCH 2/3] Removed another unnecessary abs() call --- src/Composer/DependencyResolver/Solver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index 0b8e983ed..6716de7d3 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -792,7 +792,7 @@ class Solver // foreach ($literals as $literal) { if ($literal <= 0) { - if (!$this->decisions->decidedInstall(abs($literal))) { + if (!$this->decisions->decidedInstall($literal)) { continue 2; // next rule } } else { From 42516901f1b0592119daa3fbb41a40c24f0338f1 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Tue, 10 Jul 2018 20:59:39 +0200 Subject: [PATCH 3/3] Removed another unnecessary abs() call --- src/Composer/DependencyResolver/Solver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index 6716de7d3..2139e2bf6 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -100,7 +100,7 @@ class Solver $literals = $rule->getLiterals(); $literal = $literals[0]; - if (!$this->decisions->decided(abs($literal))) { + if (!$this->decisions->decided($literal)) { $this->decisions->decide($literal, 1, $rule); continue; }