public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #5210 from Seldaek/fix_partial_updates_from_dirty_state 

Fix partial updates from a dirty state and apply exactly the locked state
pull/5224/head
Jordi Boggiano 2016-04-19 20:07:52 +01:00
parent 47ea9d8ddc de5bfcb4c5
commit 11daebcb3a
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Installer.php
View File

@ -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;
}

4
tests/Composer/Test/Fixtures/installer/partial-update-downgrades-non-whitelisted-unstable.test
View File

@ -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)

29
tests/Composer/Test/Fixtures/installer/partial-update-from-lock.test
View File

@ -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)