Security update for Core, with self-updated composer

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

diff --git a/vendor/drupal/console/src/Command/Cache/RebuildCommand.php b/vendor/drupal/console/src/Command/Cache/RebuildCommand.php
index 3ad5f0b984b755b816f5307ca81ba5472fafe70e..f5375b563506af8459a162d45a4625fb18c10881 100644 (file)
--- a/vendor/drupal/console/src/Command/Cache/RebuildCommand.php
+++ b/vendor/drupal/console/src/Command/Cache/RebuildCommand.php
@@ -7,15 +7,13 @@
 
 namespace Drupal\Console\Command\Cache;
 
+use Drupal\Console\Core\Command\Command;
+use Drupal\Console\Utils\DrupalApi;
+use Drupal\Console\Utils\Site;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Console\Command\Command;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
-use Drupal\Console\Utils\DrupalApi;
-use Drupal\Console\Utils\Site;
-use Drupal\Console\Core\Style\DrupalStyle;
 
 /**
  * Class RebuildCommand
@@ -24,8 +22,6 @@ use Drupal\Console\Core\Style\DrupalStyle;
  */
 class RebuildCommand extends Command
 {
-    use CommandTrait;
-
     /**
       * @var DrupalApi
       */
@@ -37,6 +33,7 @@ class RebuildCommand extends Command
     protected $site;
 
     protected $classLoader;
+
     /**
      * @var RequestStack
      */
@@ -75,7 +72,7 @@ class RebuildCommand extends Command
                 'cache',
                 InputArgument::OPTIONAL,
                 $this->trans('commands.cache.rebuild.options.cache')
-            );
+            )->setAliases(['cr']);
     }
 
     /**
@@ -83,14 +80,13 @@ class RebuildCommand extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $io = new DrupalStyle($input, $output);
         $cache = $input->getArgument('cache')?:'all';
         $this->site->loadLegacyFile('/core/includes/utility.inc');
 
         if ($cache && !$this->drupalApi->isValidCache($cache)) {
-            $io->error(
+            $this->getIo()->error(
                 sprintf(
-                    $this->trans('commands.cache.rebuild.messages.invalid_cache'),
+                    $this->trans('commands.cache.rebuild.messages.invalid-cache'),
                     $cache
                 )
             );
@@ -98,8 +94,8 @@ class RebuildCommand extends Command
             return 1;
         }
 
-        $io->newLine();
-        $io->comment($this->trans('commands.cache.rebuild.messages.rebuild'));
+        $this->getIo()->newLine();
+        $this->getIo()->comment($this->trans('commands.cache.rebuild.messages.rebuild'));
 
         if ($cache === 'all') {
             $this->drupalApi->drupal_rebuild(
@@ -111,7 +107,7 @@ class RebuildCommand extends Command
             $caches[$cache]->deleteAll();
         }
 
-        $io->success($this->trans('commands.cache.rebuild.messages.completed'));
+        $this->getIo()->success($this->trans('commands.cache.rebuild.messages.completed'));
 
         return 0;
     }
@@ -121,13 +117,11 @@ class RebuildCommand extends Command
      */
     protected function interact(InputInterface $input, OutputInterface $output)
     {
-        $io = new DrupalStyle($input, $output);
-
         $cache = $input->getArgument('cache');
         if (!$cache) {
             $cacheKeys = array_keys($this->drupalApi->getCaches());
 
-            $cache = $io->choiceNoList(
+            $cache = $this->getIo()->choiceNoList(
                 $this->trans('commands.cache.rebuild.questions.cache'),
                 $cacheKeys,
                 'all'