Merge pull request #59 from dennisinteractive/CMS-1244-use-drush

CMS-1244 Use drush commands and not drupal console

Author: tashaharrison

src/Command/Site/DbImportCommand.php

@@ -209,8 +209,8 @@ protected function execute(InputInterface $input, OutputInterface $output) {
       // this was a quick fix.
       if ($this->getDrupalVersion() === 8) {
         $config_commands[] = sprintf('cd %s', $this->shellPath($this->getWebRoot()));
-        $config_commands[] = 'drupal config:import';
-        $config_commands[] = 'drupal cache:rebuild';
+        $config_commands[] = 'drush cim -y';
+        $config_commands[] = 'drush cr';
         $config_command = implode(' && ', $config_commands);
 
         $this->io->commentBlock($config_command);
@@ -297,9 +297,13 @@ protected function getSqlImportCommands() {
     // Drupal 8 only;
     if ($this->getDrupalVersion() === 8) {
       $commands[] = sprintf('cd %s', $this->shellPath($this->getWebRoot()));
-      $commands[] = sprintf('drupal database:restore --file=%s', $this->filename);
-      $commands[] = 'drupal cache:rebuild all';
-      $commands[] = sprintf('drupal user:password:reset 1 %s', $this->config['account-pass']);
+      $commands[] = sprintf('drush sql-create -y');
+      $commands[] = sprintf('drush sql-cli < %s', $this->filename);
+      $commands[] = 'drush cr';
+      $commands[] = sprintf('drush user-password %s "%s"',
+        $this->config['account-name'],
+        $this->config['account-pass']
+      );
     }
 
     return $commands;

src/Command/Site/UpdateCommand.php

@@ -64,7 +64,10 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 
     // Drupal 8 only;
     if ($this->getDrupalVersion() === 8) {
-      $commands[] = 'drupal update:execute';
+      $commands[] = 'drush cim -y';
+      $commands[] = 'drush cr';
+      $commands[] = 'drush updb -y';
+      $commands[] = 'drush cr';
       $this->addModuleEnableCommands($commands);
       $this->addModuleDisableCommands($commands);
 
@@ -85,24 +88,6 @@ protected function execute(InputInterface $input, OutputInterface $output) {
       throw new CommandException($shellProcess->getOutput());
     }
 
-    // We run config:import separately so that if there's no config and it
-    // fails we can continue. Previously, we checked the config folder, but this
-    // was a quick fix.
-    if ($this->getDrupalVersion() === 8) {
-      $config_commands[] = sprintf('cd %s', $this->shellPath($this->getWebRoot()));
-      $config_commands[] = 'drupal config:import';
-      $config_commands[] = 'drupal cache:rebuild';
-      $config_command = implode(' && ', $config_commands);
-
-      $this->io->commentBlock($config_command);
-
-      try {
-        $shellProcess->exec($config_command, TRUE);
-      }
-      catch (ProcessFailedException $e) {
-      }
-    }
-
   }
 
   /**
@@ -118,7 +103,7 @@ private function addModuleEnableCommands(&$commands) {
 
       // Drupal 8 only;
       if ($this->getDrupalVersion() === 8) {
-        $commands[] = sprintf('drupal module:install %s', implode(', ', $this->config['modules']['enable']));
+        $commands[] = sprintf('drush en -y %s', implode(', ', $this->config['modules']['enable']));
       }
     }
   }
@@ -137,7 +122,7 @@ private function addModuleDisableCommands(&$commands) {
 
       // Drupal 8 only;
       if ($this->getDrupalVersion() === 8) {
-        $commands[] = sprintf('drupal module:uninstall %s', implode(', ', $this->config['modules']['disable']));
+        $commands[] = sprintf('drush pm-uninstall -y %s', implode(', ', $this->config['modules']['disable']));
       }
     }
   }