Security update for Core, with self-updated composer

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

diff --git a/vendor/drupal/console/src/Command/Generate/AuthenticationProviderCommand.php b/vendor/drupal/console/src/Command/Generate/AuthenticationProviderCommand.php
index cb09454a51b317f07588e04a00c9acd129c15f15..b728fc4de6ced4c311b6ea8910fc37ff61b34713 100644 (file)
--- a/vendor/drupal/console/src/Command/Generate/AuthenticationProviderCommand.php
+++ b/vendor/drupal/console/src/Command/Generate/AuthenticationProviderCommand.php
@@ -7,17 +7,15 @@
 
 namespace Drupal\Console\Command\Generate;
 
+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 Symfony\Component\Console\Command\Command;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Generator\AuthenticationProviderGenerator;
 use Drupal\Console\Command\Shared\ConfirmationTrait;
-use Drupal\Console\Core\Style\DrupalStyle;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Utils\StringConverter;
 use Drupal\Console\Extension\Manager;
 
@@ -25,18 +23,16 @@ class AuthenticationProviderCommand extends Command
 {
     use ServicesTrait;
     use ModuleTrait;
-    use FormTrait;
     use ConfirmationTrait;
-    use CommandTrait;
 
     /**
- * @var Manager
-*/
+     * @var Manager
+     */
     protected $extensionManager;
 
     /**
- * @var AuthenticationProviderGenerator
-*/
+     * @var AuthenticationProviderGenerator
+     */
     protected $generator;
 
     /**
@@ -44,6 +40,10 @@ class AuthenticationProviderCommand extends Command
      */
     protected $stringConverter;
 
+    /**
+     * @var Validator
+     */
+    protected $validator;
 
     /**
      * AuthenticationProviderCommand constructor.
@@ -51,15 +51,18 @@ class AuthenticationProviderCommand extends Command
      * @param Manager                         $extensionManager
      * @param AuthenticationProviderGenerator $generator
      * @param StringConverter                 $stringConverter
+     * @param Validator                       $validator
      */
     public function __construct(
         Manager $extensionManager,
         AuthenticationProviderGenerator $generator,
-        StringConverter $stringConverter
+        StringConverter $stringConverter,
+        Validator $validator
     ) {
         $this->extensionManager = $extensionManager;
         $this->generator = $generator;
         $this->stringConverter = $stringConverter;
+        $this->validator = $validator;
         parent::__construct();
     }
 
@@ -81,7 +84,8 @@ class AuthenticationProviderCommand extends Command
                 null,
                 InputOption::VALUE_OPTIONAL,
                 $this->trans('commands.generate.authentication.provider.options.provider-id')
-            );
+            )
+            ->setAliases(['gap']);
     }
 
     /**
@@ -89,50 +93,41 @@ class AuthenticationProviderCommand extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $io = new DrupalStyle($input, $output);
-
-        // @see use Drupal\Console\Command\Shared\ConfirmationTrait::confirmGeneration
-        if (!$this->confirmGeneration($io)) {
+        // @see use Drupal\Console\Command\Shared\ConfirmationTrait::confirmOperation
+        if (!$this->confirmOperation()) {
             return 1;
         }
 
         $module = $input->getOption('module');
-        $class = $input->getOption('class');
+        $class = $this->validator->validateClassName($input->getOption('class'));
         $provider_id = $input->getOption('provider-id');
 
-        $this->generator->generate($module, $class, $provider_id);
+        $this->generator->generate([
+            'module' => $module,
+            'class' => $class,
+            'provider_id' => $provider_id,
+        ]);
 
         return 0;
     }
 
     protected function interact(InputInterface $input, OutputInterface $output)
     {
-        $io = new DrupalStyle($input, $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->getModuleOption();
 
         // --class option
         $class = $input->getOption('class');
         if (!$class) {
-            $class = $io->ask(
+            $class = $this->getIo()->ask(
                 $this->trans(
-                    'commands.generate.authentication.provider.options.class'
+                    'commands.generate.authentication.provider.questions.class'
                 ),
                 'DefaultAuthenticationProvider',
-                function ($value) use ($stringUtils) {
-                    if (!strlen(trim($value))) {
-                        throw new \Exception('The Class name can not be empty');
-                    }
-
-                    return $stringUtils->humanToCamelCase($value);
+                function ($class) {
+                    return $this->validator->validateClassName($class);
                 }
             );
             $input->setOption('class', $class);
@@ -140,8 +135,8 @@ class AuthenticationProviderCommand extends Command
         // --provider-id option
         $provider_id = $input->getOption('provider-id');
         if (!$provider_id) {
-            $provider_id = $io->ask(
-                $this->trans('commands.generate.authentication.provider.options.provider-id'),
+            $provider_id = $this->getIo()->ask(
+                $this->trans('commands.generate.authentication.provider.questions.provider-id'),
                 $stringUtils->camelCaseToUnderscore($class),
                 function ($value) use ($stringUtils) {
                     if (!strlen(trim($value))) {