CS fix and add text styles

humbug · Jun 19, 2017 · 4bf01d7 · 4bf01d7
1 parent 2616041
commit 4bf01d7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/Console/Command/SelfUpdateCommand.php b/src/Console/Command/SelfUpdateCommand.php
@@ -131,6 +131,7 @@ private function updateToStableBuild()
     private function getStableUpdater(): Updater
     {
         $this->updater->setStrategy(Updater::STRATEGY_GITHUB);
+
         return $this->getGithubReleasesUpdater($updater);
     }
 
@@ -208,13 +209,15 @@ private function printVersion(Updater $updater)
 
     /**
      * @param Updater $updater
+     * 
      * @return Updater
      */
     private function getGithubReleasesUpdater(Updater $updater): Updater
     {
         $this->updater->getStrategy()->setPackageName(self::PACKAGIST_PACKAGE_NAME);
         $this->updater->getStrategy()->setPharName(self::REMOTE_FILENAME);
         $this->updater->getStrategy()->setCurrentLocalVersion($this->version);
+
         return $updater;
     }
 

diff --git a/src/Logger/UpdateConsoleLogger.php b/src/Logger/UpdateConsoleLogger.php
@@ -15,8 +15,6 @@
 namespace Humbug\PhpScoper\Logger;
 
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Output\NullOutput;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
@@ -50,11 +48,11 @@ public function updateSuccess(string $newVersion, string $oldVersion)
     {
         $this->io->writeln('PHP-Scoper has been updated.');
         $this->io->writeln(sprintf(
-            'Current version is: %s.',
+            'Current version is: <comment>%s</comment>.',
             $newVersion
         ));
         $this->io->writeln(sprintf(
-            'Previous version was: %s.',
+            'Previous version was: <comment>%s</comment>.',
             $oldVersion
         ));
     }
@@ -63,14 +61,17 @@ public function updateNotNeeded(string $oldVersion)
     {
         $this->io->writeln('PHP-Scoper is currently up to date.');
         $this->io->writeln(sprintf(
-            'Current version is: %s.',
+            'Current version is: <comment>%s</comment>.',
             $oldVersion
         ));
     }
 
     public function error(\Exception $e)
     {
-        $this->io->writeln(sprintf('Error: %s', $e->getMessage()));
+        $this->io->writeln(
+            '<error>Unexpected error. If updating, your original phar is untouched.</error>'
+        );
+        $this->io->writeln(sprintf('<error>%s</error>', $e->getMessage()));
     }
 
     public function rollbackSuccess()
@@ -86,27 +87,27 @@ public function rollbackFail()
     public function printLocalVersion(string $version)
     {
         $this->io->writeln(sprintf(
-            'Your current local version is: %s',
+            'Your current local version is: <comment>%s</comment>',
             $version
         ));
     }
 
     public function printRemoteVersion(string $stability, string $version)
     {
         $this->io->writeln(sprintf(
-            'The current %s build available remotely is: %s',
+            'The current <comment>%s</comment> build available remotely is: <comment>%s</comment>',
             $stability,
             $version
         ));
     }
 
     public function noNewRemoteVersions(string $stability)
     {
-        $this->io->writeln(sprintf('There are no new %s builds available.', $stability));
+        $this->io->writeln(sprintf('There are no new <comment>%s</comment> builds available.', $stability));
     }
 
     public function currentVersionInstalled(string $stability)
     {
-        $this->io->writeln(sprintf('You have the current %s build installed.', $stability));
+        $this->io->writeln(sprintf('You have the current <comment>%s</comment> build installed.', $stability));
     }
 }