From 438c45e991f9009afbd5896dd67a3c9ec19d5bb4 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 14 Nov 2019 15:40:59 +0100 Subject: [PATCH] Change UpdateOperation::show to match what the installers output, fixes the dry-run output to be more like real output --- .../DependencyResolver/Operation/UpdateOperation.php | 3 +-- .../Test/Fixtures/installer/github-issues-4795-2.test | 8 ++++---- .../installer/install-from-lock-removes-package.test | 2 +- ...artial-update-downgrades-non-whitelisted-unstable.test | 6 +++--- ...-dev-reference-from-lock-for-non-updated-packages.test | 4 ++-- .../Test/Fixtures/installer/partial-update-from-lock.test | 6 +++--- .../partial-update-installs-from-lock-even-missing.test | 4 ++-- .../root-requirements-do-not-affect-locked-versions.test | 2 +- .../Test/Fixtures/installer/update-alias-lock.test | 2 +- tests/Composer/Test/Fixtures/installer/update-alias.test | 4 ++-- .../Test/Fixtures/installer/update-all-dry-run.test | 4 ++-- tests/Composer/Test/Fixtures/installer/update-all.test | 4 ++-- .../Test/Fixtures/installer/update-changes-url.test | 4 ++-- .../Fixtures/installer/update-dev-ignores-providers.test | 2 +- .../installer/update-dev-packages-updates-repo-url.test | 2 +- .../installer/update-dev-to-new-ref-picks-up-changes.test | 2 +- .../installer/update-downgrades-unstable-packages.test | 2 +- .../update-ignore-platform-package-requirements.test | 2 +- .../installer/update-no-dev-still-resolves-dev.test | 4 ++-- .../Fixtures/installer/update-prefer-lowest-stable.test | 4 ++-- .../Test/Fixtures/installer/update-reference.test | 2 +- .../installer/update-whitelist-locked-require.test | 4 ++-- .../update-whitelist-patterns-with-all-dependencies.test | 6 +++--- .../update-whitelist-patterns-with-dependencies.test | 6 +++--- .../update-whitelist-patterns-with-root-dependencies.test | 6 +++--- .../update-whitelist-patterns-without-dependencies.test | 4 ++-- .../Fixtures/installer/update-whitelist-patterns.test | 8 ++++---- .../Fixtures/installer/update-whitelist-reads-lock.test | 4 ++-- .../installer/update-whitelist-removes-unused.test | 2 +- .../installer/update-whitelist-with-dependencies.test | 4 ++-- .../Test/Fixtures/installer/update-whitelist.test | 2 +- .../Fixtures/installer/update-with-all-dependencies.test | 8 ++++---- .../updating-dev-from-lock-removes-old-deps.test | 2 +- .../installer/updating-dev-updates-url-and-reference.test | 2 +- 34 files changed, 65 insertions(+), 66 deletions(-) diff --git a/src/Composer/DependencyResolver/Operation/UpdateOperation.php b/src/Composer/DependencyResolver/Operation/UpdateOperation.php index aecde33c2..a1aec4413 100644 --- a/src/Composer/DependencyResolver/Operation/UpdateOperation.php +++ b/src/Composer/DependencyResolver/Operation/UpdateOperation.php @@ -74,8 +74,7 @@ class UpdateOperation extends SolverOperation */ public function show($lock) { - return 'Updating '.$this->initialPackage->getPrettyName().' ('.$this->formatVersion($this->initialPackage).') to '. - $this->targetPackage->getPrettyName(). ' ('.$this->formatVersion($this->targetPackage).')'; + return 'Updating '.$this->initialPackage->getPrettyName().' ('.$this->formatVersion($this->initialPackage).' => '.$this->formatVersion($this->targetPackage).')'; } /** diff --git a/tests/Composer/Test/Fixtures/installer/github-issues-4795-2.test b/tests/Composer/Test/Fixtures/installer/github-issues-4795-2.test index e7730cefc..454215ee0 100644 --- a/tests/Composer/Test/Fixtures/installer/github-issues-4795-2.test +++ b/tests/Composer/Test/Fixtures/installer/github-issues-4795-2.test @@ -55,13 +55,13 @@ update a/a b/b --with-dependencies Loading composer repositories with package information Updating dependencies Lock file operations: 0 installs, 2 updates, 0 removals - - Updating a/a (1.0.0) to a/a (1.1.0) - - Updating b/b (1.0.0) to b/b (1.1.0) + - Updating a/a (1.0.0 => 1.1.0) + - Updating b/b (1.0.0 => 1.1.0) Writing lock file Installing dependencies from lock file (including require-dev) Package operations: 0 installs, 2 updates, 0 removals Generating autoload files --EXPECT-- -Updating a/a (1.0.0) to a/a (1.1.0) -Updating b/b (1.0.0) to b/b (1.1.0) +Updating a/a (1.0.0 => 1.1.0) +Updating b/b (1.0.0 => 1.1.0) diff --git a/tests/Composer/Test/Fixtures/installer/install-from-lock-removes-package.test b/tests/Composer/Test/Fixtures/installer/install-from-lock-removes-package.test index 83569bfe7..7e7f0dfb5 100644 --- a/tests/Composer/Test/Fixtures/installer/install-from-lock-removes-package.test +++ b/tests/Composer/Test/Fixtures/installer/install-from-lock-removes-package.test @@ -41,4 +41,4 @@ Install from a lock file that deleted a package install --EXPECT-- Uninstalling old-dependency (1.0.0) -Updating whitelisted (1.0.0) to whitelisted (1.1.0) +Updating whitelisted (1.0.0 => 1.1.0) 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 add46b848..d87df634c 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 @@ -66,7 +66,7 @@ update c/uptodate "platform-dev": [] } --EXPECT-- -Updating a/old (0.9.0) to a/old (1.0.0) -Updating b/unstable (1.1.0-alpha) to b/unstable (1.0.0) -Updating c/uptodate (2.0.0) to c/uptodate (1.0.0) +Updating a/old (0.9.0 => 1.0.0) +Updating b/unstable (1.1.0-alpha => 1.0.0) +Updating c/uptodate (2.0.0 => 1.0.0) Installing d/removed (1.0.0) diff --git a/tests/Composer/Test/Fixtures/installer/partial-update-forces-dev-reference-from-lock-for-non-updated-packages.test b/tests/Composer/Test/Fixtures/installer/partial-update-forces-dev-reference-from-lock-for-non-updated-packages.test index 4533d5a94..d3da18878 100644 --- a/tests/Composer/Test/Fixtures/installer/partial-update-forces-dev-reference-from-lock-for-non-updated-packages.test +++ b/tests/Composer/Test/Fixtures/installer/partial-update-forces-dev-reference-from-lock-for-non-updated-packages.test @@ -93,5 +93,5 @@ update b/b "platform-dev": [] } --EXPECT-- -Updating a/a (dev-master oldmaster-a) to a/a (dev-master newmaster-a) -Updating b/b (dev-master oldmaster-b) to b/b (dev-master newmaster-b2) +Updating a/a (dev-master oldmaster-a => dev-master newmaster-a) +Updating b/b (dev-master oldmaster-b => dev-master newmaster-b2) 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 f49f23dfd..faffbead0 100644 --- a/tests/Composer/Test/Fixtures/installer/partial-update-from-lock.test +++ b/tests/Composer/Test/Fixtures/installer/partial-update-from-lock.test @@ -74,8 +74,8 @@ update b/unstable "platform-dev": [] } --EXPECT-- -Updating a/old (0.9.0) to a/old (1.0.0) -Updating b/unstable (1.1.0-alpha) to b/unstable (1.0.0) -Updating c/uptodate (2.0.0) to c/uptodate (1.0.0) +Updating a/old (0.9.0 => 1.0.0) +Updating b/unstable (1.1.0-alpha => 1.0.0) +Updating c/uptodate (2.0.0 => 1.0.0) Installing d/removed (1.0.0) Installing e/newreq (1.0.0) diff --git a/tests/Composer/Test/Fixtures/installer/partial-update-installs-from-lock-even-missing.test b/tests/Composer/Test/Fixtures/installer/partial-update-installs-from-lock-even-missing.test index ea4a7c997..b21905e07 100644 --- a/tests/Composer/Test/Fixtures/installer/partial-update-installs-from-lock-even-missing.test +++ b/tests/Composer/Test/Fixtures/installer/partial-update-installs-from-lock-even-missing.test @@ -97,9 +97,9 @@ update b/b "platform-dev": [] } --EXPECT-- -Updating a/a (dev-master oldmaster-a) to a/a (dev-master newmaster-a) +Updating a/a (dev-master oldmaster-a => dev-master newmaster-a) Marking a/a (2.2.x-dev newmaster-a) as installed, alias of a/a (dev-master newmaster-a) -Updating b/b (dev-master oldmaster-b) to b/b (dev-master newmaster-b2) +Updating b/b (dev-master oldmaster-b => dev-master newmaster-b2) Marking b/b (2.3.x-dev newmaster-b2) as installed, alias of b/b (dev-master newmaster-b2) Marking a/a (2.1.x-dev oldmaster-a) as uninstalled, alias of a/a (dev-master oldmaster-a) Marking b/b (2.1.x-dev oldmaster-b) as uninstalled, alias of b/b (dev-master oldmaster-b) diff --git a/tests/Composer/Test/Fixtures/installer/root-requirements-do-not-affect-locked-versions.test b/tests/Composer/Test/Fixtures/installer/root-requirements-do-not-affect-locked-versions.test index 8868cbe13..1895992f6 100644 --- a/tests/Composer/Test/Fixtures/installer/root-requirements-do-not-affect-locked-versions.test +++ b/tests/Composer/Test/Fixtures/installer/root-requirements-do-not-affect-locked-versions.test @@ -38,4 +38,4 @@ The locked version will not get overwritten by an install --RUN-- install --EXPECT-- -Updating foo/baz (1.0.0) to foo/baz (2.0.0) +Updating foo/baz (1.0.0 => 2.0.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-alias-lock.test b/tests/Composer/Test/Fixtures/installer/update-alias-lock.test index da4faeed8..1018fc678 100644 --- a/tests/Composer/Test/Fixtures/installer/update-alias-lock.test +++ b/tests/Composer/Test/Fixtures/installer/update-alias-lock.test @@ -59,4 +59,4 @@ update "platform-dev": [] } --EXPECT-- -Updating a/a (dev-master 1234) to a/a (dev-master master) +Updating a/a (dev-master 1234 => dev-master master) diff --git a/tests/Composer/Test/Fixtures/installer/update-alias.test b/tests/Composer/Test/Fixtures/installer/update-alias.test index c1020e33c..6a7e434c8 100644 --- a/tests/Composer/Test/Fixtures/installer/update-alias.test +++ b/tests/Composer/Test/Fixtures/installer/update-alias.test @@ -33,5 +33,5 @@ Update aliased package to non-aliased version --RUN-- update --EXPECT-- -Updating a/a (dev-master master) to a/a (dev-foo foo) -Marking a/a (1.0.x-dev master) as uninstalled, alias of a/a (dev-master master) \ No newline at end of file +Updating a/a (dev-master master => dev-foo foo) +Marking a/a (1.0.x-dev master) as uninstalled, alias of a/a (dev-master master) diff --git a/tests/Composer/Test/Fixtures/installer/update-all-dry-run.test b/tests/Composer/Test/Fixtures/installer/update-all-dry-run.test index af8e9771a..f3484d93b 100644 --- a/tests/Composer/Test/Fixtures/installer/update-all-dry-run.test +++ b/tests/Composer/Test/Fixtures/installer/update-all-dry-run.test @@ -44,6 +44,6 @@ Lock file operations: 3 installs, 0 updates, 0 removals - Locking a/c (1.0.0) Installing dependencies from lock file (including require-dev) Package operations: 0 installs, 2 updates, 0 removals - - Updating a/a (1.0.0) to a/a (1.0.1) - - Updating a/b (1.0.0) to a/b (2.0.0) + - Updating a/a (1.0.0 => 1.0.1) + - Updating a/b (1.0.0 => 2.0.0) --EXPECT-- diff --git a/tests/Composer/Test/Fixtures/installer/update-all.test b/tests/Composer/Test/Fixtures/installer/update-all.test index a9bb435a1..9a5fe8e9d 100644 --- a/tests/Composer/Test/Fixtures/installer/update-all.test +++ b/tests/Composer/Test/Fixtures/installer/update-all.test @@ -36,5 +36,5 @@ Updates updateable packages --RUN-- update --EXPECT-- -Updating a/a (1.0.0) to a/a (1.0.1) -Updating a/b (1.0.0) to a/b (2.0.0) +Updating a/a (1.0.0 => 1.0.1) +Updating a/b (1.0.0 => 2.0.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-changes-url.test b/tests/Composer/Test/Fixtures/installer/update-changes-url.test index 3df99678c..bfecf37b8 100644 --- a/tests/Composer/Test/Fixtures/installer/update-changes-url.test +++ b/tests/Composer/Test/Fixtures/installer/update-changes-url.test @@ -214,6 +214,6 @@ g/g is dev and installed in a different ref than the #ref, so it gets updated an --RUN-- update a/a b/b d/d g/g --EXPECT-- -Updating a/a (dev-master 1111111) to a/a (dev-master 2222222) +Updating a/a (dev-master 1111111 => dev-master 2222222) Installing e/e (dev-master 1111111) -Updating g/g (dev-master 0000000) to g/g (dev-master 1111111) +Updating g/g (dev-master 0000000 => dev-master 1111111) diff --git a/tests/Composer/Test/Fixtures/installer/update-dev-ignores-providers.test b/tests/Composer/Test/Fixtures/installer/update-dev-ignores-providers.test index e0858e054..a1ae85a88 100644 --- a/tests/Composer/Test/Fixtures/installer/update-dev-ignores-providers.test +++ b/tests/Composer/Test/Fixtures/installer/update-dev-ignores-providers.test @@ -35,4 +35,4 @@ Updating a dev package selects its newest version but no providers --RUN-- update --EXPECT-- -Updating a/installed (dev-master oldref) to a/installed (dev-master newref) +Updating a/installed (dev-master oldref => dev-master newref) diff --git a/tests/Composer/Test/Fixtures/installer/update-dev-packages-updates-repo-url.test b/tests/Composer/Test/Fixtures/installer/update-dev-packages-updates-repo-url.test index f91a67cea..7faef167c 100644 --- a/tests/Composer/Test/Fixtures/installer/update-dev-packages-updates-repo-url.test +++ b/tests/Composer/Test/Fixtures/installer/update-dev-packages-updates-repo-url.test @@ -93,4 +93,4 @@ update "platform-dev": [] } --EXPECT-- -Updating a/a (dev-master oldmaster) to a/a (dev-master newmaster) +Updating a/a (dev-master oldmaster => dev-master newmaster) diff --git a/tests/Composer/Test/Fixtures/installer/update-dev-to-new-ref-picks-up-changes.test b/tests/Composer/Test/Fixtures/installer/update-dev-to-new-ref-picks-up-changes.test index fa2146345..c84385e64 100644 --- a/tests/Composer/Test/Fixtures/installer/update-dev-to-new-ref-picks-up-changes.test +++ b/tests/Composer/Test/Fixtures/installer/update-dev-to-new-ref-picks-up-changes.test @@ -38,4 +38,4 @@ Updating a dev package to its latest ref should pick up new dependencies update --EXPECT-- Installing a/dependency (dev-master ref) -Updating a/devpackage (dev-master oldref) to a/devpackage (dev-master newref) +Updating a/devpackage (dev-master oldref => dev-master newref) diff --git a/tests/Composer/Test/Fixtures/installer/update-downgrades-unstable-packages.test b/tests/Composer/Test/Fixtures/installer/update-downgrades-unstable-packages.test index 1b6e55ef9..f418cd33d 100644 --- a/tests/Composer/Test/Fixtures/installer/update-downgrades-unstable-packages.test +++ b/tests/Composer/Test/Fixtures/installer/update-downgrades-unstable-packages.test @@ -46,4 +46,4 @@ Downgrading from unstable to more stable package should work even if already ins --RUN-- update --EXPECT-- -Updating a/a (dev-master abcd) to a/a (1.0.0) +Updating a/a (dev-master abcd => 1.0.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-ignore-platform-package-requirements.test b/tests/Composer/Test/Fixtures/installer/update-ignore-platform-package-requirements.test index 02f94cd6e..b12dae58b 100644 --- a/tests/Composer/Test/Fixtures/installer/update-ignore-platform-package-requirements.test +++ b/tests/Composer/Test/Fixtures/installer/update-ignore-platform-package-requirements.test @@ -23,4 +23,4 @@ Update in ignore-platform-reqs mode --RUN-- update --ignore-platform-reqs --EXPECT-- -Updating a/a (1.0.0) to a/a (1.0.1) +Updating a/a (1.0.0 => 1.0.1) diff --git a/tests/Composer/Test/Fixtures/installer/update-no-dev-still-resolves-dev.test b/tests/Composer/Test/Fixtures/installer/update-no-dev-still-resolves-dev.test index fad73f20a..17d16df6d 100644 --- a/tests/Composer/Test/Fixtures/installer/update-no-dev-still-resolves-dev.test +++ b/tests/Composer/Test/Fixtures/installer/update-no-dev-still-resolves-dev.test @@ -61,8 +61,8 @@ Updates with --no-dev but we still end up with a complete lock file including de update --no-dev --EXPECT-- Uninstalling a/b (1.0.0) -Updating a/a (1.0.0) to a/a (1.0.1) +Updating a/a (1.0.0 => 1.0.1) Installing a/c (1.0.0) -Updating dev/pkg (dev-master old) to dev/pkg (dev-master new) +Updating dev/pkg (dev-master old => dev-master new) Marking dev/pkg (1.1.x-dev new) as installed, alias of dev/pkg (dev-master new) Marking dev/pkg (1.0.x-dev old) as uninstalled, alias of dev/pkg (dev-master old) diff --git a/tests/Composer/Test/Fixtures/installer/update-prefer-lowest-stable.test b/tests/Composer/Test/Fixtures/installer/update-prefer-lowest-stable.test index 00efd5688..cd3988a9e 100644 --- a/tests/Composer/Test/Fixtures/installer/update-prefer-lowest-stable.test +++ b/tests/Composer/Test/Fixtures/installer/update-prefer-lowest-stable.test @@ -36,5 +36,5 @@ Updates packages to their lowest stable version --RUN-- update --prefer-lowest --prefer-stable --EXPECT-- -Updating a/a (1.0.0-rc1) to a/a (1.0.1) -Updating a/b (1.0.1) to a/b (1.0.0) +Updating a/a (1.0.0-rc1 => 1.0.1) +Updating a/b (1.0.1 => 1.0.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-reference.test b/tests/Composer/Test/Fixtures/installer/update-reference.test index 9dca245ee..01ba528fe 100644 --- a/tests/Composer/Test/Fixtures/installer/update-reference.test +++ b/tests/Composer/Test/Fixtures/installer/update-reference.test @@ -27,4 +27,4 @@ Updates a dev package forcing it's reference --RUN-- install --EXPECT-- -Updating a/a (dev-master abc123) to a/a (dev-master def000) +Updating a/a (dev-master abc123 => dev-master def000) diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-locked-require.test b/tests/Composer/Test/Fixtures/installer/update-whitelist-locked-require.test index c3b20426e..aaa29cd6e 100644 --- a/tests/Composer/Test/Fixtures/installer/update-whitelist-locked-require.test +++ b/tests/Composer/Test/Fixtures/installer/update-whitelist-locked-require.test @@ -49,5 +49,5 @@ Update with a package whitelist only updates those packages if they are not pres --RUN-- update whitelisted dependency --EXPECT-- -Updating dependency (1.0.0) to dependency (1.1.0) -Updating whitelisted (1.0.0) to whitelisted (1.1.0) +Updating dependency (1.0.0 => 1.1.0) +Updating whitelisted (1.0.0 => 1.1.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-all-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-all-dependencies.test index b3396b376..a76937e43 100644 --- a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-all-dependencies.test +++ b/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-all-dependencies.test @@ -60,6 +60,6 @@ Update with a package whitelist pattern and all-dependencies flag updates packag --RUN-- update whitelisted-* --with-all-dependencies --EXPECT-- -Updating whitelisted-component1 (1.0.0) to whitelisted-component1 (1.1.0) -Updating dependency (1.0.0) to dependency (1.1.0) -Updating whitelisted-component2 (1.0.0) to whitelisted-component2 (1.1.0) +Updating whitelisted-component1 (1.0.0 => 1.1.0) +Updating dependency (1.0.0 => 1.1.0) +Updating whitelisted-component2 (1.0.0 => 1.1.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-dependencies.test index aee2310ac..3cd619d22 100644 --- a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-dependencies.test +++ b/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-dependencies.test @@ -62,6 +62,6 @@ Update with a package whitelist only updates those packages and their dependenci --RUN-- update whitelisted-* --with-dependencies --EXPECT-- -Updating whitelisted-component1 (1.0.0) to whitelisted-component1 (1.1.0) -Updating dependency (1.0.0) to dependency (1.1.0) -Updating whitelisted-component2 (1.0.0) to whitelisted-component2 (1.1.0) +Updating whitelisted-component1 (1.0.0 => 1.1.0) +Updating dependency (1.0.0 => 1.1.0) +Updating whitelisted-component2 (1.0.0 => 1.1.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-root-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-root-dependencies.test index fe0cb1e31..c4e879df8 100644 --- a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-root-dependencies.test +++ b/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-root-dependencies.test @@ -72,6 +72,6 @@ Update with a package whitelist only updates those packages and their dependenci --RUN-- update whitelisted-* --with-dependencies --EXPECT-- -Updating dependency (1.0.0) to dependency (1.1.0) -Updating whitelisted-component2 (1.0.0) to whitelisted-component2 (1.1.0) -Updating whitelisted-component1 (1.0.0) to whitelisted-component1 (1.1.0) +Updating dependency (1.0.0 => 1.1.0) +Updating whitelisted-component2 (1.0.0 => 1.1.0) +Updating whitelisted-component1 (1.0.0 => 1.1.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-without-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-without-dependencies.test index ac07f23fd..eafec1403 100644 --- a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-without-dependencies.test +++ b/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-without-dependencies.test @@ -57,5 +57,5 @@ Update with a package whitelist only updates those packages matching the pattern --RUN-- update whitelisted-* --EXPECT-- -Updating whitelisted-component1 (1.0.0) to whitelisted-component1 (1.1.0) -Updating whitelisted-component2 (1.0.0) to whitelisted-component2 (1.1.0) +Updating whitelisted-component1 (1.0.0 => 1.1.0) +Updating whitelisted-component2 (1.0.0 => 1.1.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns.test b/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns.test index d1b4fd66d..54da86c8e 100644 --- a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns.test +++ b/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns.test @@ -63,7 +63,7 @@ Update with a package whitelist only updates those corresponding to the pattern --RUN-- update vendor/Test* exact/Test-Package notexact/Test all/* no/reg?xp --EXPECT-- -Updating all/Package1 (1.0) to all/Package1 (2.0) -Updating all/Package2 (1.0) to all/Package2 (2.0) -Updating exact/Test-Package (1.0) to exact/Test-Package (2.0) -Updating vendor/Test-Package (1.0) to vendor/Test-Package (2.0) +Updating all/Package1 (1.0 => 2.0) +Updating all/Package2 (1.0 => 2.0) +Updating exact/Test-Package (1.0 => 2.0) +Updating vendor/Test-Package (1.0 => 2.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-reads-lock.test b/tests/Composer/Test/Fixtures/installer/update-whitelist-reads-lock.test index 552051565..1c2a68a10 100644 --- a/tests/Composer/Test/Fixtures/installer/update-whitelist-reads-lock.test +++ b/tests/Composer/Test/Fixtures/installer/update-whitelist-reads-lock.test @@ -43,6 +43,6 @@ Limited update takes rules from lock if available, and not from the installed re --RUN-- update toupdate/installed --EXPECT-- -Updating old/installed (0.9.0) to old/installed (1.0.0) -Updating toupdate/installed (1.0.0) to toupdate/installed (1.1.0) +Updating old/installed (0.9.0 => 1.0.0) +Updating toupdate/installed (1.0.0 => 1.1.0) Installing toupdate/notinstalled (1.0.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-removes-unused.test b/tests/Composer/Test/Fixtures/installer/update-whitelist-removes-unused.test index 3b28e4671..93829c808 100644 --- a/tests/Composer/Test/Fixtures/installer/update-whitelist-removes-unused.test +++ b/tests/Composer/Test/Fixtures/installer/update-whitelist-removes-unused.test @@ -45,4 +45,4 @@ Update with a package whitelist removes unused packages update --with-dependencies whitelisted --EXPECT-- Uninstalling old-dependency (1.0.0) -Updating whitelisted (1.0.0) to whitelisted (1.1.0) +Updating whitelisted (1.0.0 => 1.1.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-with-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-whitelist-with-dependencies.test index 73acfa516..2db3b6ead 100644 --- a/tests/Composer/Test/Fixtures/installer/update-whitelist-with-dependencies.test +++ b/tests/Composer/Test/Fixtures/installer/update-whitelist-with-dependencies.test @@ -52,5 +52,5 @@ Update with a package whitelist only updates those packages and their dependenci --RUN-- update whitelisted --with-dependencies --EXPECT-- -Updating dependency (1.0.0) to dependency (1.1.0) -Updating whitelisted (1.0.0) to whitelisted (1.1.0) +Updating dependency (1.0.0 => 1.1.0) +Updating whitelisted (1.0.0 => 1.1.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist.test b/tests/Composer/Test/Fixtures/installer/update-whitelist.test index b53954dc6..4dfb95a93 100644 --- a/tests/Composer/Test/Fixtures/installer/update-whitelist.test +++ b/tests/Composer/Test/Fixtures/installer/update-whitelist.test @@ -54,4 +54,4 @@ Update with a package whitelist only updates those packages listed as command ar --RUN-- update whitelisted --EXPECT-- -Updating whitelisted (1.0.0) to whitelisted (1.1.0) +Updating whitelisted (1.0.0 => 1.1.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test index 8a72cec66..f761abe38 100644 --- a/tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test +++ b/tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test @@ -50,13 +50,13 @@ update b/b --with-all-dependencies Loading composer repositories with package information Updating dependencies Lock file operations: 0 installs, 2 updates, 0 removals - - Updating a/a (1.0.0) to a/a (1.1.0) - - Updating b/b (1.0.0) to b/b (1.1.0) + - Updating a/a (1.0.0 => 1.1.0) + - Updating b/b (1.0.0 => 1.1.0) Writing lock file Installing dependencies from lock file (including require-dev) Package operations: 0 installs, 2 updates, 0 removals Generating autoload files --EXPECT-- -Updating a/a (1.0.0) to a/a (1.1.0) -Updating b/b (1.0.0) to b/b (1.1.0) +Updating a/a (1.0.0 => 1.1.0) +Updating b/b (1.0.0 => 1.1.0) diff --git a/tests/Composer/Test/Fixtures/installer/updating-dev-from-lock-removes-old-deps.test b/tests/Composer/Test/Fixtures/installer/updating-dev-from-lock-removes-old-deps.test index 6575530d0..e9f6d825a 100644 --- a/tests/Composer/Test/Fixtures/installer/updating-dev-from-lock-removes-old-deps.test +++ b/tests/Composer/Test/Fixtures/installer/updating-dev-from-lock-removes-old-deps.test @@ -42,4 +42,4 @@ Installing locked dev packages should remove old dependencies install --EXPECT-- Uninstalling a/dependency (dev-master ref) -Updating a/devpackage (dev-master oldref) to a/devpackage (dev-master newref) +Updating a/devpackage (dev-master oldref => dev-master newref) diff --git a/tests/Composer/Test/Fixtures/installer/updating-dev-updates-url-and-reference.test b/tests/Composer/Test/Fixtures/installer/updating-dev-updates-url-and-reference.test index 06870c4ee..f3aa1816e 100644 --- a/tests/Composer/Test/Fixtures/installer/updating-dev-updates-url-and-reference.test +++ b/tests/Composer/Test/Fixtures/installer/updating-dev-updates-url-and-reference.test @@ -65,4 +65,4 @@ update "platform-dev": [] } --EXPECT-- -Updating a/a (dev-master oldref) to a/a (dev-master newref) +Updating a/a (dev-master oldref => dev-master newref)