Selaa lähdekoodia

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

Jordi Boggiano 5 vuotta sitten
vanhempi
commit
73a5cc63cc

+ 1 - 1
src/Composer/DependencyResolver/Operation/UninstallOperation.php

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

+ 1 - 1
tests/Composer/Test/Fixtures/installer/install-from-lock-removes-package.test

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

+ 1 - 1
tests/Composer/Test/Fixtures/installer/update-no-dev-still-resolves-dev.test

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

+ 2 - 2
tests/Composer/Test/Fixtures/installer/update-removes-unused-locked-dep.test

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

+ 1 - 1
tests/Composer/Test/Fixtures/installer/update-to-empty-from-locked.test

@@ -44,5 +44,5 @@ update
     "platform-dev": []
 }
 --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)

+ 1 - 1
tests/Composer/Test/Fixtures/installer/update-whitelist-removes-unused.test

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

+ 1 - 1
tests/Composer/Test/Fixtures/installer/updating-dev-from-lock-removes-old-deps.test

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