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

Always use Removing for consistency between dry-run and actual install

pull/8557/head
Jordi Boggiano 2020-03-12 08:12:12 +01:00
parent 9c84f4d79f
commit 73a5cc63cc
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/DependencyResolver/Operation/UninstallOperation.php
View File

@ -61,7 +61,7 @@ class UninstallOperation extends SolverOperation
*/ */
public function show($lock) public function show($lock)
{ {
return ($lock ? 'Removing ' : 'Uninstalling ').$this->package->getPrettyName().' ('.$this->package->getFullPrettyVersion().')'; return 'Removing '.$this->package->getPrettyName().' ('.$this->package->getFullPrettyVersion().')';
} }
/** /**

2
tests/Composer/Test/Fixtures/installer/install-from-lock-removes-package.test
View File

@ -40,5 +40,5 @@ Install from a lock file that deleted a package
--RUN-- --RUN--
install install
--EXPECT-- --EXPECT--
Uninstalling old/dependency (1.0.0) Removing old/dependency (1.0.0)
Upgrading whitelisted/pkg (1.0.0 => 1.1.0) Upgrading whitelisted/pkg (1.0.0 => 1.1.0)

2
tests/Composer/Test/Fixtures/installer/update-no-dev-still-resolves-dev.test
View File

@ -60,7 +60,7 @@ Updates with --no-dev but we still end up with a complete lock file including de
--RUN-- --RUN--
update --no-dev update --no-dev
--EXPECT-- --EXPECT--
Uninstalling a/b (1.0.0) Removing a/b (1.0.0)
Upgrading a/a (1.0.0 => 1.0.1) Upgrading a/a (1.0.0 => 1.0.1)
Installing a/c (1.0.0) Installing a/c (1.0.0)
Upgrading dev/pkg (dev-master old => dev-master new) Upgrading dev/pkg (dev-master old => dev-master new)

4
tests/Composer/Test/Fixtures/installer/update-removes-unused-locked-dep.test
View File

@ -63,5 +63,5 @@ Package operations: 0 installs, 0 updates, 2 removals
Generating autoload files Generating autoload files
--EXPECT-- --EXPECT--
Uninstalling c/c (1.0.0) Removing c/c (1.0.0)
Uninstalling b/b (1.0.0) Removing b/b (1.0.0)

2
tests/Composer/Test/Fixtures/installer/update-to-empty-from-locked.test
View File

@ -44,5 +44,5 @@ update
"platform-dev": [] "platform-dev": []
} }
--EXPECT-- --EXPECT--
Uninstalling a/a (dev-master 1234) Removing a/a (dev-master 1234)
Marking a/a (9999999-dev 1234) as uninstalled, alias of a/a (dev-master 1234) Marking a/a (9999999-dev 1234) as uninstalled, alias of a/a (dev-master 1234)

2
tests/Composer/Test/Fixtures/installer/update-whitelist-removes-unused.test
View File

@ -44,5 +44,5 @@ Update with a package whitelist removes unused packages
--RUN-- --RUN--
update --with-dependencies whitelisted/pkg update --with-dependencies whitelisted/pkg
--EXPECT-- --EXPECT--
Uninstalling old/dependency (1.0.0) Removing old/dependency (1.0.0)
Upgrading whitelisted/pkg (1.0.0 => 1.1.0) Upgrading whitelisted/pkg (1.0.0 => 1.1.0)

2
tests/Composer/Test/Fixtures/installer/updating-dev-from-lock-removes-old-deps.test
View File

@ -41,6 +41,6 @@ Installing locked dev packages should remove old dependencies
--RUN-- --RUN--
install install
--EXPECT-- --EXPECT--
Uninstalling a/dependency (dev-master ref) Removing a/dependency (dev-master ref)
Upgrading a/devpackage (dev-master oldref => dev-master newref) Upgrading a/devpackage (dev-master oldref => dev-master newref)
Marking a/dependency (9999999-dev ref) as uninstalled, alias of a/dependency (dev-master ref) Marking a/dependency (9999999-dev ref) as uninstalled, alias of a/dependency (dev-master ref)