Simplify task feedback in install steps

Author: kylekatarnls

src/Jade/JadeSymfonyEngine.php

@@ -356,6 +356,16 @@ public function offsetUnset($name)
         unset($this->helpers[$name]);
     }
 
+    public static function proceedTask(&$flags, $io, $taskResult, $flag, $successMessage, $message)
+    {
+        if ($taskResult) {
+            $flags |= $flag;
+            $message = $successMessage;
+        }
+
+        $io->write($message);
+    }
+
     public static function install($event, $dir = null)
     {
         /** @var \Composer\Script\Event $event */
@@ -387,6 +397,10 @@ public static function install($event, $dir = null)
         $addConfig = $io->askConfirmation('Would you like us to add automatically needed settings in your config.yml? [Y/N] ');
         $addBundle = $io->askConfirmation('Would you like us to add automatically the pug bundle in your AppKernel.php? [Y/N] ');
 
+        $proceedTask = function ($taskResult, $flag, $successMessage, $errorMessage) use (&$flags, $io) {
+            static::proceedTask($flags, $io, $taskResult, $flag, $successMessage, $errorMessage);
+        };
+
         if ($addConfig) {
             $configFile = $dir . '/app/config/config.yml';
             $contents = @file_get_contents($configFile) ?: '';
@@ -397,12 +411,12 @@ public static function install($event, $dir = null)
                         $contents = preg_replace('/^framework\s*:/m', "services:\n\$0", $contents);
                     }
                     $contents = preg_replace('/^services\s*:/m', "\$0$service", $contents);
-                    if (file_put_contents($configFile, $contents)) {
-                        $flags |= static::CONFIG_OK;
-                        $io->write('Engine service added in config.yml');
-                    } else {
-                        $io->write('Unable to add the engine service in config.yml');
-                    }
+                    $proceedTask(
+                        file_put_contents($configFile, $contents),
+                        static::CONFIG_OK,
+                        'Engine service added in config.yml',
+                        'Unable to add the engine service in config.yml'
+                    );
                 } else {
                     $flags |= static::CONFIG_OK;
                     $io->write('templating.engine.pug setting in config.yml already exists.');
@@ -452,12 +466,12 @@ public static function install($event, $dir = null)
                 }
                 if ($proceeded) {
                     $contents = implode("\n", $lines);
-                    if (file_put_contents($configFile, $contents)) {
-                        $flags |= static::ENGINE_OK;
-                        $io->write('Engine added to framework.templating.engines in config.yml');
-                    } else {
-                        $io->write('Unable to add the templating engine in framework.templating.engines in config.yml');
-                    }
+                    $proceedTask(
+                        file_put_contents($configFile, $contents),
+                        static::ENGINE_OK,
+                        'Engine added to framework.templating.engines in config.yml',
+                        'Unable to add the templating engine in framework.templating.engines in config.yml'
+                    );
                 }
             } else {
                 $io->write('framework entry not found in config.yml.');
@@ -473,12 +487,12 @@ public static function install($event, $dir = null)
             if (preg_match('/^[ \\t]*new\\s+Symfony\\\\Bundle\\\\FrameworkBundle\\\\FrameworkBundle\\(\\)/m', $contents)) {
                 if (strpos($contents, $bundle) === false) {
                     $contents = preg_replace('/^([ \\t]*)new\\s+Symfony\\\\Bundle\\\\FrameworkBundle\\\\FrameworkBundle\\(\\)/m', "\$0,\n\$1$bundle", $contents);
-                    if (file_put_contents($appFile, $contents)) {
-                        $flags |= static::KERNEL_OK;
-                        $io->write('Bundle added to AppKernel.php');
-                    } else {
-                        $io->write('Unable to add the bundle engine in AppKernel.php');
-                    }
+                    $proceedTask(
+                        file_put_contents($appFile, $contents),
+                        static::KERNEL_OK,
+                        'Bundle added to AppKernel.php',
+                        'Unable to add the bundle engine in AppKernel.php'
+                    );
                 } else {
                     $flags |= static::KERNEL_OK;
                     $io->write('The bundle already exists in AppKernel.php');

tests/Pug/PugSymfonyBundle/Command/AssetsPublishCommandTest.php

@@ -2,11 +2,20 @@
 
 namespace Pug\Tests\PugSymfonyBundle\Command;
 
+use Jade\JadeSymfonyEngine;
 use Pug\PugSymfonyBundle\Command\AssetsPublishCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 
+class BadEngine extends JadeSymfonyEngine
+{
+    public function getEngine()
+    {
+        return (object) array();
+    }
+}
+
 class AssetsPublishCommandTest extends KernelTestCase
 {
     public function setUp()
@@ -48,4 +57,22 @@ public function testCommand()
         $this->assertRegExp('/(Unknown\sfilter\supper|upper:\sFilter\sdoes\s?n[\'o]t\sexists)/', $output, 'filter.pug fails as the upper filter does not exists.');
         $this->assertContains('filter.pug', $output, 'filter.pug fails as the upper filter does not exists.');
     }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Allowed pug engine are Jade\Jade, Pug\Pug or Phug\Renderer, stdClass given.
+     */
+    public function testCommandException()
+    {
+        $application = new Application(self::$kernel);
+        self::$kernel->getContainer()->set('templating.engine.pug', new BadEngine(self::$kernel));
+        $application->add(new AssetsPublishCommand());
+
+        $command = $application->find('assets:publish');
+        $commandTester = new CommandTester($command);
+        $commandTester->execute([
+            'command'  => $command->getName(),
+            '--env'    => 'prod',
+        ]);
+    }
 }