[console] Extend base commands. (#3457)

Author: jmolivas

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
       */

src/Command/Debug/ContainerCommand.php

@@ -11,20 +11,17 @@
 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;
 
 /**
  * Class ContainerCommand
  *
  * @package Drupal\Console\Command\Debug
  */
-class ContainerCommand extends Command
+class ContainerCommand extends ContainerAwareCommand
 {
-    use ContainerAwareCommandTrait;
-
     /**
      * {@inheritdoc}
      */