Security update for Core, with self-updated composer

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

diff --git a/vendor/drupal/console/src/Command/DevelDumperCommand.php b/vendor/drupal/console/src/Command/DevelDumperCommand.php
index 4748f4ea9d788fae167886cd68434b2464c0b967..64558b50d7921b23dc545adcbcaca01ab149d0a1 100644 (file)
--- a/vendor/drupal/console/src/Command/DevelDumperCommand.php
+++ b/vendor/drupal/console/src/Command/DevelDumperCommand.php
@@ -7,9 +7,7 @@ use Drupal\Core\Config\ConfigFactory;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-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;
 use Drupal\devel\DevelDumperPluginManager;
 use Drupal\devel\DevelDumperManager;
 
@@ -23,10 +21,8 @@ use Drupal\devel\DevelDumperManager;
  * @todo Move to namespace Devel
  * @todo Load devel.module legacy file
  */
-class DevelDumperCommand extends Command
+class DevelDumperCommand extends ContainerAwareCommand
 {
-    use ContainerAwareCommandTrait;
-
     /**
      * @var DevelDumperPluginManager
      */
@@ -50,12 +46,12 @@ class DevelDumperCommand extends Command
     {
         $this
             ->setName('devel:dumper')
-            ->setDescription($this->trans('Change the devel dumper plugin'))
+            ->setDescription($this->trans('commands.devel.dumper.messages.change-devel-dumper-plugin'))
             ->addArgument(
                 'dumper',
                 InputArgument::OPTIONAL,
-                $this->trans('Name of the devel dumper plugin')
-            );
+                $this->trans('commands.devel.dumper.messages.name-devel-dumper-plugin')
+            )->setAliases(['dd']);
     }
 
     /**
@@ -63,9 +59,8 @@ class DevelDumperCommand extends Command
      */
     protected function interact(InputInterface $input, OutputInterface $output)
     {
-        $io = new DrupalStyle($input, $output);
         if (!\Drupal::moduleHandler()->moduleExists('devel')) {
-            $io->error($this->trans('Devel must be installed'));
+            $this->getIo()->error($this->trans('commands.devel.dumper.messages.devel-must-be-installed'));
 
             return 1;
         }
@@ -75,8 +70,8 @@ class DevelDumperCommand extends Command
             /* @var string[] $dumpKeys */
             $dumpKeys = $this->getDumperKeys();
 
-            $dumper = $io->choice(
-                $this->trans('Select a Debug Dumper'),
+            $dumper = $this->getIo()->choice(
+                $this->trans('commands.devel.dumper.messages.select-debug-dumper'),
                 $dumpKeys,
                 'kint', //Make kint the default for quick 'switchback'
                 false
@@ -91,13 +86,11 @@ class DevelDumperCommand extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $io = new DrupalStyle($input, $output);
-
         //Check the dumper actually exists
         $dumper = $input->getArgument('dumper');
         $dumpKeys = $this->getDumperKeys();
         if (!in_array($dumper, $dumpKeys)) {
-            $io->error($this->trans('Dumper does not exist'));
+            $this->getIo()->error($this->trans('commands.devel.dumper.messages.dumper-not-exist'));
 
             return 1;
         }
@@ -106,9 +99,9 @@ class DevelDumperCommand extends Command
         /* @var Config $develSettings */
         $develSettings = $configFactory->getEditable('devel.settings');
         $develSettings->set('devel_dumper', $dumper)->save();
-        $io->info(
+        $this->getIo()->info(
             sprintf(
-                $this->trans('Devel Dumper set to: %s'),
+                $this->trans('commands.devel.dumper.messages.devel-dumper-set'),
                 $configFactory->get('devel.settings')->get('devel_dumper')
             )
         );