From 9609729de7ce39e206161e6512cf69de496d0107 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 11 Feb 2020 13:43:38 +0100 Subject: [PATCH] Change update to upgrade for package update operations which are upgrades, refs #8594 --- doc/01-basic-usage.md | 2 +- src/Composer/Command/SelfUpdateCommand.php | 2 +- .../DependencyResolver/Operation/UpdateOperation.php | 2 +- .../Test/Fixtures/installer/github-issues-4795-2.test | 8 ++++---- .../installer/install-from-lock-removes-package.test | 2 +- ...-dev-reference-from-lock-for-non-updated-packages.test | 4 ++-- .../Test/Fixtures/installer/partial-update-from-lock.test | 2 +- .../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 | 2 +- .../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 | 6 +++--- .../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 +- .../update-ignore-platform-package-requirements.test | 2 +- .../Fixtures/installer/update-installed-reference.test | 2 +- .../installer/update-no-dev-still-resolves-dev.test | 4 ++-- .../installer/update-picks-up-change-of-vcs-type.test | 2 +- .../Fixtures/installer/update-prefer-lowest-stable.test | 2 +- .../Fixtures/installer/update-reference-picks-latest.test | 2 +- .../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 +- 37 files changed, 63 insertions(+), 63 deletions(-) diff --git a/doc/01-basic-usage.md b/doc/01-basic-usage.md index e1faa6318..de511260d 100644 --- a/doc/01-basic-usage.md +++ b/doc/01-basic-usage.md @@ -159,7 +159,7 @@ php composer.phar update > if the `composer.lock` has not been updated since changes were made to the > `composer.json` that might affect dependency resolution. -If you only want to install or update one dependency, you can whitelist them: +If you only want to install, upgrade or remove one dependency, you can whitelist them: ```sh php composer.phar update monolog/monolog [...] diff --git a/src/Composer/Command/SelfUpdateCommand.php b/src/Composer/Command/SelfUpdateCommand.php index 9beb0b8c4..356523492 100644 --- a/src/Composer/Command/SelfUpdateCommand.php +++ b/src/Composer/Command/SelfUpdateCommand.php @@ -154,7 +154,7 @@ EOT $updatingToTag = !preg_match('{^[0-9a-f]{40}$}', $updateVersion); - $io->write(sprintf("Updating to version %s (%s channel).", $updateVersion, $versionsUtil->getChannel())); + $io->write(sprintf("Upgrading to version %s (%s channel).", $updateVersion, $versionsUtil->getChannel())); $remoteFilename = $baseUrl . ($updatingToTag ? "/download/{$updateVersion}/composer.phar" : '/composer.phar'); $signature = $httpDownloader->get($remoteFilename.'.sig')->getBody(); $io->writeError(' ', false); diff --git a/src/Composer/DependencyResolver/Operation/UpdateOperation.php b/src/Composer/DependencyResolver/Operation/UpdateOperation.php index 38ca6e330..61bcd7f5b 100644 --- a/src/Composer/DependencyResolver/Operation/UpdateOperation.php +++ b/src/Composer/DependencyResolver/Operation/UpdateOperation.php @@ -86,7 +86,7 @@ class UpdateOperation extends SolverOperation $toVersion = $this->targetPackage->getFullPrettyVersion(true, PackageInterface::DISPLAY_DIST_REF); } - $actionName = VersionParser::isUpgrade($this->initialPackage->getVersion(), $this->targetPackage->getVersion()) ? 'Updating' : 'Downgrading'; + $actionName = VersionParser::isUpgrade($this->initialPackage->getVersion(), $this->targetPackage->getVersion()) ? 'Upgrading' : 'Downgrading'; return $actionName.' '.$this->initialPackage->getPrettyName().' ('.$fromVersion.' => '.$toVersion.')'; } 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 454215ee0..b8968c35b 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 => 1.1.0) - - Updating b/b (1.0.0 => 1.1.0) + - Upgrading a/a (1.0.0 => 1.1.0) + - Upgrading 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 => 1.1.0) -Updating b/b (1.0.0 => 1.1.0) +Upgrading a/a (1.0.0 => 1.1.0) +Upgrading 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 7e7f0dfb5..d60cd7e94 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 => 1.1.0) +Upgrading whitelisted (1.0.0 => 1.1.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 d3da18878..f45f6d528 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 => dev-master newmaster-a) -Updating b/b (dev-master oldmaster-b => dev-master newmaster-b2) +Upgrading a/a (dev-master oldmaster-a => dev-master newmaster-a) +Upgrading 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 32018105d..bce29a21f 100644 --- a/tests/Composer/Test/Fixtures/installer/partial-update-from-lock.test +++ b/tests/Composer/Test/Fixtures/installer/partial-update-from-lock.test @@ -74,7 +74,7 @@ update b/unstable "platform-dev": [] } --EXPECT-- -Updating a/old (0.9.0 => 1.0.0) +Upgrading a/old (0.9.0 => 1.0.0) Downgrading b/unstable (1.1.0-alpha => 1.0.0) Downgrading c/uptodate (2.0.0 => 1.0.0) Installing d/removed (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 b21905e07..7530ca862 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 => dev-master newmaster-a) +Upgrading 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 => dev-master newmaster-b2) +Upgrading 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 1895992f6..202767c1f 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 => 2.0.0) +Upgrading 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 1018fc678..5aceda8ea 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 => dev-master master) +Upgrading 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 6a7e434c8..8da3d4d23 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 => dev-foo foo) +Upgrading 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 f3484d93b..3d93d23bd 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 => 1.0.1) - - Updating a/b (1.0.0 => 2.0.0) + - Upgrading a/a (1.0.0 => 1.0.1) + - Upgrading 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 9a5fe8e9d..893f9717c 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 => 1.0.1) -Updating a/b (1.0.0 => 2.0.0) +Upgrading a/a (1.0.0 => 1.0.1) +Upgrading 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 e9c703f41..8f6715769 100644 --- a/tests/Composer/Test/Fixtures/installer/update-changes-url.test +++ b/tests/Composer/Test/Fixtures/installer/update-changes-url.test @@ -214,7 +214,7 @@ 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 => dev-master 2222222) -Updating b/b (2.0.3 1111111 => 2.0.3 2222222) +Upgrading a/a (dev-master 1111111 => dev-master 2222222) +Upgrading b/b (2.0.3 1111111 => 2.0.3 2222222) Installing e/e (dev-master 1111111) -Updating g/g (dev-master 0000000 => dev-master 1111111) +Upgrading 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 a1ae85a88..68c02006d 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 => dev-master newref) +Upgrading 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 7faef167c..0a918b183 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 => dev-master newmaster) +Upgrading 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 c84385e64..12ad75586 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 => dev-master newref) +Upgrading a/devpackage (dev-master oldref => dev-master newref) 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 b12dae58b..30e0e6112 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 => 1.0.1) +Upgrading a/a (1.0.0 => 1.0.1) diff --git a/tests/Composer/Test/Fixtures/installer/update-installed-reference.test b/tests/Composer/Test/Fixtures/installer/update-installed-reference.test index 7c8df0459..ae0b2d537 100644 --- a/tests/Composer/Test/Fixtures/installer/update-installed-reference.test +++ b/tests/Composer/Test/Fixtures/installer/update-installed-reference.test @@ -28,4 +28,4 @@ Updating a dev package forcing it's reference should not do anything if the refe --RUN-- update --EXPECT-- -Updating a/a (dev-master def000 => dev-master ) +Upgrading a/a (dev-master def000 => dev-master ) 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 17d16df6d..f0c8282a1 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 => 1.0.1) +Upgrading a/a (1.0.0 => 1.0.1) Installing a/c (1.0.0) -Updating dev/pkg (dev-master old => dev-master new) +Upgrading 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-picks-up-change-of-vcs-type.test b/tests/Composer/Test/Fixtures/installer/update-picks-up-change-of-vcs-type.test index 18213d3b9..c1e746356 100644 --- a/tests/Composer/Test/Fixtures/installer/update-picks-up-change-of-vcs-type.test +++ b/tests/Composer/Test/Fixtures/installer/update-picks-up-change-of-vcs-type.test @@ -62,4 +62,4 @@ update mirrors "platform-dev": [] } --EXPECT-- -Updating a/a (1.0.0 old-hg-ref => 1.0.0 new-git-ref) +Upgrading a/a (1.0.0 old-hg-ref => 1.0.0 new-git-ref) 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 8cf5918e9..58935c8d7 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 => 1.0.1) +Upgrading a/a (1.0.0-rc1 => 1.0.1) Downgrading a/b (1.0.1 => 1.0.0) diff --git a/tests/Composer/Test/Fixtures/installer/update-reference-picks-latest.test b/tests/Composer/Test/Fixtures/installer/update-reference-picks-latest.test index 6b1f540bb..734315eb5 100644 --- a/tests/Composer/Test/Fixtures/installer/update-reference-picks-latest.test +++ b/tests/Composer/Test/Fixtures/installer/update-reference-picks-latest.test @@ -28,4 +28,4 @@ Updating a dev package should update to the latest available reference --RUN-- update --EXPECT-- -Updating a/a (dev-master def000 => dev-master abc123) +Upgrading a/a (dev-master def000 => dev-master abc123) diff --git a/tests/Composer/Test/Fixtures/installer/update-reference.test b/tests/Composer/Test/Fixtures/installer/update-reference.test index 01ba528fe..7836cbf5a 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 => dev-master def000) +Upgrading 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 aaa29cd6e..3fb16d52f 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 => 1.1.0) -Updating whitelisted (1.0.0 => 1.1.0) +Upgrading dependency (1.0.0 => 1.1.0) +Upgrading 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 a76937e43..cbf350f0b 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 => 1.1.0) -Updating dependency (1.0.0 => 1.1.0) -Updating whitelisted-component2 (1.0.0 => 1.1.0) +Upgrading whitelisted-component1 (1.0.0 => 1.1.0) +Upgrading dependency (1.0.0 => 1.1.0) +Upgrading 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 3cd619d22..68c1218c3 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 => 1.1.0) -Updating dependency (1.0.0 => 1.1.0) -Updating whitelisted-component2 (1.0.0 => 1.1.0) +Upgrading whitelisted-component1 (1.0.0 => 1.1.0) +Upgrading dependency (1.0.0 => 1.1.0) +Upgrading 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 c4e879df8..dab3d87e3 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 => 1.1.0) -Updating whitelisted-component2 (1.0.0 => 1.1.0) -Updating whitelisted-component1 (1.0.0 => 1.1.0) +Upgrading dependency (1.0.0 => 1.1.0) +Upgrading whitelisted-component2 (1.0.0 => 1.1.0) +Upgrading 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 eafec1403..337fe3a9b 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 => 1.1.0) -Updating whitelisted-component2 (1.0.0 => 1.1.0) +Upgrading whitelisted-component1 (1.0.0 => 1.1.0) +Upgrading 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 54da86c8e..8e4fd2034 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 => 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) +Upgrading all/Package1 (1.0 => 2.0) +Upgrading all/Package2 (1.0 => 2.0) +Upgrading exact/Test-Package (1.0 => 2.0) +Upgrading 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 1c2a68a10..ef7ca56c0 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 => 1.0.0) -Updating toupdate/installed (1.0.0 => 1.1.0) +Upgrading old/installed (0.9.0 => 1.0.0) +Upgrading 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 93829c808..7b720e3ca 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 => 1.1.0) +Upgrading 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 2db3b6ead..02e772337 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 => 1.1.0) -Updating whitelisted (1.0.0 => 1.1.0) +Upgrading dependency (1.0.0 => 1.1.0) +Upgrading 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 4dfb95a93..826f9fce1 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 => 1.1.0) +Upgrading 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 f761abe38..a950b247a 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 => 1.1.0) - - Updating b/b (1.0.0 => 1.1.0) + - Upgrading a/a (1.0.0 => 1.1.0) + - Upgrading 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 => 1.1.0) -Updating b/b (1.0.0 => 1.1.0) +Upgrading a/a (1.0.0 => 1.1.0) +Upgrading 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 e9f6d825a..5d2fc64c8 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 => dev-master newref) +Upgrading 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 f3aa1816e..c84ab3525 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 => dev-master newref) +Upgrading a/a (dev-master oldref => dev-master newref)