Security update for Core, with self-updated composer

[yaffs-website] / vendor / drupal / console / src / Command / Generate / PluginTypeYamlCommand.php

diff --git a/vendor/drupal/console/src/Command/Generate/PluginTypeYamlCommand.php b/vendor/drupal/console/src/Command/Generate/PluginTypeYamlCommand.php
index 58e79cdee9d93dbd20680608e9f379ca186b6601..a7ef0a067c4d74c5e30a41486e94b6db243aeffd 100644 (file)
--- a/vendor/drupal/console/src/Command/Generate/PluginTypeYamlCommand.php
+++ b/vendor/drupal/console/src/Command/Generate/PluginTypeYamlCommand.php
@@ -8,19 +8,15 @@
 namespace Drupal\Console\Command\Generate;
 
 use Drupal\Console\Generator\PluginTypeYamlGenerator;
+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\Command\Shared\FormTrait;
-use Drupal\Console\Command\Shared\ConfirmationTrait;
-use Symfony\Component\Console\Command\Command;
-use Drupal\Console\Core\Style\DrupalStyle;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Extension\Manager;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Utils\StringConverter;
-use Drupal\Console\Core\Utils\ChainQueue;
 
 /**
  * Class PluginTypeYamlCommand
@@ -31,18 +27,15 @@ class PluginTypeYamlCommand extends Command
 {
     use ServicesTrait;
     use ModuleTrait;
-    use FormTrait;
-    use ConfirmationTrait;
-    use CommandTrait;
 
     /**
- * @var Manager
-*/
+     * @var Manager
+     */
     protected $extensionManager;
 
     /**
- * @var PluginTypeYamlGenerator
-*/
+     * @var PluginTypeYamlGenerator
+     */
     protected $generator;
 
     /**
@@ -50,21 +43,29 @@ class PluginTypeYamlCommand extends Command
      */
     protected $stringConverter;
 
+    /**
+     * @var Validator
+     */
+    protected $validator;
+
     /**
      * PluginTypeYamlCommand constructor.
      *
      * @param Manager                 $extensionManager
      * @param PluginTypeYamlGenerator $generator
      * @param StringConverter         $stringConverter
+     * @param Validator               $validator
      */
     public function __construct(
         Manager $extensionManager,
         PluginTypeYamlGenerator $generator,
-        StringConverter $stringConverter
+        StringConverter $stringConverter,
+        Validator $validator
     ) {
         $this->extensionManager = $extensionManager;
         $this->generator = $generator;
         $this->stringConverter = $stringConverter;
+        $this->validator = $validator;
         parent::__construct();
     }
 
@@ -74,7 +75,12 @@ class PluginTypeYamlCommand extends Command
             ->setName('generate:plugin:type:yaml')
             ->setDescription($this->trans('commands.generate.plugin.type.yaml.description'))
             ->setHelp($this->trans('commands.generate.plugin.type.yaml.help'))
-            ->addOption('module', null, InputOption::VALUE_REQUIRED, $this->trans('commands.common.options.module'))
+            ->addOption(
+                'module',
+                null,
+                InputOption::VALUE_REQUIRED,
+                $this->trans('commands.common.options.module')
+            )
             ->addOption(
                 'class',
                 null,
@@ -92,7 +98,8 @@ class PluginTypeYamlCommand extends Command
                 null,
                 InputOption::VALUE_OPTIONAL,
                 $this->trans('commands.generate.plugin.type.yaml.options.plugin-file-name')
-            );
+            )
+            ->setAliases(['gpty']);
     }
 
     /**
@@ -101,31 +108,32 @@ class PluginTypeYamlCommand extends Command
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $module = $input->getOption('module');
-        $class_name = $input->getOption('class');
+        $class_name = $this->validator->validateClassName($input->getOption('class'));
         $plugin_name = $input->getOption('plugin-name');
         $plugin_file_name = $input->getOption('plugin-file-name');
 
-        $this->generator->generate($module, $class_name, $plugin_name, $plugin_file_name);
+        $this->generator->generate([
+            'module' => $module,
+            'class_name' => $class_name,
+            'plugin_name' => $plugin_name,
+            'plugin_file_name' => $plugin_file_name,
+        ]);
     }
 
     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->getModuleOption();
 
         // --class option
         $class_name = $input->getOption('class');
         if (!$class_name) {
-            $class_name = $io->ask(
+            $class_name = $this->getIo()->ask(
                 $this->trans('commands.generate.plugin.type.yaml.options.class'),
-                'ExamplePlugin'
+                'ExamplePlugin',
+                function ($class) {
+                    return $this->validator->validateClassName($class);
+                }
             );
             $input->setOption('class', $class_name);
         }
@@ -133,7 +141,7 @@ class PluginTypeYamlCommand extends Command
         // --plugin-name option
         $plugin_name = $input->getOption('plugin-name');
         if (!$plugin_name) {
-            $plugin_name = $io->ask(
+            $plugin_name = $this->getIo()->ask(
                 $this->trans('commands.generate.plugin.type.yaml.options.plugin-name'),
                 $this->stringConverter->camelCaseToUnderscore($class_name)
             );
@@ -143,7 +151,7 @@ class PluginTypeYamlCommand extends Command
         // --plugin-file-name option
         $plugin_file_name = $input->getOption('plugin-file-name');
         if (!$plugin_file_name) {
-            $plugin_file_name = $io->ask(
+            $plugin_file_name = $this->getIo()->ask(
                 $this->trans('commands.generate.plugin.type.yaml.options.plugin-file-name'),
                 strtr($plugin_name, '_-', '..')
             );