From 9bc4c88f72ea2d4448e818fcc3b3da4507238305 Mon Sep 17 00:00:00 2001
From: Jesus Manuel Olivas <jesus.olivas@gmail.com>
Date: Fri, 28 Jul 2017 14:00:11 -0700
Subject: [PATCH] [console] Extend base commands.

---
 src/Command/Cache/RebuildCommand.php   | 5 +----
 src/Command/Debug/ContainerCommand.php | 7 ++-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Command/Cache/RebuildCommand.php b/src/Command/Cache/RebuildCommand.php
index 01fedcd59..fb7fedfb1 100644
--- a/src/Command/Cache/RebuildCommand.php
+++ b/src/Command/Cache/RebuildCommand.php
@@ -11,8 +11,7 @@
 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\Core\Command\Command;
 use Drupal\Console\Utils\DrupalApi;
 use Drupal\Console\Utils\Site;
 use Drupal\Console\Core\Style\DrupalStyle;
@@ -24,8 +23,6 @@
  */
 class RebuildCommand extends Command
 {
-    use CommandTrait;
-
     /**
       * @var DrupalApi
       */
diff --git a/src/Command/Debug/ContainerCommand.php b/src/Command/Debug/ContainerCommand.php
index a8630cef2..03255a54f 100644
--- a/src/Command/Debug/ContainerCommand.php
+++ b/src/Command/Debug/ContainerCommand.php
@@ -11,9 +11,8 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Command\Command;
+use Drupal\Console\Core\Command\ContainerAwareCommand;
 use Symfony\Component\Yaml\Yaml;
-use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait;
 use Drupal\Console\Core\Style\DrupalStyle;
 
 /**
@@ -21,10 +20,8 @@
  *
  * @package Drupal\Console\Command\Debug
  */
-class ContainerCommand extends Command
+class ContainerCommand extends ContainerAwareCommand
 {
-    use ContainerAwareCommandTrait;
-
     /**
      * {@inheritdoc}
      */