From de5bfcb4c5dde1ada321b2a3d3f6b33228ac5810 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Mon, 18 Apr 2016 23:33:04 +0100
Subject: [PATCH] Fix partial updates from a dirty state and apply exactly the
 locked state, fixes #3468

---
 src/Composer/Installer.php                    |  2 +-
 ...e-downgrades-non-whitelisted-unstable.test |  4 ++-
 .../installer/partial-update-from-lock.test   | 29 +++++++++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php
index e1f0011e0..2616eaa5b 100644
--- a/src/Composer/Installer.php
+++ b/src/Composer/Installer.php
@@ -450,7 +450,7 @@ class Installer
                     $candidates[$link->getTarget()] = true;
                     $rootRequires[$link->getTarget()] = $link;
                 }
-                foreach ($localRepo->getPackages() as $package) {
+                foreach ($currentPackages as $package) {
                     $candidates[$package->getName()] = true;
                 }
 
diff --git a/tests/Composer/Test/Fixtures/installer/partial-update-downgrades-non-whitelisted-unstable.test b/tests/Composer/Test/Fixtures/installer/partial-update-downgrades-non-whitelisted-unstable.test
index 4473940bc..9b8d32f06 100644
--- a/tests/Composer/Test/Fixtures/installer/partial-update-downgrades-non-whitelisted-unstable.test
+++ b/tests/Composer/Test/Fixtures/installer/partial-update-downgrades-non-whitelisted-unstable.test
@@ -53,7 +53,8 @@ update c/uptodate
     "packages": [
         { "name": "a/old", "version": "1.0.0", "type": "library" },
         { "name": "b/unstable", "version": "1.0.0", "type": "library" },
-        { "name": "c/uptodate", "version": "2.0.0", "type": "library" }
+        { "name": "c/uptodate", "version": "2.0.0", "type": "library" },
+        { "name": "d/removed", "version": "1.0.0", "type": "library" }
     ],
     "packages-dev": [],
     "aliases": [],
@@ -67,3 +68,4 @@ update c/uptodate
 --EXPECT--
 Updating b/unstable (1.1.0-alpha) to b/unstable (1.0.0)
 Updating a/old (0.9.0) to a/old (1.0.0)
+Installing d/removed (1.0.0)
diff --git a/tests/Composer/Test/Fixtures/installer/partial-update-from-lock.test b/tests/Composer/Test/Fixtures/installer/partial-update-from-lock.test
index 9623b51cf..ed2002e4e 100644
--- a/tests/Composer/Test/Fixtures/installer/partial-update-from-lock.test
+++ b/tests/Composer/Test/Fixtures/installer/partial-update-from-lock.test
@@ -8,10 +8,13 @@ Partial update from lock file should update everything to the state of the lock,
             "package": [
                 { "name": "a/old", "version": "1.0.0" },
                 { "name": "a/old", "version": "2.0.0" },
-                { "name": "b/unstable", "version": "1.0.0" },
-                { "name": "b/unstable", "version": "1.1.0-alpha" },
+                { "name": "b/unstable", "version": "1.0.0", "require": {"f/dependency": "1.*"} },
+                { "name": "b/unstable", "version": "1.1.0-alpha", "require": {"f/dependency": "1.*"} },
                 { "name": "c/uptodate", "version": "1.0.0" },
-                { "name": "d/removed", "version": "1.0.0" }
+                { "name": "d/removed", "version": "1.0.0" },
+                { "name": "e/newreq", "version": "1.0.0" },
+                { "name": "f/dependency", "version": "1.1.0" },
+                { "name": "f/dependency", "version": "1.0.0" }
             ]
         }
     ],
@@ -25,9 +28,11 @@ Partial update from lock file should update everything to the state of the lock,
 {
     "packages": [
         { "name": "a/old", "version": "1.0.0" },
-        { "name": "b/unstable", "version": "1.1.0-alpha" },
+        { "name": "b/unstable", "version": "1.1.0-alpha", "require": {"f/dependency": "1.*"} },
         { "name": "c/uptodate", "version": "1.0.0" },
-        { "name": "d/removed", "version": "1.0.0" }
+        { "name": "d/removed", "version": "1.0.0" },
+        { "name": "e/newreq", "version": "1.0.0" },
+        { "name": "f/dependency", "version": "1.0.0" }
     ],
     "packages-dev": [],
     "aliases": [],
@@ -43,8 +48,9 @@ Partial update from lock file should update everything to the state of the lock,
 --INSTALLED--
 [
     { "name": "a/old", "version": "0.9.0" },
-    { "name": "b/unstable", "version": "1.1.0-alpha" },
-    { "name": "c/uptodate", "version": "2.0.0" }
+    { "name": "b/unstable", "version": "1.1.0-alpha", "require": {"f/dependency": "1.*"} },
+    { "name": "c/uptodate", "version": "2.0.0" },
+    { "name": "f/dependency", "version": "1.0.0" }
 ]
 --RUN--
 update b/unstable
@@ -52,8 +58,11 @@ update b/unstable
 {
     "packages": [
         { "name": "a/old", "version": "1.0.0", "type": "library" },
-        { "name": "b/unstable", "version": "1.0.0", "type": "library" },
-        { "name": "c/uptodate", "version": "1.0.0", "type": "library" }
+        { "name": "b/unstable", "version": "1.0.0", "type": "library", "require": {"f/dependency": "1.*"} },
+        { "name": "c/uptodate", "version": "1.0.0", "type": "library" },
+        { "name": "d/removed", "version": "1.0.0", "type": "library" },
+        { "name": "e/newreq", "version": "1.0.0", "type": "library" },
+        { "name": "f/dependency", "version": "1.0.0", "type": "library" }
     ],
     "packages-dev": [],
     "aliases": [],
@@ -68,3 +77,5 @@ update b/unstable
 Updating b/unstable (1.1.0-alpha) to b/unstable (1.0.0)
 Updating a/old (0.9.0) to a/old (1.0.0)
 Updating c/uptodate (2.0.0) to c/uptodate (1.0.0)
+Installing d/removed (1.0.0)
+Installing e/newreq (1.0.0)