Security update for Core, with self-updated composer

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

diff --git a/vendor/drupal/console/src/Command/Generate/PermissionCommand.php b/vendor/drupal/console/src/Command/Generate/PermissionCommand.php
index 07ef7172f4522d3cb4c698417f492ea536460877..fe0adf882b513a8fe2cbdb178e1dbf7c7eedae80 100644 (file)
--- a/vendor/drupal/console/src/Command/Generate/PermissionCommand.php
+++ b/vendor/drupal/console/src/Command/Generate/PermissionCommand.php
@@ -7,25 +7,23 @@
 
 namespace Drupal\Console\Command\Generate;
 
+use Drupal\Console\Command\Shared\ArrayInputTrait;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Command\Shared\ModuleTrait;
 use Drupal\Console\Command\Shared\PermissionTrait;
 use Drupal\Console\Generator\PermissionGenerator;
-use Drupal\Console\Command\Shared\ConfirmationTrait;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
-use Drupal\Console\Core\Style\DrupalStyle;
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Core\Utils\StringConverter;
+use Drupal\Console\Utils\Validator;
 
 class PermissionCommand extends Command
 {
-    use CommandTrait;
+    use ArrayInputTrait;
     use ModuleTrait;
     use PermissionTrait;
-    use ConfirmationTrait;
 
     /**
      * @var Manager
@@ -42,6 +40,11 @@ class PermissionCommand extends Command
      */
     protected $generator;
 
+    /**
+     * @var Validator
+     */
+    protected $validator;
+
     /**
      * PermissionCommand constructor.
      *
@@ -51,11 +54,13 @@ class PermissionCommand extends Command
     public function __construct(
         Manager $extensionManager,
         StringConverter $stringConverter,
-        PermissionGenerator $permissionGenerator
+        PermissionGenerator $permissionGenerator,
+        Validator $validator
     ) {
         $this->extensionManager = $extensionManager;
         $this->stringConverter = $stringConverter;
         $this->generator = $permissionGenerator;
+        $this->validator = $validator;
         parent::__construct();
     }
 
@@ -66,8 +71,8 @@ class PermissionCommand extends Command
     {
         $this
             ->setName('generate:permissions')
-            ->setDescription($this->trans('commands.generate.permission.description'))
-            ->setHelp($this->trans('commands.generate.permission.help'))
+            ->setDescription($this->trans('commands.generate.permissions.description'))
+            ->setHelp($this->trans('commands.generate.permissions.help'))
             ->addOption(
                 'module',
                 null,
@@ -77,9 +82,10 @@ class PermissionCommand extends Command
             ->addOption(
                 'permissions',
                 null,
-                InputOption::VALUE_OPTIONAL,
+                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
                 $this->trans('commands.common.options.permissions')
-            );
+            )
+            ->setAliases(['gp']);
     }
 
     /**
@@ -90,9 +96,17 @@ class PermissionCommand extends Command
         $module = $input->getOption('module');
         $permissions = $input->getOption('permissions');
         $learning = $input->hasOption('learning');
+        $noInteraction = $input->getOption('no-interaction');
+        // Parse nested data.
+        if ($noInteraction) {
+          $permissions = $this->explodeInlineArray($permissions);
+        }
 
-
-        $this->generator->generate($module, $permissions, $learning);
+        $this->generator->generate([
+          'module_name' => $module,
+          'permissions' => $permissions,
+          'learning' => $learning,
+        ]);
     }
 
     /**
@@ -100,22 +114,18 @@ class PermissionCommand extends Command
      */
     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();
 
         // --permissions option
         $permissions = $input->getOption('permissions');
         if (!$permissions) {
             // @see \Drupal\Console\Command\Shared\PermissionTrait::permissionQuestion
-            $permissions = $this->permissionQuestion($io);
-            $input->setOption('permissions', $permissions);
+            $permissions = $this->permissionQuestion();
+        } else {
+            $permissions = $this->explodeInlineArray($permissions);
         }
+
+        $input->setOption('permissions', $permissions);
     }
 }