From fb69ef64c5311ca4a3a59a0bfe4e82f4d7f50e67 Mon Sep 17 00:00:00 2001 From: Volker Dusch Date: Sat, 18 Feb 2012 12:44:52 +0100 Subject: [PATCH] Fix Solver function visibility to reflect what acutally should be the public interface --- src/Composer/DependencyResolver/.Solver.php.swp | Bin 0 -> 94208 bytes src/Composer/DependencyResolver/Solver.php | 16 ++++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 src/Composer/DependencyResolver/.Solver.php.swp diff --git a/src/Composer/DependencyResolver/.Solver.php.swp b/src/Composer/DependencyResolver/.Solver.php.swp new file mode 100644 index 0000000000000000000000000000000000000000..91ad3e7d858fd419561b0834bbd41e8b882fc820 GIT binary patch literal 94208 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 Apa1{> literal 0 HcmV?d00001 diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index b865aa82e..eea6621e6 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -77,7 +77,7 @@ class Solver * that goes with the reason * @return Rule The generated rule or null if tautological */ - public function createRequireRule(PackageInterface $package, array $providers, $reason, $reasonData = null) + protected function createRequireRule(PackageInterface $package, array $providers, $reason, $reasonData = null) { $literals = array(new Literal($package, false)); @@ -128,7 +128,7 @@ class Solver * goes with the reason * @return Rule The generated rule */ - public function createInstallRule(PackageInterface $package, $reason, $reasonData = null) + protected function createInstallRule(PackageInterface $package, $reason, $reasonData = null) { return new Rule(new Literal($package, true)); } @@ -146,7 +146,7 @@ class Solver * the reason * @return Rule The generated rule */ - public function createInstallOneOfRule(array $packages, $reason, $reasonData = null) + protected function createInstallOneOfRule(array $packages, $reason, $reasonData = null) { if (empty($packages)) { return $this->createImpossibleRule($reason, $reasonData); @@ -172,7 +172,7 @@ class Solver * goes with the reason * @return Rule The generated rule */ - public function createRemoveRule(PackageInterface $package, $reason, $reasonData = null) + protected function createRemoveRule(PackageInterface $package, $reason, $reasonData = null) { return new Rule(array(new Literal($package, false)), $reason, $reasonData); } @@ -191,7 +191,7 @@ class Solver * goes with the reason * @return Rule The generated rule */ - public function createConflictRule(PackageInterface $issuer, PackageInterface $provider, $reason, $reasonData = null) + protected function createConflictRule(PackageInterface $issuer, PackageInterface $provider, $reason, $reasonData = null) { // ignore self conflict if ($issuer === $provider) { @@ -212,7 +212,7 @@ class Solver * the reason * @return Rule An empty rule */ - public function createImpossibleRule($reason, $reasonData = null) + protected function createImpossibleRule($reason, $reasonData = null) { return new Rule(array(), $reason, $reasonData); } @@ -237,7 +237,7 @@ class Solver } } - public function addRulesForPackage(PackageInterface $package) + protected function addRulesForPackage(PackageInterface $package) { $workQueue = new \SplQueue; $workQueue->enqueue($package); @@ -571,7 +571,7 @@ class Solver } } - public function addChoiceRules() + protected function addChoiceRules() { // void