Refactoring (#3967)

* Add new arguments key and target. Make it possible use not only default target for db connections

* Update composer file to use latest phpunit

* Move method moduleRequrement to the install command, because it is not used anywhere else

* Remove unused line

* Remove ContainerAware extension, because it is not used

* Remove useless ContainerAwareClass extension or add it where it is missing

* Revert composer.json changes

* Revert composer.json changes

src/Command/Debug/ContainerCommand.php

@@ -7,11 +7,11 @@
 
 namespace Drupal\Console\Command\Debug;
 
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
+use Drupal\Console\Core\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Drupal\Console\Core\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Yaml\Yaml;
 
 /**

src/Command/Debug/PermissionCommand.php

@@ -2,22 +2,22 @@
 
 /**
  * @file
- * Contains \Drupal\Console\Command\PermissionDebugCommand.
+ * Contains \Drupal\Console\Command\PermissionCommand.
  */
 
 namespace Drupal\Console\Command\Debug;
 
+use Drupal\Console\Core\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
-use Drupal\Console\Core\Command\ContainerAwareCommand;
 
 /**
  * Class DebugCommand
  *
  * @package Drupal\Console\Command\Debug
  */
-class PermissionCommand extends ContainerAwareCommand
+class PermissionCommand extends Command
 {
     /**
      * {@inheritdoc}

src/Command/Debug/ViewsPluginsCommand.php

@@ -7,18 +7,18 @@
 
 namespace Drupal\Console\Command\Debug;
 
+use Drupal\Console\Core\Command\Command;
+use Drupal\views\Views;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Drupal\Console\Core\Command\ContainerAwareCommand;
-use Drupal\views\Views;
 
 /**
  * Class ViewsPluginsCommand
  *
  * @package Drupal\Console\Command\Debug
  */
-class ViewsPluginsCommand extends ContainerAwareCommand
+class ViewsPluginsCommand extends Command
 {
     /**
      * {@inheritdoc}
@@ -63,7 +63,7 @@ protected function pluginList($type)
             foreach ($plugin['views'] as $plugin_name => $view) {
                 $views[] = $view;
             }
-            $rows[] = [$plugin['type'], $plugin['title'], $plugin['provider'], implode(",", $views)];
+            $rows[] = [$plugin['type'], $plugin['title'], $plugin['provider'], implode(',', $views)];
         }
 
         // Sort rows by field name.

src/Command/Generate/CacheContextCommand.php

@@ -7,20 +7,20 @@
 
 namespace Drupal\Console\Command\Generate;
 
+use Drupal\Console\Command\Shared\ConfirmationTrait;
+use Drupal\Console\Command\Shared\ModuleTrait;
+use Drupal\Console\Command\Shared\ServicesTrait;
+use Drupal\Console\Core\Command\Command;
+use Drupal\Console\Core\Utils\ChainQueue;
+use Drupal\Console\Core\Utils\StringConverter;
+use Drupal\Console\Generator\CacheContextGenerator;
+use Drupal\Console\Extension\Manager;
 use Drupal\Console\Utils\Validator;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Generator\CacheContextGenerator;
-use Drupal\Console\Command\Shared\ConfirmationTrait;
-use Drupal\Console\Core\Command\ContainerAwareCommand;
-use Drupal\Console\Core\Utils\ChainQueue;
-use Drupal\Console\Extension\Manager;
-use Drupal\Console\Command\Shared\ServicesTrait;
-use Drupal\Console\Core\Utils\StringConverter;
 
-class CacheContextCommand extends ContainerAwareCommand
+class CacheContextCommand extends Command
 {
     use ModuleTrait;
     use ConfirmationTrait;

src/Command/Generate/CommandCommand.php

@@ -7,21 +7,21 @@
 
 namespace Drupal\Console\Command\Generate;
 
-use Drupal\Console\Command\Shared\ExtensionTrait;
-use Drupal\Console\Command\Shared\ServicesTrait;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Drupal\Console\Core\Command\ContainerAwareCommand;
 use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Generator\CommandGenerator;
+use Drupal\Console\Command\Shared\ExtensionTrait;
+use Drupal\Console\Command\Shared\ServicesTrait;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Core\Utils\StringConverter;
+use Drupal\Console\Generator\CommandGenerator;
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Utils\Validator;
 use Drupal\Console\Utils\Site;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
-class CommandCommand extends ContainerAwareCommand
+class CommandCommand extends Command
 {
     use ConfirmationTrait;
     use ServicesTrait;

src/Command/Generate/ControllerCommand.php

@@ -7,22 +7,22 @@
 
 namespace Drupal\Console\Command\Generate;
 
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Drupal\Console\Command\Shared\ServicesTrait;
 use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\Console\Command\Shared\ModuleTrait;
+use Drupal\Console\Command\Shared\ServicesTrait;
 use Drupal\Console\Generator\ControllerGenerator;
-use Drupal\Console\Core\Command\ContainerAwareCommand;
-use Drupal\Core\Routing\RouteProviderInterface;
-use Drupal\Console\Core\Utils\StringConverter;
-use Drupal\Console\Core\Utils\ChainQueue;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Core\Command\Shared\InputTrait;
+use Drupal\Console\Core\Utils\ChainQueue;
+use Drupal\Console\Core\Utils\StringConverter;
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Utils\Validator;
+use Drupal\Core\Routing\RouteProviderInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
-class ControllerCommand extends ContainerAwareCommand
+class ControllerCommand extends Command
 {
     use ModuleTrait;
     use ServicesTrait;

src/Command/Generate/EventSubscriberCommand.php

@@ -7,22 +7,22 @@
 
 namespace Drupal\Console\Command\Generate;
 
-use Drupal\Console\Utils\Validator;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Drupal\Console\Command\Shared\ServicesTrait;
-use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Generator\EventSubscriberGenerator;
 use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\Console\Command\Shared\EventsTrait;
-use Drupal\Console\Core\Command\ContainerAwareCommand;
+use Drupal\Console\Command\Shared\ModuleTrait;
+use Drupal\Console\Command\Shared\ServicesTrait;
+use Drupal\Console\Core\Command\Command;
+use Drupal\Console\Core\Utils\ChainQueue;
 use Drupal\Console\Core\Utils\StringConverter;
 use Drupal\Console\Extension\Manager;
+use Drupal\Console\Generator\EventSubscriberGenerator;
+use Drupal\Console\Utils\Validator;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Drupal\Console\Core\Utils\ChainQueue;
 
-class EventSubscriberCommand extends ContainerAwareCommand
+class EventSubscriberCommand extends Command
 {
     use EventsTrait;
     use ServicesTrait;

src/Command/Generate/FormCommand.php

@@ -8,24 +8,24 @@
 namespace Drupal\Console\Command\Generate;
 
 use Drupal\Console\Command\Shared\ArrayInputTrait;
-use Drupal\Console\Utils\TranslatorManager;
-use Drupal\Console\Utils\Validator;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Drupal\Console\Command\Shared\ServicesTrait;
+use Drupal\Console\Command\Shared\FormTrait;
 use Drupal\Console\Command\Shared\ModuleTrait;
 use Drupal\Console\Command\Shared\MenuTrait;
-use Drupal\Console\Command\Shared\FormTrait;
-use Drupal\Console\Core\Command\ContainerAwareCommand;
-use Drupal\Console\Generator\FormGenerator;
-use Drupal\Console\Extension\Manager;
+use Drupal\Console\Command\Shared\ServicesTrait;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Core\Utils\ChainQueue;
 use Drupal\Console\Core\Utils\StringConverter;
+use Drupal\Console\Generator\FormGenerator;
+use Drupal\Console\Extension\Manager;
+use Drupal\Console\Utils\TranslatorManager;
+use Drupal\Console\Utils\Validator;
 use Drupal\Core\Render\ElementInfoManager;
 use Drupal\Core\Routing\RouteProviderInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
-abstract class FormCommand extends ContainerAwareCommand
+abstract class FormCommand extends Command
 {
     use ArrayInputTrait;
     use FormTrait;
@@ -306,7 +306,6 @@ function ($className) {
         $path = $input->getOption('path');
         if (!$path) {
             if ($this->formType == 'ConfigFormBase') {
-                $form_path = '/admin/config/{{ module_name }}/{{ class_name_short }}';
                 $form_path = sprintf(
                     '/admin/config/%s/%s',
                     $module,

src/Command/Generate/JsTestCommand.php

@@ -10,7 +10,6 @@
 use Drupal\Console\Command\Shared\ConfirmationTrait;
 use Drupal\Console\Command\Shared\ModuleTrait;
 use Drupal\Console\Core\Command\Command;
-use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait;
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Generator\JsTestGenerator;
 use Drupal\Console\Utils\Validator;
@@ -22,7 +21,6 @@ class JsTestCommand extends Command
 {
     use ModuleTrait;
     use ConfirmationTrait;
-    use ContainerAwareCommandTrait;
 
     /**
      * @var Manager

src/Command/Generate/PluginBlockCommand.php

@@ -8,24 +8,24 @@
 namespace Drupal\Console\Command\Generate;
 
 use Drupal\Console\Command\Shared\ArrayInputTrait;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Drupal\Console\Core\Command\ContainerAwareCommand;
-use Drupal\Console\Generator\PluginBlockGenerator;
-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\Extension\Manager;
-use Drupal\Console\Utils\Validator;
+use Drupal\Console\Command\Shared\ModuleTrait;
+use Drupal\Console\Command\Shared\ServicesTrait;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Core\Utils\StringConverter;
 use Drupal\Console\Core\Utils\ChainQueue;
+use Drupal\Console\Generator\PluginBlockGenerator;
+use Drupal\Console\Extension\Manager;
+use Drupal\Console\Utils\Validator;
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Render\ElementInfoManagerInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
-class PluginBlockCommand extends ContainerAwareCommand
+class PluginBlockCommand extends Command
 {
     use ArrayInputTrait;
     use ServicesTrait;

src/Command/Generate/PluginMailCommand.php

@@ -7,25 +7,25 @@
 
 namespace Drupal\Console\Command\Generate;
 
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Drupal\Console\Command\Shared\ServicesTrait;
-use Drupal\Console\Command\Shared\ModuleTrait;
 use Drupal\Console\Command\Shared\ConfirmationTrait;
+use Drupal\Console\Command\Shared\ModuleTrait;
+use Drupal\Console\Command\Shared\ServicesTrait;
 use Drupal\Console\Generator\PluginMailGenerator;
-use Drupal\Console\Core\Command\ContainerAwareCommand;
-use Drupal\Console\Extension\Manager;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Core\Utils\StringConverter;
-use Drupal\Console\Utils\Validator;
 use Drupal\Console\Core\Utils\ChainQueue;
+use Drupal\Console\Extension\Manager;
+use Drupal\Console\Utils\Validator;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Class PluginMailCommand
  *
  * @package Drupal\Console\Command\Generate
  */
-class PluginMailCommand extends ContainerAwareCommand
+class PluginMailCommand extends Command
 {
     use ServicesTrait;
     use ModuleTrait;

src/Command/Generate/PluginMigrateDataParserCommand.php

@@ -7,19 +7,19 @@
 
 namespace Drupal\Console\Command\Generate;
 
+use Drupal\Console\Command\Shared\ModuleTrait;
+use Drupal\Console\Command\Shared\ConfirmationTrait;
+use Drupal\Console\Core\Command\Command;
+use Drupal\Console\Core\Utils\ChainQueue;
+use Drupal\Console\Core\Utils\StringConverter;
+use Drupal\Console\Extension\Manager;
+use Drupal\Console\Generator\PluginMigrateDataParserGenerator;
 use Drupal\Console\Utils\Validator;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Drupal\Console\Core\Command\ContainerAwareCommand;
-use Drupal\Console\Generator\PluginMigrateDataParserGenerator;
-use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Extension\Manager;
-use Drupal\Console\Command\Shared\ConfirmationTrait;
-use Drupal\Console\Core\Utils\StringConverter;
-use Drupal\Console\Core\Utils\ChainQueue;
 
-class PluginMigrateDataParserCommand extends ContainerAwareCommand
+class PluginMigrateDataParserCommand extends Command
 {
     use ModuleTrait;
     use ConfirmationTrait;

src/Command/Generate/PluginMigrateProcessCommand.php

@@ -7,19 +7,19 @@
 
 namespace Drupal\Console\Command\Generate;
 
-use Drupal\Console\Utils\Validator;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Drupal\Console\Core\Command\ContainerAwareCommand;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Generator\PluginMigrateProcessGenerator;
-use Drupal\Console\Command\Shared\ModuleTrait;
+use Drupal\Console\Utils\Validator;
 use Drupal\Console\Command\Shared\ConfirmationTrait;
+use Drupal\Console\Command\Shared\ModuleTrait;
 use Drupal\Console\Extension\Manager;
-use Drupal\Console\Core\Utils\StringConverter;
 use Drupal\Console\Core\Utils\ChainQueue;
+use Drupal\Console\Core\Utils\StringConverter;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
-class PluginMigrateProcessCommand extends ContainerAwareCommand
+class PluginMigrateProcessCommand extends Command
 {
     use ModuleTrait;
     use ConfirmationTrait;