[console] Remove useless traits and death code. Fix #3716 (#3717)

* Remove useless Trait from BreakPointCommand.php * Remove FormTrait usage from classes where the trait is not used * Remove ConfirmationTrait usage from classes where the trait is not used * Remove ConnectTrait usage from classes where the trait is not used * Remove LocaleTrait usage from classes where the trait is not used * Remove MenuTrait usage from classes where the trait is not used
hechoendrupal · Jan 22, 2018 · 0fb1b34 · 0fb1b34
1 parent c9d2e62
commit 0fb1b34
Show file tree

Hide file tree

Showing 16 changed files with 1 addition and 35 deletions.
diff --git a/src/Command/Database/AddCommand.php b/src/Command/Database/AddCommand.php
@@ -7,17 +7,14 @@
 
 namespace Drupal\Console\Command\Database;
 
-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 Drupal\Console\Core\Command\Command;
 use Drupal\Console\Generator\DatabaseSettingsGenerator;
-use Drupal\Console\Command\Shared\ConnectTrait;
 
 class AddCommand extends Command
 {
-    use ConnectTrait;
 
     /**
      * @var DatabaseSettingsGenerator

diff --git a/src/Command/Generate/AuthenticationProviderCommand.php b/src/Command/Generate/AuthenticationProviderCommand.php
@@ -13,7 +13,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Drupal\Console\Command\Shared\ServicesTrait;
 use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Command\Shared\FormTrait;
 use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Generator\AuthenticationProviderGenerator;
 use Drupal\Console\Command\Shared\ConfirmationTrait;
@@ -24,7 +23,6 @@ class AuthenticationProviderCommand extends Command
 {
     use ServicesTrait;
     use ModuleTrait;
-    use FormTrait;
     use ConfirmationTrait;
 
     /**

diff --git a/src/Command/Generate/BreakPointCommand.php b/src/Command/Generate/BreakPointCommand.php
@@ -9,7 +9,6 @@
 
 use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\Console\Command\Shared\ThemeBreakpointTrait;
-use Drupal\Console\Command\Shared\ThemeRegionTrait;
 use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Core\Utils\StringConverter;
 use Drupal\Console\Generator\BreakPointGenerator;
@@ -27,7 +26,6 @@
 class BreakPointCommand extends Command
 {
     use ConfirmationTrait;
-    use ThemeRegionTrait;
     use ThemeBreakpointTrait;
 
     /**

diff --git a/src/Command/Generate/FormAlterCommand.php b/src/Command/Generate/FormAlterCommand.php
@@ -13,7 +13,6 @@
 use Drupal\Console\Generator\FormAlterGenerator;
 use Drupal\Console\Command\Shared\ServicesTrait;
 use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Command\Shared\MenuTrait;
 use Drupal\Console\Command\Shared\FormTrait;
 use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\Console\Core\Command\Command;
@@ -31,7 +30,6 @@ class FormAlterCommand extends Command
     use ServicesTrait;
     use ModuleTrait;
     use FormTrait;
-    use MenuTrait;
     use ConfirmationTrait;
 
     /**

diff --git a/src/Command/Generate/PermissionCommand.php b/src/Command/Generate/PermissionCommand.php
@@ -14,7 +14,6 @@
 use Drupal\Console\Command\Shared\ModuleTrait;
 use Drupal\Console\Command\Shared\PermissionTrait;
 use Drupal\Console\Generator\PermissionGenerator;
-use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Core\Utils\StringConverter;
 use Drupal\Console\Utils\Validator;
@@ -23,7 +22,6 @@ class PermissionCommand extends Command
 {
     use ModuleTrait;
     use PermissionTrait;
-    use ConfirmationTrait;
 
     /**
      * @var Manager

diff --git a/src/Command/Generate/PluginMailCommand.php b/src/Command/Generate/PluginMailCommand.php
@@ -12,7 +12,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Drupal\Console\Command\Shared\ServicesTrait;
 use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Command\Shared\FormTrait;
 use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\Console\Generator\PluginMailGenerator;
 use Drupal\Console\Core\Command\ContainerAwareCommand;
@@ -30,7 +29,6 @@ class PluginMailCommand extends ContainerAwareCommand
 {
     use ServicesTrait;
     use ModuleTrait;
-    use FormTrait;
     use ConfirmationTrait;
 
     /**

diff --git a/src/Command/Generate/PluginRestResourceCommand.php b/src/Command/Generate/PluginRestResourceCommand.php
@@ -13,7 +13,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Drupal\Console\Command\Shared\ServicesTrait;
 use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Command\Shared\FormTrait;
 use Drupal\Console\Generator\PluginRestResourceGenerator;
 use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\Console\Core\Command\Command;
@@ -30,7 +29,6 @@ class PluginRestResourceCommand extends Command
 {
     use ServicesTrait;
     use ModuleTrait;
-    use FormTrait;
     use ConfirmationTrait;
 
     /**

diff --git a/src/Command/Generate/PluginRulesActionCommand.php b/src/Command/Generate/PluginRulesActionCommand.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Drupal\Console\Command\Shared\ServicesTrait;
 use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Command\Shared\FormTrait;
 use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Extension\Manager;
@@ -30,7 +29,6 @@ class PluginRulesActionCommand extends Command
 {
     use ServicesTrait;
     use ModuleTrait;
-    use FormTrait;
     use ConfirmationTrait;
 
     /**

diff --git a/src/Command/Generate/PluginTypeAnnotationCommand.php b/src/Command/Generate/PluginTypeAnnotationCommand.php
@@ -14,8 +14,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Drupal\Console\Command\Shared\ServicesTrait;
 use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Command\Shared\FormTrait;
-use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Core\Utils\StringConverter;
@@ -29,8 +27,6 @@ class PluginTypeAnnotationCommand extends Command
 {
     use ServicesTrait;
     use ModuleTrait;
-    use FormTrait;
-    use ConfirmationTrait;
 
     /**
  * @var Manager

diff --git a/src/Command/Generate/PluginTypeYamlCommand.php b/src/Command/Generate/PluginTypeYamlCommand.php
@@ -14,8 +14,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Drupal\Console\Command\Shared\ServicesTrait;
 use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Command\Shared\FormTrait;
-use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Core\Utils\StringConverter;
@@ -29,8 +27,6 @@ class PluginTypeYamlCommand extends Command
 {
     use ServicesTrait;
     use ModuleTrait;
-    use FormTrait;
-    use ConfirmationTrait;
 
     /**
      * @var Manager

diff --git a/src/Command/Generate/ProfileCommand.php b/src/Command/Generate/ProfileCommand.php
@@ -138,6 +138,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        // @see use Drupal\Console\Command\Shared\ConfirmationTrait::confirmGeneration
         if (!$this->confirmGeneration()) {
             return 1;
         }

diff --git a/src/Command/Locale/LanguageAddCommand.php b/src/Command/Locale/LanguageAddCommand.php
@@ -12,7 +12,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\Console\Core\Command\Command;
-use Drupal\Console\Command\Shared\LocaleTrait;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Console\Utils\Site;
 use Drupal\Console\Annotations\DrupalCommand;
@@ -25,7 +24,6 @@
  */
 class LanguageAddCommand extends Command
 {
-    use LocaleTrait;
 
     /**
      * @var Site

diff --git a/src/Command/Locale/LanguageDeleteCommand.php b/src/Command/Locale/LanguageDeleteCommand.php
@@ -11,7 +11,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Drupal\Console\Core\Command\Command;
-use Drupal\Console\Command\Shared\LocaleTrait;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Console\Utils\Site;
@@ -25,7 +24,6 @@
  */
 class LanguageDeleteCommand extends Command
 {
-    use LocaleTrait;
 
     /**
      * @var Site

diff --git a/src/Command/Role/DeleteCommand.php b/src/Command/Role/DeleteCommand.php
@@ -14,11 +14,9 @@
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Console\Utils\DrupalApi;
-use Drupal\Console\Command\Shared\ConfirmationTrait;
 
 class DeleteCommand extends Command
 {
-    use ConfirmationTrait;
 
     /**
      * @var Connection

diff --git a/src/Command/Role/NewCommand.php b/src/Command/Role/NewCommand.php
@@ -16,12 +16,10 @@
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Console\Utils\DrupalApi;
-use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\user\Entity\Role;
 
 class NewCommand extends Command
 {
-    use ConfirmationTrait;
 
     /**
      * @var Connection

diff --git a/src/Command/User/CreateCommand.php b/src/Command/User/CreateCommand.php
@@ -15,12 +15,10 @@
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Console\Utils\DrupalApi;
-use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\user\Entity\User;
 
 class CreateCommand extends Command
 {
-    use ConfirmationTrait;
 
     /**
      * @var Connection