Security update for Core, with self-updated composer

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

diff --git a/vendor/drupal/console/src/Command/Database/ConnectCommand.php b/vendor/drupal/console/src/Command/Database/ConnectCommand.php
index 1908cb0e000314597e2e41b9a82866d5b4597fb1..85ddd266b0ca349de9e4af986e4003334945bb80 100644 (file)
--- a/vendor/drupal/console/src/Command/Database/ConnectCommand.php
+++ b/vendor/drupal/console/src/Command/Database/ConnectCommand.php
@@ -10,14 +10,11 @@ namespace Drupal\Console\Command\Database;
 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\CommandTrait;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Command\Shared\ConnectTrait;
-use Drupal\Console\Core\Style\DrupalStyle;
 
 class ConnectCommand extends Command
 {
-    use CommandTrait;
     use ConnectTrait;
 
     /**
@@ -34,7 +31,8 @@ class ConnectCommand extends Command
                 $this->trans('commands.database.connect.arguments.database'),
                 'default'
             )
-            ->setHelp($this->trans('commands.database.connect.help'));
+            ->setHelp($this->trans('commands.database.connect.help'))
+            ->setAliases(['dbco']);
     }
 
     /**
@@ -42,10 +40,8 @@ class ConnectCommand extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $io = new DrupalStyle($input, $output);
-
         $database = $input->getArgument('database');
-        $databaseConnection = $this->resolveConnection($io, $database);
+        $databaseConnection = $this->resolveConnection($database);
 
         $connection = sprintf(
             '%s -A --database=%s --user=%s --password=%s --host=%s --port=%s',
@@ -57,7 +53,7 @@ class ConnectCommand extends Command
             $databaseConnection['port']
         );
 
-        $io->commentBlock(
+        $this->getIo()->commentBlock(
             sprintf(
                 $this->trans('commands.database.connect.messages.connection'),
                 $connection