From 44369472be5f54b9a1f04c36a34d68639b4793d9 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 22 Oct 2011 16:48:23 +0200
Subject: [PATCH] Define the calculation of package priorities in a single
 method

---
 src/Composer/DependencyResolver/DefaultPolicy.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Composer/DependencyResolver/DefaultPolicy.php b/src/Composer/DependencyResolver/DefaultPolicy.php
index 783082808..b6447223b 100644
--- a/src/Composer/DependencyResolver/DefaultPolicy.php
+++ b/src/Composer/DependencyResolver/DefaultPolicy.php
@@ -63,6 +63,11 @@ class DefaultPolicy implements PolicyInterface
         return true;
     }
 
+    public function getPriority(Pool $pool, PackageInterface $package)
+    {
+        return $pool->getPriority($package->getRepository());
+    }
+
     public function selectPreferedPackages(Pool $pool, RepositoryInterface $installed, array $literals)
     {
         $packages = $this->groupLiteralsByNamePreferInstalled($installed, $literals);
@@ -119,7 +124,7 @@ class DefaultPolicy implements PolicyInterface
             return 1;
         }
 
-        return ($pool->getPriority($a->getRepository()) > $pool->getPriority($b->getRepository())) ? -1 : 1;
+        return ($this->getPriority($pool, $a) > $this->getPriority($pool, $b)) ? -1 : 1;
     }
 
     protected function pruneToBestVersion($literals)
@@ -169,18 +174,18 @@ class DefaultPolicy implements PolicyInterface
         $priority = null;
 
         foreach ($literals as $literal) {
-            $repo = $literal->getPackage()->getRepository();
+            $package = $literal->getPackage();
 
-            if ($repo === $installed) {
+            if ($package->getRepository() === $installed) {
                 $selected[] = $literal;
                 continue;
             }
 
             if (null === $priority) {
-                $priority = $pool->getPriority($repo);
+                $priority = $this->getPriority($pool, $package);
             }
 
-            if ($pool->getPriority($repo) != $priority) {
+            if ($this->getPriority($pool, $package) != $priority) {
                 break;
             }