Security update for Core, with self-updated composer

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

diff --git a/vendor/drupal/console/src/Command/PermissionDebugCommand.php b/vendor/drupal/console/src/Command/Debug/PermissionCommand.php
similarity index 69%
rename from vendor/drupal/console/src/Command/PermissionDebugCommand.php
rename to vendor/drupal/console/src/Command/Debug/PermissionCommand.php
index f32eb504f976edf163e9e54df62180a2733845c3..99acbb9c6b2a1d652ed2add972627aaa20725f68 100644 (file)
--- a/vendor/drupal/console/src/Command/PermissionDebugCommand.php
+++ b/vendor/drupal/console/src/Command/Debug/PermissionCommand.php
@@ -5,36 +5,33 @@
  * Contains \Drupal\Console\Command\PermissionDebugCommand.
  */
 
-namespace Drupal\Console\Command;
+namespace Drupal\Console\Command\Debug;
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Command\Command;
-use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait;
-use Drupal\Console\Core\Style\DrupalStyle;
+use Drupal\Console\Core\Command\ContainerAwareCommand;
 
 /**
  * Class DebugCommand
  *
- * @package Drupal\Console\Command
+ * @package Drupal\Console\Command\Debug
  */
-class PermissionDebugCommand extends Command
+class PermissionCommand extends ContainerAwareCommand
 {
-    use ContainerAwareCommandTrait;
     /**
      * {@inheritdoc}
      */
     protected function configure()
     {
-        $this->setName('permission:debug')
-            ->setDescription($this->trans('commands.permission.debug.description'))
-            ->setHelp($this->trans('commands.permission.debug.help'))
+        $this->setName('debug:permission')
+            ->setDescription($this->trans('commands.debug.permission.description'))
+            ->setHelp($this->trans('commands.debug.permission.help'))
             ->addArgument(
                 'role',
                 InputArgument::OPTIONAL,
-                $this->trans('commands.permission.debug.arguments.role')
-            );
+                $this->trans('commands.debug.permission.arguments.role')
+            )->setAliases(['dp']);
     }
 
     /**
@@ -42,15 +39,13 @@ class PermissionDebugCommand extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $io = new DrupalStyle($input, $output);
-
         $role = $input->getArgument('role');
         // No role specified, show a list of ALL permissions.
         if (!$role) {
             $tableHeader = [
-                $this->trans('commands.permission.debug.table-headers.permission-name'),
-                $this->trans('commands.permission.debug.table-headers.permission-label'),
-                $this->trans('commands.permission.debug.table-headers.permission-role')
+                $this->trans('commands.debug.permission.table-headers.permission-name'),
+                $this->trans('commands.debug.permission.table-headers.permission-label'),
+                $this->trans('commands.debug.permission.table-headers.permission-role')
             ];
             $tableRows = [];
             $permissions = \Drupal::service('user.permissions')->getPermissions();
@@ -63,20 +58,20 @@ class PermissionDebugCommand extends Command
             }
 
             ksort($tableRows);
-            $io->table($tableHeader, array_values($tableRows));
+            $this->getIo()->table($tableHeader, array_values($tableRows));
 
             return true;
         } else {
             $tableHeader = [
-                $this->trans('commands.permission.debug.table-headers.permission-name'),
-                $this->trans('commands.permission.debug.table-headers.permission-label')
+                $this->trans('commands.debug.permission.table-headers.permission-name'),
+                $this->trans('commands.debug.permission.table-headers.permission-label')
             ];
             $tableRows = [];
             $permissions = \Drupal::service('user.permissions')->getPermissions();
             $roles = user_roles();
             if (empty($roles[$role])) {
-                $message = sprintf($this->trans('commands.permission.debug.messages.role-error'), $role);
-                $io->error($message);
+                $message = sprintf($this->trans('commands.debug.permission.messages.role-error'), $role);
+                $this->getIo()->error($message);
                 return true;
             }
             $user_permission = $roles[$role]->getPermissions();
@@ -89,7 +84,7 @@ class PermissionDebugCommand extends Command
                 }
             }
             ksort($tableRows);
-            $io->table($tableHeader, array_values($tableRows));
+            $this->getIo()->table($tableHeader, array_values($tableRows));
             return true;
         }
     }