bake command return error if account sprinkle is not included - Fix #944

Author: lcharette

CHANGELOG.md

@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [v4.3.0]
+
+### Changed Requirements
+- Changed minimum PHP Version to 7.1
+
+### Added
+- Separated `BakeCommand` class into multiple methods to make it easier for sprinkle to add custom command to the `bake` command.
+
+### Fix
+- `bake` command return error if account sprinkle is not included ([#944])
+
+### Changed
+- Account sprinkle now extend the Core `BakeCommand` class to add the `create-admin` to the general bake command. Any sprinkle already extending the Core `BakeCommand` might need adjustments.
+
+
 ## [v4.2.2]
 
 ### Added

app/defines.php

@@ -11,7 +11,7 @@
 namespace UserFrosting;
 
 // Some standard defines
-define('UserFrosting\VERSION', '4.2.2');
+define('UserFrosting\VERSION', '4.3.0-dev');
 define('UserFrosting\DS', '/');
 define('UserFrosting\PHP_MIN_VERSION', '5.6');
 define('UserFrosting\PHP_RECOMMENDED_VERSION', '7.2');

app/sprinkles/account/src/Bakery/BakeCommand.php

@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @copyright Copyright (c) 2019 Alexander Weissman
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
+ */
+
+namespace UserFrosting\Sprinkle\Account\Bakery;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use UserFrosting\Sprinkle\Core\Bakery\BakeCommand as CoreBakeCommand;
+
+/**
+ * Bake command extension.
+ * Adding Account provided `create-admin` to the bake command
+ */
+class BakeCommand extends CoreBakeCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function executeConfiguration(InputInterface $input, OutputInterface $output)
+    {
+        parent::executeConfiguration($input, $output);
+
+        $command = $this->getApplication()->find('create-admin');
+        $command->run($input, $output);
+    }
+}

app/sprinkles/core/src/Bakery/BakeCommand.php

@@ -52,24 +52,72 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->io->writeln("<info>{$this->title}</info>");
 
+        $this->executeSetup($input, $output);
+        $this->executeDebug($input, $output);
+        $this->executeConfiguration($input, $output);
+        $this->executeAsset($input, $output);
+        $this->executeCleanup($input, $output);
+    }
+
+    /**
+     * Core setup group of task
+     *
+     * @param  InputInterface  $input
+     * @param  OutputInterface $output
+     */
+    protected function executeSetup(InputInterface $input, OutputInterface $output)
+    {
         $command = $this->getApplication()->find('setup:db');
         $command->run($input, $output);
 
         $command = $this->getApplication()->find('setup:smtp');
         $command->run($input, $output);
+    }
 
+    /**
+     * Debug group of task
+     *
+     * @param  InputInterface  $input
+     * @param  OutputInterface $output
+     */
+    protected function executeDebug(InputInterface $input, OutputInterface $output)
+    {
         $command = $this->getApplication()->find('debug');
         $command->run($input, $output);
+    }
 
+    /**
+     * Configuration group of task
+     *
+     * @param  InputInterface  $input
+     * @param  OutputInterface $output
+     */
+    protected function executeConfiguration(InputInterface $input, OutputInterface $output)
+    {
         $command = $this->getApplication()->find('migrate');
         $command->run($input, $output);
+    }
 
-        $command = $this->getApplication()->find('create-admin');
-        $command->run($input, $output);
-
+    /**
+     * Assets setup group of task
+     *
+     * @param  InputInterface  $input
+     * @param  OutputInterface $output
+     */
+    protected function executeAsset(InputInterface $input, OutputInterface $output)
+    {
         $command = $this->getApplication()->find('build-assets');
         $command->run($input, $output);
+    }
 
+    /**
+     * Cleanup group of task
+     *
+     * @param  InputInterface  $input
+     * @param  OutputInterface $output
+     */
+    protected function executeCleanup(InputInterface $input, OutputInterface $output)
+    {
         $command = $this->getApplication()->find('clear-cache');
         $command->run($input, $output);
     }