Skip to content

Commit 7df301b

Browse files
LOBsTerrjmolivas
authored andcommitted
Pass TranslatorManager through DI in order to have access to it in configure function of the command (#3763)
1 parent 0c47f84 commit 7df301b

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

config/services/generate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ services:
3636
- { name: drupal.command }
3737
console.generate_form:
3838
class: Drupal\Console\Command\Generate\FormBaseCommand
39-
arguments: ['@console.extension_manager', '@console.form_generator', '@console.chain_queue', '@console.string_converter', '@console.validator', '@plugin.manager.element_info', '@router.route_provider']
39+
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']
4040
tags:
4141
- { name: drupal.command }
4242
console.generate_form_alter:
@@ -56,7 +56,7 @@ services:
5656
- { name: drupal.command }
5757
console.generate_form_config:
5858
class: Drupal\Console\Command\Generate\ConfigFormBaseCommand
59-
arguments: ['@console.extension_manager', '@console.form_generator', '@console.string_converter', '@console.validator', '@router.route_provider', '@plugin.manager.element_info', '@app.root', '@console.chain_queue']
59+
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']
6060
tags:
6161
- { name: drupal.command }
6262
console.generate_plugin_type_annotation:

src/Command/Generate/ConfigFormBaseCommand.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Drupal\Console\Extension\Manager;
1313
use Drupal\Console\Core\Utils\ChainQueue;
1414
use Drupal\Console\Utils\Validator;
15+
use Drupal\Console\Utils\TranslatorManager;
1516
use Drupal\Core\Routing\RouteProviderInterface;
1617
use Drupal\Core\Render\ElementInfoManager;
1718

@@ -60,6 +61,7 @@ class ConfigFormBaseCommand extends FormCommand
6061
/**
6162
* ConfigFormBaseCommand constructor.
6263
*
64+
* @param TranslatorManager $translator
6365
* @param Manager $extensionManager
6466
* @param FormGenerator $generator
6567
* @param StringConverter $stringConverter
@@ -70,6 +72,7 @@ class ConfigFormBaseCommand extends FormCommand
7072
* @param ChainQueue $chainQueue
7173
*/
7274
public function __construct(
75+
TranslatorManager $translator,
7376
Manager $extensionManager,
7477
FormGenerator $generator,
7578
StringConverter $stringConverter,
@@ -87,7 +90,7 @@ public function __construct(
8790
$this->elementInfoManager = $elementInfoManager;
8891
$this->appRoot = $appRoot;
8992
$this->chainQueue = $chainQueue;
90-
parent::__construct($extensionManager, $generator, $chainQueue, $stringConverter, $validator, $elementInfoManager, $routeProvider);
93+
parent::__construct($translator, $extensionManager, $generator, $chainQueue, $stringConverter, $validator, $elementInfoManager, $routeProvider);
9194
}
9295

9396
protected function configure()

src/Command/Generate/FormCommand.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Drupal\Console\Command\Generate;
99

1010
use Drupal\Console\Command\Shared\ArrayInputTrait;
11+
use Drupal\Console\Utils\TranslatorManager;
1112
use Drupal\Console\Utils\Validator;
1213
use Symfony\Component\Console\Input\InputInterface;
1314
use Symfony\Component\Console\Input\InputOption;
@@ -74,6 +75,7 @@ abstract class FormCommand extends ContainerAwareCommand
7475
/**
7576
* FormCommand constructor.
7677
*
78+
* @param TranslatorManager $translator
7779
* @param Manager $extensionManager
7880
* @param FormGenerator $generator
7981
* @param ChainQueue $chainQueue
@@ -83,6 +85,7 @@ abstract class FormCommand extends ContainerAwareCommand
8385
* @param RouteProviderInterface $routeProvider
8486
*/
8587
public function __construct(
88+
TranslatorManager $translator,
8689
Manager $extensionManager,
8790
FormGenerator $generator,
8891
ChainQueue $chainQueue,
@@ -91,6 +94,7 @@ public function __construct(
9194
ElementInfoManager $elementInfoManager,
9295
RouteProviderInterface $routeProvider
9396
) {
97+
$this->setTranslator($translator);
9498
$this->extensionManager = $extensionManager;
9599
$this->generator = $generator;
96100
$this->chainQueue = $chainQueue;

0 commit comments

Comments
 (0)