Ver código fonte

Add color to lock operations and dry run output

Jordi Boggiano 5 anos atrás
pai
commit
8930f1b824

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

@@ -61,7 +61,7 @@ class InstallOperation extends SolverOperation
      */
     public function show($lock)
     {
-        return ($lock ? 'Locking ' : 'Installing ').$this->package->getPrettyName().' ('.$this->package->getFullPrettyVersion().')';
+        return ($lock ? 'Locking ' : 'Installing ').'<info>'.$this->package->getPrettyName().'</info> (<comment>'.$this->package->getFullPrettyVersion().'</comment>)';
     }
 
     /**

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

@@ -62,7 +62,7 @@ class MarkAliasInstalledOperation extends SolverOperation
      */
     public function show($lock)
     {
-        return 'Marking '.$this->package->getPrettyName().' ('.$this->package->getFullPrettyVersion().') as installed, alias of '.$this->package->getAliasOf()->getPrettyName().' ('.$this->package->getAliasOf()->getFullPrettyVersion().')';
+        return 'Marking <info>'.$this->package->getPrettyName().'</info> (<comment>'.$this->package->getFullPrettyVersion().'</comment>) as installed, alias of <info>'.$this->package->getAliasOf()->getPrettyName().'</info> (<comment>'.$this->package->getAliasOf()->getFullPrettyVersion().'</comment>)';
     }
 
     /**

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

@@ -62,7 +62,7 @@ class MarkAliasUninstalledOperation extends SolverOperation
      */
     public function show($lock)
     {
-        return 'Marking '.$this->package->getPrettyName().' ('.$this->package->getFullPrettyVersion().') as uninstalled, alias of '.$this->package->getAliasOf()->getPrettyName().' ('.$this->package->getAliasOf()->getFullPrettyVersion().')';
+        return 'Marking <info>'.$this->package->getPrettyName().'</info> (<comment>'.$this->package->getFullPrettyVersion().'</comment>) as uninstalled, alias of <info>'.$this->package->getAliasOf()->getPrettyName().'</info> (<comment>'.$this->package->getAliasOf()->getFullPrettyVersion().'</comment>)';
     }
 
     /**

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

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

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

@@ -88,7 +88,7 @@ class UpdateOperation extends SolverOperation
 
         $actionName = VersionParser::isUpgrade($this->initialPackage->getVersion(), $this->targetPackage->getVersion()) ? 'Upgrading' : 'Downgrading';
 
-        return $actionName.' '.$this->initialPackage->getPrettyName().' ('.$fromVersion.' => '.$toVersion.')';
+        return $actionName.' <info>'.$this->initialPackage->getPrettyName().'</info> (<comment>'.$fromVersion.'</comment> => <comment>'.$toVersion.'</comment>)';
     }
 
     /**

+ 5 - 5
tests/Composer/Test/Mock/InstallationManagerMock.php

@@ -57,14 +57,14 @@ class InstallationManagerMock extends InstallationManager
     public function install(RepositoryInterface $repo, InstallOperation $operation)
     {
         $this->installed[] = $operation->getPackage();
-        $this->trace[] = (string) $operation;
+        $this->trace[] = strip_tags((string) $operation);
         $repo->addPackage(clone $operation->getPackage());
     }
 
     public function update(RepositoryInterface $repo, UpdateOperation $operation)
     {
         $this->updated[] = array($operation->getInitialPackage(), $operation->getTargetPackage());
-        $this->trace[] = (string) $operation;
+        $this->trace[] = strip_tags((string) $operation);
         $repo->removePackage($operation->getInitialPackage());
         $repo->addPackage(clone $operation->getTargetPackage());
     }
@@ -72,7 +72,7 @@ class InstallationManagerMock extends InstallationManager
     public function uninstall(RepositoryInterface $repo, UninstallOperation $operation)
     {
         $this->uninstalled[] = $operation->getPackage();
-        $this->trace[] = (string) $operation;
+        $this->trace[] = strip_tags((string) $operation);
         $repo->removePackage($operation->getPackage());
     }
 
@@ -81,7 +81,7 @@ class InstallationManagerMock extends InstallationManager
         $package = $operation->getPackage();
 
         $this->installed[] = $package;
-        $this->trace[] = (string) $operation;
+        $this->trace[] = strip_tags((string) $operation);
 
         parent::markAliasInstalled($repo, $operation);
     }
@@ -89,7 +89,7 @@ class InstallationManagerMock extends InstallationManager
     public function markAliasUninstalled(RepositoryInterface $repo, MarkAliasUninstalledOperation $operation)
     {
         $this->uninstalled[] = $operation->getPackage();
-        $this->trace[] = (string) $operation;
+        $this->trace[] = strip_tags((string) $operation);
 
         parent::markAliasUninstalled($repo, $operation);
     }