Issue 2178 replace code with module from input (#3653)

* Replace code getting module from the input with ModuleTrait method * Add the validator service for the commands, which receiving module as a parameter
hechoendrupal · Jan 8, 2018 · b586b25 · b586b25
1 parent 6c809c5
commit b586b25
Show file tree

Hide file tree

Showing 39 changed files with 138 additions and 257 deletions.
diff --git a/config/services/config.yml b/config/services/config.yml
@@ -21,17 +21,17 @@ services:
       - { name: drupal.command }
   console.config_export_content_type:
     class: Drupal\Console\Command\Config\ExportContentTypeCommand
-    arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager']
+    arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager', '@console.validator']
     tags:
       - { name: drupal.command }
   console.config_export_single:
     class: Drupal\Console\Command\Config\ExportSingleCommand
-    arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager','@language_manager']
+    arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager','@language_manager', '@console.validator']
     tags:
       - { name: drupal.command }
   console.config_export_view:
     class: Drupal\Console\Command\Config\ExportViewCommand
-    arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager']
+    arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager', '@console.validator']
     tags:
       - { name: drupal.command }
   console.config_import:

diff --git a/config/services/generate.yml b/config/services/generate.yml
@@ -6,7 +6,7 @@ services:
        - { name: drupal.command }
   console.generate_modulefile:
     class: Drupal\Console\Command\Generate\ModuleFileCommand
-    arguments: ['@console.extension_manager', '@console.modulefile_generator']
+    arguments: ['@console.extension_manager', '@console.modulefile_generator', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_authentication_provider:
@@ -26,7 +26,7 @@ services:
       - { name: drupal.command }
   console.generate_help:
     class: Drupal\Console\Command\Generate\HelpCommand
-    arguments: ['@console.help_generator', '@console.site', '@console.extension_manager', '@console.chain_queue']
+    arguments: ['@console.help_generator', '@console.site', '@console.extension_manager', '@console.chain_queue', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_form:
@@ -36,12 +36,12 @@ services:
        - { name: drupal.command }
   console.generate_form_alter:
     class: Drupal\Console\Command\Generate\FormAlterCommand
-    arguments: ['@console.extension_manager', '@console.form_alter_generator', '@console.string_converter', '@module_handler', '@plugin.manager.element_info', '@?profiler', '@app.root', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.form_alter_generator', '@console.string_converter', '@module_handler', '@plugin.manager.element_info', '@?profiler', '@app.root', '@console.chain_queue', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_permissions:
     class: Drupal\Console\Command\Generate\PermissionCommand
-    arguments: ['@console.extension_manager', '@console.string_converter', '@console.permission_generator']
+    arguments: ['@console.extension_manager', '@console.string_converter', '@console.permission_generator', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_event_subscriber:
@@ -166,7 +166,7 @@ services:
        - { name: drupal.command }
   console.generate_update:
     class: Drupal\Console\Command\Generate\UpdateCommand
-    arguments: ['@console.extension_manager', '@console.update_generator', '@console.site', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.update_generator', '@console.site', '@console.chain_queue', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_pluginblock:

diff --git a/src/Command/Config/ExportContentTypeCommand.php b/src/Command/Config/ExportContentTypeCommand.php
@@ -8,6 +8,7 @@
 namespace Drupal\Console\Command\Config;
 
 use Drupal\Console\Command\Shared\ModuleTrait;
+use Drupal\Console\Utils\Validator;
 use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
@@ -42,21 +43,29 @@ class ExportContentTypeCommand extends Command
 
     protected $configExport;
 
+    /**
+     * @var Validator
+     */
+    protected $validator;
+
     /**
      * ExportContentTypeCommand constructor.
      *
      * @param EntityTypeManagerInterface $entityTypeManager
      * @param CachedStorage              $configStorage
      * @param Manager                    $extensionManager
+     * @param Validator                  $validator
      */
     public function __construct(
         EntityTypeManagerInterface $entityTypeManager,
         CachedStorage $configStorage,
-        Manager $extensionManager
+        Manager $extensionManager,
+        Validator $validator
     ) {
         $this->entityTypeManager = $entityTypeManager;
         $this->configStorage = $configStorage;
         $this->extensionManager = $extensionManager;
+        $this->validator = $validator;
         parent::__construct();
     }
 
@@ -102,12 +111,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $module = $input->getOption('module');
-        if (!$module) {
-            // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
-            $module = $this->moduleQuestion($io);
-        }
-        $input->setOption('module', $module);
+        $this->moduleFromInput($io, $input);
 
         // --content-type argument
         $contentType = $input->getArgument('content-type');

diff --git a/src/Command/Config/ExportSingleCommand.php b/src/Command/Config/ExportSingleCommand.php
@@ -13,6 +13,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Drupal\Console\Core\Command\Command;
+use Drupal\Console\Utils\Validator;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Config\CachedStorage;
 use Drupal\Console\Core\Style\DrupalStyle;
@@ -57,24 +58,32 @@ class ExportSingleCommand extends Command
      */
     protected $languageManager;
 
+    /**
+     * @var Validator
+     */
+    protected $validator;
+
     /**
      * ExportSingleCommand constructor.
      *
      * @param EntityTypeManagerInterface $entityTypeManager
      * @param CachedStorage              $configStorage
      * @param Manager                    $extensionManager
      * @param languageManager            $languageManager
+     * @param Validator                  $validator
      */
     public function __construct(
         EntityTypeManagerInterface $entityTypeManager,
         CachedStorage $configStorage,
         Manager $extensionManager,
-        LanguageManagerInterface $languageManager
+        LanguageManagerInterface $languageManager,
+        Validator $validator
     ) {
         $this->entityTypeManager = $entityTypeManager;
         $this->configStorage = $configStorage;
         $this->extensionManager = $extensionManager;
         $this->languageManager = $languageManager;
+        $this->validator = $validator;
         parent::__construct();
     }
 
@@ -219,12 +228,8 @@ protected function interact(InputInterface $input, OutputInterface $output)
             $input->setOption('name', [$name]);
         }
 
-        $module = $input->getOption('module');
-        if (!$module) {
-            // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
-            $module = $this->moduleQuestion($io);
-        }
-        $input->setOption('module', $module);
+        // --module option
+        $this->moduleFromInput($io, $input);
 
         $module = $input->getOption('module');
         if ($module) {

diff --git a/src/Command/Config/ExportViewCommand.php b/src/Command/Config/ExportViewCommand.php
@@ -12,6 +12,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Drupal\Console\Core\Command\Command;
+use Drupal\Console\Utils\Validator;
 use Drupal\Console\Command\Shared\ModuleTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Config\CachedStorage;
@@ -42,6 +43,11 @@ class ExportViewCommand extends Command
      */
     protected $extensionManager;
 
+    /**
+     * @var Validator
+     */
+    protected $validator;
+
     /**
      * ExportViewCommand constructor.
      *
@@ -52,11 +58,13 @@ class ExportViewCommand extends Command
     public function __construct(
         EntityTypeManagerInterface $entityTypeManager,
         CachedStorage $configStorage,
-        Manager $extensionManager
+        Manager $extensionManager,
+        Validator $validator
     ) {
         $this->entityTypeManager = $entityTypeManager;
         $this->configStorage = $configStorage;
         $this->extensionManager = $extensionManager;
+        $this->validator = $validator;
         parent::__construct();
     }
 
@@ -99,12 +107,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $module = $input->getOption('module');
-        if (!$module) {
-            // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
-            $module = $this->moduleQuestion($io);
-            $input->setOption('module', $module);
-        }
+        $this->moduleFromInput($io, $input);
 
         // view-id argument
         $viewId = $input->getArgument('view-id');

diff --git a/src/Command/Generate/AuthenticationProviderCommand.php b/src/Command/Generate/AuthenticationProviderCommand.php
@@ -119,12 +119,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $stringUtils = $this->stringConverter;
 
         // --module option
-        $module = $input->getOption('module');
-        if (!$module) {
-            // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
-            $module = $this->moduleQuestion($io);
-            $input->setOption('module', $module);
-        }
+        $this->moduleFromInput($io, $input);
 
         // --class option
         $class = $input->getOption('class');

diff --git a/src/Command/Generate/CacheContextCommand.php b/src/Command/Generate/CacheContextCommand.php
@@ -144,12 +144,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $module = $input->getOption('module');
-        if (!$module) {
-            // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
-            $module = $this->moduleQuestion($io);
-            $input->setOption('module', $module);
-        }
+        $this->moduleFromInput($io, $input);
 
         // --cache_context option
         $cache_context = $input->getOption('cache-context');

diff --git a/src/Command/Generate/ControllerCommand.php b/src/Command/Generate/ControllerCommand.php
@@ -174,12 +174,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $module = $input->getOption('module');
-        if (!$module) {
-            // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
-            $module = $this->moduleQuestion($io);
-            $input->setOption('module', $module);
-        }
+        $this->moduleFromInput($io, $input);
 
         // --class option
         $class = $input->getOption('class');

diff --git a/src/Command/Generate/EntityBundleCommand.php b/src/Command/Generate/EntityBundleCommand.php
@@ -118,12 +118,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $module = $input->getOption('module');
-        if (!$module) {
-            // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
-            $module = $this->moduleQuestion($io);
-            $input->setOption('module', $module);
-        }
+        $this->moduleFromInput($io, $input);
 
         // --bundle-name option
         $bundleName = $input->getOption('bundle-name');

diff --git a/src/Command/Generate/EntityCommand.php b/src/Command/Generate/EntityCommand.php
@@ -101,12 +101,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $utils = $this->stringConverter;
 
         // --module option
-        $module = $input->getOption('module');
-        if (!$module) {
-            // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
-            $module = $this->moduleQuestion($io);
-            $input->setOption('module', $module);
-        }
+        $this->moduleFromInput($io, $input);
 
         // --entity-class option
         $entityClass = $input->getOption('entity-class');

diff --git a/src/Command/Generate/EventSubscriberCommand.php b/src/Command/Generate/EventSubscriberCommand.php
@@ -163,12 +163,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $module = $input->getOption('module');
-        if (!$module) {
-            // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
-            $module = $this->moduleQuestion($io);
-            $input->setOption('module', $module);
-        }
+        $this->moduleFromInput($io, $input);
 
         // --service-name option
         $name = $input->getOption('name');

diff --git a/src/Command/Generate/FormAlterCommand.php b/src/Command/Generate/FormAlterCommand.php
@@ -61,13 +61,13 @@ class FormAlterCommand extends Command
     protected $elementInfoManager;
 
     /**
- * @var Validator
-*/
+     * @var Validator
+     */
     protected $validator;
 
     /**
- * @var RouteProviderInterface
-*/
+     * @var RouteProviderInterface
+     */
     protected $routeProvider;
 
     /**
@@ -106,7 +106,8 @@ public function __construct(
         ElementInfoManager $elementInfoManager,
         Profiler $profiler = null,
         $appRoot,
-        ChainQueue $chainQueue
+        ChainQueue $chainQueue,
+        Validator $validator
     ) {
         $this->extensionManager = $extensionManager;
         $this->generator = $generator;
@@ -116,6 +117,7 @@ public function __construct(
         $this->profiler = $profiler;
         $this->appRoot = $appRoot;
         $this->chainQueue = $chainQueue;
+        $this->validator = $validator;
         parent::__construct();
     }
 
@@ -199,13 +201,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $module = $input->getOption('module');
-        if (!$module) {
-            // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
-            $module = $this->moduleQuestion($io);
-        }
-
-        $input->setOption('module', $module);
+        $this->moduleFromInput($io, $input);
 
         // --form-id option
         $formId = $input->getOption('form-id');