[console] Remove gabordemooij/redbean dependency. (#3799)

hechoendrupal · Feb 21, 2018 · 879e1b6 · 879e1b6
1 parent 08a0c78
commit 879e1b6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -44,7 +44,6 @@
         "drupal/console-core": "dev-master",
         "drupal/console-dotenv": "~0",
         "drupal/console-extend-plugin": "~0",
-        "gabordemooij/redbean": "~4.3",
         "guzzlehttp/guzzle": "~6.1",
         "psy/psysh": "0.6.* || ~0.8",
         "symfony/css-selector": "~2.8|~3.0",

diff --git a/config/services/debug.yml b/config/services/debug.yml
@@ -87,7 +87,7 @@ services:
       - { name: drupal.command }
   console.database_table_debug:
     class: Drupal\Console\Command\Debug\DatabaseTableCommand
-    arguments: ['@console.redbean', '@database']
+    arguments: ['@database']
     tags:
       - { name: drupal.command }
   console.cron_debug:

diff --git a/services.yml b/services.yml
@@ -3,8 +3,6 @@ services:
     class: SplString
   console.cache_key:
     class: SplString
-  console.redbean:
-    class: RedBeanPHP\R
   console.validator:
     class: Drupal\Console\Utils\Validator
     arguments: ['@console.extension_manager', '@console.translator_manager']

diff --git a/src/Command/Debug/DatabaseTableCommand.php b/src/Command/Debug/DatabaseTableCommand.php
@@ -30,22 +30,14 @@ class DatabaseTableCommand extends Command
      */
     protected $database;
 
-    /**
-     * @var R
-     */
-    protected $redBean;
-
     /**
      * DatabaseTableCommand constructor.
      *
-     * @param R          $redBean
      * @param Connection $database
      */
     public function __construct(
-        R $redBean,
         Connection $database
     ) {
-        $this->redBean = $redBean;
         $this->database = $database;
         parent::__construct();
     }
@@ -82,30 +74,30 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $database = $input->getOption('database');
         $table = $input->getArgument('table');
-
         $databaseConnection = $this->resolveConnection($database);
-
         if ($table) {
-            $this->redBean = $this->getRedBeanConnection($database);
-            if (empty($this->redBean)) {
+            $result = $this->database
+                ->query('DESCRIBE '. $table .';')
+                ->fetchAll();
+            if (!$result) {
                 throw new \Exception(
                     sprintf(
                         $this->trans('commands.debug.database.table.messages.no-connection'),
                         $database
                     )
                 );
             }
-            $tableInfo = $this->redBean->inspect($table);
 
             $tableHeader = [
                 $this->trans('commands.debug.database.table.messages.column'),
                 $this->trans('commands.debug.database.table.messages.type')
             ];
             $tableRows = [];
-            foreach ($tableInfo as $column => $type) {
+            foreach ($result as $record) {
+                $column = json_decode(json_encode($record), true);
                 $tableRows[] = [
-                    'column' => $column,
-                    'type' => $type
+                    'column' => $column['Field'],
+                    'type' => $column['Type'],
                 ];
             }