[console] Extend command base

src/Command/Cache/RebuildCommand.php

@@ -11,8 +11,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Console\Command\Command;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Utils\DrupalApi;
 use Drupal\Console\Utils\Site;
 use Drupal\Console\Core\Style\DrupalStyle;
@@ -24,8 +23,6 @@
  */
 class RebuildCommand extends Command
 {
-    use CommandTrait;
-
     /**
       * @var DrupalApi
       */

src/Command/Cache/TagInvalidateCommand.php

@@ -7,18 +7,15 @@
 
 namespace Drupal\Console\Command\Cache;
 
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Style\DrupalStyle;
 use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
-use Symfony\Component\Console\Command\Command;
+use Drupal\Console\Core\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class TagInvalidateCommand extends Command
 {
-    use CommandTrait;
-
     /**
      * @var CacheTagsInvalidatorInterface
      */

src/Command/Config/DeleteCommand.php

@@ -10,17 +10,14 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Yaml\Exception\RuntimeException;
-use Symfony\Component\Console\Command\Command;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Config\CachedStorage;
 use Drupal\Core\Config\ConfigFactory;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Style\DrupalStyle;
 
 class DeleteCommand extends Command
 {
-    use CommandTrait;
-
     protected $allConfig = [];
 
     /**

src/Command/Config/DiffCommand.php

@@ -12,16 +12,13 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Core\Config\CachedStorage;
 use Drupal\Core\Config\ConfigManager;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Style\DrupalStyle;
 
 class DiffCommand extends Command
 {
-    use CommandTrait;
-
     /**
      * @var CachedStorage
      */

src/Command/Config/EditCommand.php

@@ -17,15 +17,12 @@
 use Drupal\Component\Serialization\Yaml;
 use Drupal\Core\Config\CachedStorage;
 use Drupal\Core\Config\ConfigFactory;
-use Symfony\Component\Console\Command\Command;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Core\Style\DrupalStyle;
 use Drupal\Console\Core\Utils\ConfigurationManager;
 
 class EditCommand extends Command
 {
-    use CommandTrait;
-
     /**
      * @var ConfigFactory
      */

src/Command/Config/ExportCommand.php

@@ -14,16 +14,13 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
+use Drupal\Console\Core\Command\Command;
 use Symfony\Component\Filesystem\Filesystem;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Style\DrupalStyle;
 use Drupal\Core\Config\ConfigManager;
 
 class ExportCommand extends Command
 {
-    use CommandTrait;
-
     /**
      * @var ConfigManager
      */

src/Command/Config/ExportContentTypeCommand.php

@@ -12,17 +12,15 @@
 use Symfony\Component\Console\Input\InputOption;
 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\Core\Config\CachedStorage;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Style\DrupalStyle;
 use Drupal\Console\Command\Shared\ExportTrait;
 use Drupal\Console\Extension\Manager;
 
 class ExportContentTypeCommand extends Command
 {
-    use CommandTrait;
     use ModuleTrait;
     use ExportTrait;
 

src/Command/Config/ExportSingleCommand.php

@@ -12,18 +12,16 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Config\CachedStorage;
 use Drupal\Console\Core\Style\DrupalStyle;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Command\Shared\ExportTrait;
 use Drupal\Console\Extension\Manager;
 use Webmozart\PathUtil\Path;
 
 class ExportSingleCommand extends Command
 {
-    use CommandTrait;
     use ExportTrait;
 
     /**

src/Command/Config/ExportViewCommand.php

@@ -11,8 +11,7 @@
 use Symfony\Component\Console\Input\InputOption;
 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\Command\Shared\ModuleTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Config\CachedStorage;
@@ -22,7 +21,6 @@
 
 class ExportViewCommand extends Command
 {
-    use CommandTrait;
     use ModuleTrait;
     use ExportTrait;
 

src/Command/Config/ImportCommand.php

@@ -9,10 +9,9 @@
 use Symfony\Component\Console\Input\InputOption;
 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\Core\Config\CachedStorage;
 use Drupal\Core\Config\ConfigManager;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Style\DrupalStyle;
 use Drupal\Core\Config\ConfigImporterException;
 use Drupal\Core\Config\ConfigImporter;
@@ -21,8 +20,6 @@
 
 class ImportCommand extends Command
 {
-    use CommandTrait;
-
     /**
      * @var CachedStorage
      */

src/Command/Config/ImportSingleCommand.php

@@ -7,14 +7,13 @@
 namespace Drupal\Console\Command\Config;
 
 use Drupal\config\StorageReplaceDataWrapper;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Style\DrupalStyle;
 use Drupal\Core\Config\CachedStorage;
 use Drupal\Core\Config\ConfigImporter;
 use Drupal\Core\Config\ConfigImporterException;
 use Drupal\Core\Config\ConfigManager;
 use Drupal\Core\Config\StorageComparer;
-use Symfony\Component\Console\Command\Command;
+use Drupal\Console\Core\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -23,8 +22,6 @@
 
 class ImportSingleCommand extends Command
 {
-    use CommandTrait;
-
     /**
      * @var CachedStorage
      */

src/Command/Config/OverrideCommand.php

@@ -10,16 +10,13 @@
 use Symfony\Component\Console\Input\InputArgument;
 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\Core\Config\CachedStorage;
 use Drupal\Core\Config\ConfigFactory;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Style\DrupalStyle;
 
 class OverrideCommand extends Command
 {
-    use CommandTrait;
-
     /**
      * @var CachedStorage
      */

src/Command/Config/ValidateCommand.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\ContainerAwareCommandTrait;
+use Drupal\Console\Core\Command\ContainerAwareCommand;
 use Drupal\Console\Core\Style\DrupalStyle;
 use Drupal\Core\Config\TypedConfigManagerInterface;
 use Symfony\Component\Console\Input\InputArgument;
@@ -21,9 +20,8 @@
  *
  * @package Drupal\Console\Command\Config
  */
-class ValidateCommand extends Command
+class ValidateCommand extends ContainerAwareCommand
 {
-    use ContainerAwareCommandTrait;
     use SchemaCheckTrait;
     use PrintConfigValidationTrait;
 

src/Command/Create/CommentsCommand.php

@@ -9,8 +9,7 @@
 use Symfony\Component\Console\Input\InputOption;
 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\Command\Shared\CreateTrait;
 use Drupal\Console\Utils\Create\CommentData;
 use Drupal\Console\Core\Style\DrupalStyle;
@@ -23,7 +22,6 @@
 class CommentsCommand extends Command
 {
     use CreateTrait;
-    use CommandTrait;
 
     /**
      * @var CommentData

src/Command/Create/NodesCommand.php

@@ -11,9 +11,8 @@
 use Symfony\Component\Console\Input\InputOption;
 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\Annotations\DrupalCommand;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Command\Shared\CreateTrait;
 use Drupal\Console\Utils\Create\NodeData;
 use Drupal\Console\Utils\DrupalApi;
@@ -33,7 +32,6 @@
 class NodesCommand extends Command
 {
     use CreateTrait;
-    use CommandTrait;
 
     /**
      * @var DrupalApi

src/Command/Create/TermsCommand.php

@@ -11,8 +11,7 @@
 use Symfony\Component\Console\Input\InputOption;
 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\Annotations\DrupalCommand;
 use Drupal\Console\Utils\Create\TermData;
 use Drupal\Console\Utils\DrupalApi;
@@ -30,8 +29,6 @@
  */
 class TermsCommand extends Command
 {
-    use CommandTrait;
-
     /**
      * @var DrupalApi
      */

src/Command/Create/UsersCommand.php

@@ -11,8 +11,7 @@
 use Symfony\Component\Console\Input\InputOption;
 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\Command\Shared\CreateTrait;
 use Drupal\Console\Utils\Create\UserData;
 use Drupal\Console\Utils\DrupalApi;
@@ -26,7 +25,6 @@
 class UsersCommand extends Command
 {
     use CreateTrait;
-    use CommandTrait;
 
     /**
      * @var DrupalApi

src/Command/Create/VocabulariesCommand.php

@@ -11,7 +11,7 @@
 use Symfony\Component\Console\Input\InputOption;
 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\Utils\Create\VocabularyData;
 use Drupal\Console\Core\Style\DrupalStyle;
 
@@ -22,8 +22,6 @@
  */
 class VocabulariesCommand extends Command
 {
-    use CommandTrait;
-
     /**
      * @var VocabularyData
      */

src/Command/Cron/ExecuteCommand.php

@@ -10,18 +10,15 @@
 use Symfony\Component\Console\Input\InputArgument;
 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\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Lock\LockBackendInterface;
 use Drupal\Core\State\StateInterface;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Style\DrupalStyle;
 use Drupal\Console\Core\Utils\ChainQueue;
 
 class ExecuteCommand extends Command
 {
-    use CommandTrait;
-
     /**
      * @var ModuleHandlerInterface
      */

src/Command/Cron/ReleaseCommand.php

@@ -10,16 +10,14 @@
 use Symfony\Component\Config\Definition\Exception\Exception;
 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\Core\Lock\LockBackendInterface;
 use Drupal\Console\Core\Utils\ChainQueue;
 use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Style\DrupalStyle;
 
 class ReleaseCommand extends Command
 {
-    use CommandTrait;
-
     /**
      * @var LockBackendInterface
      */