Pass TranslatorManager through DI in order to have access to it in co…

…nfigure function of the command (#3763)
hechoendrupal · Feb 17, 2018 · 7df301b · 7df301b
1 parent 0c47f84
commit 7df301b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/config/services/generate.yml b/config/services/generate.yml
@@ -36,7 +36,7 @@ services:
        - { name: drupal.command }
   console.generate_form:
     class: Drupal\Console\Command\Generate\FormBaseCommand
-    arguments: ['@console.extension_manager', '@console.form_generator', '@console.chain_queue', '@console.string_converter', '@console.validator', '@plugin.manager.element_info', '@router.route_provider']
+    arguments: ['@console.translator_manager', '@console.extension_manager', '@console.form_generator', '@console.chain_queue', '@console.string_converter', '@console.validator', '@plugin.manager.element_info', '@router.route_provider']
     tags:
        - { name: drupal.command }
   console.generate_form_alter:
@@ -56,7 +56,7 @@ services:
        - { name: drupal.command }
   console.generate_form_config:
     class: Drupal\Console\Command\Generate\ConfigFormBaseCommand
-    arguments: ['@console.extension_manager', '@console.form_generator', '@console.string_converter', '@console.validator', '@router.route_provider', '@plugin.manager.element_info', '@app.root', '@console.chain_queue']
+    arguments: ['@console.translator_manager', '@console.extension_manager', '@console.form_generator', '@console.string_converter', '@console.validator', '@router.route_provider', '@plugin.manager.element_info', '@app.root', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_plugin_type_annotation:

diff --git a/src/Command/Generate/ConfigFormBaseCommand.php b/src/Command/Generate/ConfigFormBaseCommand.php
@@ -12,6 +12,7 @@
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Core\Utils\ChainQueue;
 use Drupal\Console\Utils\Validator;
+use Drupal\Console\Utils\TranslatorManager;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\Core\Render\ElementInfoManager;
 
@@ -60,6 +61,7 @@ class ConfigFormBaseCommand extends FormCommand
     /**
      * ConfigFormBaseCommand constructor.
      *
+     * @param TranslatorManager      $translator
      * @param Manager                $extensionManager
      * @param FormGenerator          $generator
      * @param StringConverter        $stringConverter
@@ -70,6 +72,7 @@ class ConfigFormBaseCommand extends FormCommand
      * @param ChainQueue             $chainQueue
      */
     public function __construct(
+        TranslatorManager $translator,
         Manager $extensionManager,
         FormGenerator $generator,
         StringConverter $stringConverter,
@@ -87,7 +90,7 @@ public function __construct(
         $this->elementInfoManager = $elementInfoManager;
         $this->appRoot = $appRoot;
         $this->chainQueue = $chainQueue;
-        parent::__construct($extensionManager, $generator, $chainQueue, $stringConverter, $validator, $elementInfoManager, $routeProvider);
+        parent::__construct($translator, $extensionManager, $generator, $chainQueue, $stringConverter, $validator, $elementInfoManager, $routeProvider);
     }
 
     protected function configure()

diff --git a/src/Command/Generate/FormCommand.php b/src/Command/Generate/FormCommand.php
@@ -8,6 +8,7 @@
 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;
@@ -74,6 +75,7 @@ abstract class FormCommand extends ContainerAwareCommand
     /**
      * FormCommand constructor.
      *
+     * @param TranslatorManager      $translator
      * @param Manager                $extensionManager
      * @param FormGenerator          $generator
      * @param ChainQueue             $chainQueue
@@ -83,6 +85,7 @@ abstract class FormCommand extends ContainerAwareCommand
      * @param RouteProviderInterface $routeProvider
      */
     public function __construct(
+        TranslatorManager $translator,
         Manager $extensionManager,
         FormGenerator $generator,
         ChainQueue $chainQueue,
@@ -91,6 +94,7 @@ public function __construct(
         ElementInfoManager $elementInfoManager,
         RouteProviderInterface $routeProvider
     ) {
+        $this->setTranslator($translator);
         $this->extensionManager = $extensionManager;
         $this->generator = $generator;
         $this->chainQueue = $chainQueue;