From 5ba49f589bd52f55d9af44f885eebf31b0738dfb Mon Sep 17 00:00:00 2001 From: Jesus Manuel Olivas Date: Fri, 28 Jul 2017 01:02:06 -0700 Subject: [PATCH] [console] Extend base commands. (#212) --- src/Command/AboutCommand.php | 7 ++++--- src/Command/Chain/ChainCommand.php | 4 +--- src/Command/Chain/ChainCustomCommand.php | 4 +--- src/Command/CheckCommand.php | 6 +----- src/Command/CompleteCommand.php | 4 ---- src/Command/Debug/ChainCommand.php | 5 +---- src/Command/Debug/SettingsCommand.php | 5 +---- src/Command/Debug/SiteCommand.php | 5 +---- src/Command/DrushCommand.php | 4 ---- src/Command/Exclude/DrupliconCommand.php | 5 +---- src/Command/Exclude/ElephpantCommand.php | 5 +---- src/Command/Exec/ExecCommand.php | 5 +---- src/Command/HelpCommand.php | 4 ---- src/Command/InitCommand.php | 4 ---- src/Command/ListCommand.php | 4 ---- src/Command/Settings/SetCommand.php | 5 +---- 16 files changed, 14 insertions(+), 62 deletions(-) diff --git a/src/Command/AboutCommand.php b/src/Command/AboutCommand.php index e691eea..5a75e37 100644 --- a/src/Command/AboutCommand.php +++ b/src/Command/AboutCommand.php @@ -9,13 +9,14 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; +/** + * Class AboutCommand + * @package Drupal\Console\Core\Command + */ class AboutCommand extends Command { - use CommandTrait; /** * {@inheritdoc} diff --git a/src/Command/Chain/ChainCommand.php b/src/Command/Chain/ChainCommand.php index 5197d76..e867d36 100644 --- a/src/Command/Chain/ChainCommand.php +++ b/src/Command/Chain/ChainCommand.php @@ -13,14 +13,13 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Yaml\Parser; use Drupal\Console\Core\Utils\ChainQueue; use Drupal\Console\Core\Utils\ChainDiscovery; use Drupal\Console\Core\Command\Shared\InputTrait; use Drupal\Console\Core\Style\DrupalStyle; -use Drupal\Console\Core\Command\Shared\CommandTrait; /** * Class ChainCommand @@ -29,7 +28,6 @@ */ class ChainCommand extends Command { - use CommandTrait; use InputTrait; /** diff --git a/src/Command/Chain/ChainCustomCommand.php b/src/Command/Chain/ChainCustomCommand.php index 57eae71..caaec57 100644 --- a/src/Command/Chain/ChainCustomCommand.php +++ b/src/Command/Chain/ChainCustomCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Command\Shared\InputTrait; /** @@ -22,7 +21,6 @@ */ class ChainCustomCommand extends Command { - use CommandTrait; use InputTrait; /** diff --git a/src/Command/CheckCommand.php b/src/Command/CheckCommand.php index fcc3b62..262fe95 100644 --- a/src/Command/CheckCommand.php +++ b/src/Command/CheckCommand.php @@ -9,8 +9,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command as BaseCommand; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\ConfigurationManager; use Drupal\Console\Core\Utils\RequirementChecker; use Drupal\Console\Core\Utils\ChainQueue; @@ -21,10 +19,8 @@ * * @package Drupal\Console\Core\Command */ -class CheckCommand extends BaseCommand +class CheckCommand extends Command { - use CommandTrait; - /** * @var RequirementChecker */ diff --git a/src/Command/CompleteCommand.php b/src/Command/CompleteCommand.php index 521ec9c..44bf36e 100644 --- a/src/Command/CompleteCommand.php +++ b/src/Command/CompleteCommand.php @@ -9,13 +9,9 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; class CompleteCommand extends Command { - use CommandTrait; - /** * {@inheritdoc} */ diff --git a/src/Command/Debug/ChainCommand.php b/src/Command/Debug/ChainCommand.php index 0fb26c1..51281ca 100644 --- a/src/Command/Debug/ChainCommand.php +++ b/src/Command/Debug/ChainCommand.php @@ -9,10 +9,9 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Utils\ChainDiscovery; use Drupal\Console\Core\Style\DrupalStyle; -use Drupal\Console\Core\Command\Shared\CommandTrait; /** * Class ChainCommand @@ -21,8 +20,6 @@ */ class ChainCommand extends Command { - use CommandTrait; - /** * @var ChainDiscovery */ diff --git a/src/Command/Debug/SettingsCommand.php b/src/Command/Debug/SettingsCommand.php index 5c56bfc..9e6dfeb 100644 --- a/src/Command/Debug/SettingsCommand.php +++ b/src/Command/Debug/SettingsCommand.php @@ -9,8 +9,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Utils\ConfigurationManager; use Drupal\Console\Core\Utils\NestedArray; use Drupal\Console\Core\Style\DrupalStyle; @@ -22,8 +21,6 @@ */ class SettingsCommand extends Command { - use CommandTrait; - /** * @var ConfigurationManager */ diff --git a/src/Command/Debug/SiteCommand.php b/src/Command/Debug/SiteCommand.php index 964655b..4241dd9 100644 --- a/src/Command/Debug/SiteCommand.php +++ b/src/Command/Debug/SiteCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Yaml\Dumper; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Utils\ConfigurationManager; use Drupal\Console\Core\Style\DrupalStyle; @@ -23,8 +22,6 @@ */ class SiteCommand extends Command { - use CommandTrait; - /** * @var ConfigurationManager */ diff --git a/src/Command/DrushCommand.php b/src/Command/DrushCommand.php index f0b3d18..1567575 100644 --- a/src/Command/DrushCommand.php +++ b/src/Command/DrushCommand.php @@ -10,8 +10,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputArgument; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\ConfigurationManager; use Drupal\Console\Core\Utils\ChainQueue; use Drupal\Console\Core\Style\DrupalStyle; @@ -23,8 +21,6 @@ */ class DrushCommand extends Command { - use CommandTrait; - /** * @var ConfigurationManager */ diff --git a/src/Command/Exclude/DrupliconCommand.php b/src/Command/Exclude/DrupliconCommand.php index 540c361..42c89b8 100644 --- a/src/Command/Exclude/DrupliconCommand.php +++ b/src/Command/Exclude/DrupliconCommand.php @@ -9,9 +9,8 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; use Symfony\Component\Finder\Finder; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Utils\TwigRenderer; use Drupal\Console\Core\Style\DrupalStyle; @@ -22,8 +21,6 @@ */ class DrupliconCommand extends Command { - use CommandTrait; - /** * @var string */ diff --git a/src/Command/Exclude/ElephpantCommand.php b/src/Command/Exclude/ElephpantCommand.php index 8d15be4..c1023ca 100644 --- a/src/Command/Exclude/ElephpantCommand.php +++ b/src/Command/Exclude/ElephpantCommand.php @@ -9,9 +9,8 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; use Symfony\Component\Finder\Finder; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Utils\TwigRenderer; use Drupal\Console\Core\Style\DrupalStyle; @@ -22,8 +21,6 @@ */ class ElephpantCommand extends Command { - use CommandTrait; - /** * @var string */ diff --git a/src/Command/Exec/ExecCommand.php b/src/Command/Exec/ExecCommand.php index 4b3f283..f30d116 100644 --- a/src/Command/Exec/ExecCommand.php +++ b/src/Command/Exec/ExecCommand.php @@ -7,15 +7,14 @@ namespace Drupal\Console\Core\Command\Exec; -use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Process\ExecutableFinder; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\ShellProcess; use Drupal\Console\Core\Style\DrupalStyle; +use Drupal\Console\Core\Command\Command; /** * Class ExecCommand @@ -24,8 +23,6 @@ */ class ExecCommand extends Command { - use CommandTrait; - /** * @var ShellProcess */ diff --git a/src/Command/HelpCommand.php b/src/Command/HelpCommand.php index e80e1e6..6a8db29 100644 --- a/src/Command/HelpCommand.php +++ b/src/Command/HelpCommand.php @@ -12,8 +12,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputDefinition; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Core\Helper\DescriptorHelper; @@ -24,8 +22,6 @@ */ class HelpCommand extends Command { - use CommandTrait; - private $command; /** diff --git a/src/Command/InitCommand.php b/src/Command/InitCommand.php index fd85af5..0171ee7 100644 --- a/src/Command/InitCommand.php +++ b/src/Command/InitCommand.php @@ -12,8 +12,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Process\ProcessBuilder; use Symfony\Component\Finder\Finder; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\ConfigurationManager; use Drupal\Console\Core\Generator\InitGenerator; use Drupal\Console\Core\Utils\ShowFile; @@ -26,8 +24,6 @@ */ class InitCommand extends Command { - use CommandTrait; - /** * @var ShowFile */ diff --git a/src/Command/ListCommand.php b/src/Command/ListCommand.php index 883c3d4..3e65db6 100644 --- a/src/Command/ListCommand.php +++ b/src/Command/ListCommand.php @@ -11,8 +11,6 @@ use Symfony\Component\Console\Input\InputOption; use Drupal\Console\Core\Helper\DescriptorHelper; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -22,8 +20,6 @@ */ class ListCommand extends Command { - use CommandTrait; - /** * {@inheritdoc} */ diff --git a/src/Command/Settings/SetCommand.php b/src/Command/Settings/SetCommand.php index 0fc9ba6..a82fefb 100644 --- a/src/Command/Settings/SetCommand.php +++ b/src/Command/Settings/SetCommand.php @@ -12,8 +12,7 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Yaml\Dumper; use Symfony\Component\Yaml\Parser; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Utils\ConfigurationManager; use Drupal\Console\Core\Utils\NestedArray; use Drupal\Console\Core\Style\DrupalStyle; @@ -25,8 +24,6 @@ */ class SetCommand extends Command { - use CommandTrait; - /** * @var ConfigurationManager */