[generate:plugin:block] Inject missing plugin.manager.element_info se…

…rvice. (#2749)
hechoendrupal · Oct 1, 2016 · 2239eb6 · 2239eb6
1 parent 309e12a
commit 2239eb6
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 33 deletions.
diff --git a/config/services/drupal-console/generate.yml b/config/services/drupal-console/generate.yml
@@ -156,17 +156,17 @@ services:
        - { name: drupal.command }
   console.generate_pluginblock:
     class: Drupal\Console\Command\Generate\PluginBlockCommand
-    arguments: ['@config.factory', '@console.chain_queue', '@console.pluginblock_generator', '@entity_type.manager', '@console.extension_manager', '@console.validator', '@console.string_converter']
+    arguments: ['@config.factory', '@console.chain_queue', '@console.pluginblock_generator', '@entity_type.manager', '@console.extension_manager', '@console.validator', '@console.string_converter', '@plugin.manager.element_info']
     tags:
        - { name: drupal.command }
   console.generate_command:
     class: Drupal\Console\Command\Generate\CommandCommand
-    arguments: ['@drupal.command_generator', '@console.extension_manager', '@console.validator', '@console.string_converter' ]
+    arguments: ['@console.command_generator', '@console.extension_manager', '@console.validator', '@console.string_converter' ]
     tags:
        - { name: drupal.command }
   console.generate_ckeditorbutton:
     class: Drupal\Console\Command\Generate\PluginCKEditorButtonCommand
-    arguments: ['@console.chain_queue', '@drupal.command_ckeditorbutton', '@console.extension_manager', '@console.string_converter']
+    arguments: ['@console.chain_queue', '@console.command_ckeditorbutton', '@console.extension_manager', '@console.string_converter']
     tags:
        - { name: drupal.command }
   console.generate_entitycontent:

diff --git a/config/services/drupal-console/generator.yml b/config/services/drupal-console/generator.yml
@@ -129,6 +129,8 @@ services:
   console.route_subscriber_generator:
     class: Drupal\Console\Generator\RouteSubscriberGenerator
     arguments: ['@console.extension_manager']
+    tags:
+      - { name: drupal.generator }
   console.service_generator:
     class: Drupal\Console\Generator\ServiceGenerator
     arguments: ['@console.extension_manager']
@@ -152,12 +154,14 @@ services:
   console.pluginblock_generator:
     class: Drupal\Console\Generator\PluginBlockGenerator
     arguments: ['@console.extension_manager']
-  drupal.command_generator:
+    tags:
+      - { name: drupal.generator }
+  console.command_generator:
     class: Drupal\Console\Generator\CommandGenerator
     arguments: ['@console.extension_manager', '@console.translator_manager']
     tags:
       - { name: drupal.generator }
-  drupal.command_ckeditorbutton:
+  console.command_ckeditorbutton:
     class: Drupal\Console\Generator\PluginCKEditorButtonGenerator
     arguments: ['@console.extension_manager']
     tags:

diff --git a/src/Command/Generate/PluginBlockCommand.php b/src/Command/Generate/PluginBlockCommand.php
@@ -24,7 +24,7 @@
 use Drupal\Console\Utils\ChainQueue;
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-
+use Drupal\Core\Render\ElementInfoManagerInterface;
 
 class PluginBlockCommand extends Command
 {
@@ -34,7 +34,6 @@ class PluginBlockCommand extends Command
     use ConfirmationTrait;
     use ContainerAwareCommandTrait;
 
-
     /**
      * @var ConfigFactory
      */
@@ -45,35 +44,46 @@ class PluginBlockCommand extends Command
      */
     protected $chainQueue;
 
-    /** @var PluginBlockGenerator  */
+    /**
+     * @var PluginBlockGenerator
+     */
     protected $generator;
 
     /**
      * @var EntityTypeManagerInterface
      */
     protected $entityTypeManager;
 
-    /** @var Manager  */
+    /**
+     * @var Manager
+     */
     protected $extensionManager;
 
-    /** @var Validator  */
+    /**
+     * @var Validator
+     */
     protected $validator;
 
     /**
      * @var StringConverter
      */
     protected $stringConverter;
 
+    /**
+     * @var ElementInfoManagerInterface
+     */
+    protected $elementInfoManager;
 
     /**
      * PluginBlockCommand constructor.
-     * @param ConfigFactory              $configFactory
-     * @param ChainQueue                 $chainQueue
-     * @param PluginBlockGenerator       $generator
-     * @param EntityTypeManagerInterface $entityTypeManager
-     * @param Manager                    $extensionManager
-     * @param Validator                  $validator
-     * @param StringConverter            $stringConverter
+     * @param ConfigFactory               $configFactory
+     * @param ChainQueue                  $chainQueue
+     * @param PluginBlockGenerator        $generator
+     * @param EntityTypeManagerInterface  $entityTypeManager
+     * @param Manager                     $extensionManager
+     * @param Validator                   $validator
+     * @param StringConverter             $stringConverter
+     * @param ElementInfoManagerInterface $elementInfoManager
      */
     public function __construct(
         ConfigFactory $configFactory,
@@ -82,7 +92,8 @@ public function __construct(
         EntityTypeManagerInterface $entityTypeManager,
         Manager $extensionManager,
         Validator $validator,
-        StringConverter $stringConverter
+        StringConverter $stringConverter,
+        ElementInfoManagerInterface $elementInfoManager
     ) {
         $this->configFactory = $configFactory;
         $this->chainQueue = $chainQueue;
@@ -91,6 +102,7 @@ public function __construct(
         $this->extensionManager = $extensionManager;
         $this->validator = $validator;
         $this->stringConverter = $stringConverter;
+        $this->elementInfoManager = $elementInfoManager;
         parent::__construct();
     }
 
@@ -176,15 +188,28 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // @see use Drupal\Console\Command\Shared\ServicesTrait::buildServices
         $build_services = $this->buildServices($services);
 
-        $this
-            ->generator
-            ->generate($module, $class_name, $label, $plugin_id, $build_services, $inputs);
+        $this->generator
+            ->generate(
+                $module,
+                $class_name,
+                $label,
+                $plugin_id,
+                $build_services,
+                $inputs
+            );
 
         $this->chainQueue->addCommand('cache:rebuild', ['cache' => 'discovery']);
 
         if ($theme_region) {
-            // Load block to set theme region
-            $block = $this->entityTypeManager->getStorage('block')->create(array('id'=> $plugin_id, 'plugin' => $plugin_id, 'theme' => $theme));
+            $block = $this->entityTypeManager
+                ->getStorage('block')
+                ->create(
+                    [
+                        'id'=> $plugin_id,
+                        'plugin' => $plugin_id,
+                        'theme' => $theme
+                    ]
+                );
             $block->setRegion($theme_region);
             $block->save();
         }
@@ -213,7 +238,6 @@ protected function interact(InputInterface $input, OutputInterface $output)
                 'DefaultBlock',
                 function ($class) {
                     return $this->validator->validateClassName($class);
-                    return $this->validator->validateClassName($class);
                 }
             );
             $input->setOption('class', $class);

diff --git a/src/Command/Shared/FormTrait.php b/src/Command/Shared/FormTrait.php
@@ -31,11 +31,6 @@ public function formQuestion(DrupalStyle $io)
                 'text_format'
             ];
 
-            if (!$this->elementInfoManager) {
-                $io->writeln('Please inject service plugin.manager.element_info');
-                return false;
-            }
-
             foreach ($this->elementInfoManager->getDefinitions() as $definition) {
                 $type = $definition['id'];
                 $elementInfo = $this->elementInfoManager->getInfo($type);

diff --git a/src/Generator/PluginBlockGenerator.php b/src/Generator/PluginBlockGenerator.php
@@ -11,11 +11,11 @@
 
 class PluginBlockGenerator extends Generator
 {
-
-    /** @var Manager  */
+    /**
+     * @var Manager
+     */
     protected $extensionManager;
 
-
     /**
      * PermissionGenerator constructor.
      * @param Manager $extensionManager
@@ -26,7 +26,6 @@ public function __construct(
         $this->extensionManager = $extensionManager;
     }
 
-
     /**
      * Generator Plugin Block.
      *