Override CommandArguments::option to default option separator. (#1461)

acquia · May 2, 2017 · 473d1bb · 473d1bb
1 parent 1c13c60
commit 473d1bb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/src/Robo/Commands/Drupal/DrupalCommand.php b/src/Robo/Commands/Drupal/DrupalCommand.php
@@ -34,11 +34,11 @@ function ($string) {
       ->drush("site-install")
       ->arg($this->getConfigValue('project.profile.name'))
       ->rawArg("install_configure_form.update_status_module='array(FALSE,FALSE)'")
-      ->option('site-name', $this->getConfigValue('project.human_name'), '=')
-      ->option('site-mail', $this->getConfigValue('drupal.account.mail'), '=')
+      ->option('site-name', $this->getConfigValue('project.human_name'))
+      ->option('site-mail', $this->getConfigValue('drupal.account.mail'))
       ->option('account-name', $username, '=')
-      ->option('account-mail', $this->getConfigValue('drupal.account.mail'), '=')
-      ->option('locale', $this->getConfigValue('drupal.locale'), '=')
+      ->option('account-mail', $this->getConfigValue('drupal.account.mail'))
+      ->option('locale', $this->getConfigValue('drupal.locale'))
       ->assume(TRUE)
       ->printOutput(TRUE);
 

diff --git a/src/Robo/Commands/Setup/ConfigCommand.php b/src/Robo/Commands/Setup/ConfigCommand.php
@@ -129,10 +129,10 @@ protected function importFeatures($task, $cm_core_key) {
       // Clear drush caches to register features drush commands.
       $task->drush("cc")->arg('drush');
       foreach ($this->getConfigValue('cm.features.bundle') as $bundle) {
-        $task->drush("features-revert-all")->option('bundle', $bundle, '=');
+        $task->drush("features-revert-all")->option('bundle', $bundle);
         // Revert all features again!
         // @see https://www.drupal.org/node/2851532
-        $task->drush("features-revert-all")->option('bundle', $bundle, '=');
+        $task->drush("features-revert-all")->option('bundle', $bundle);
       }
     }
   }
@@ -151,8 +151,8 @@ protected function checkFeaturesOverrides() {
         $task = $this->taskDrush()->stopOnFail();
         foreach ($this->getConfigValue('cm.features.bundle') as $bundle) {
           $task->drush("fl")
-            ->option('bundle', $bundle, '=')
-            ->option('format', 'json', '=');
+            ->option('bundle', $bundle)
+            ->option('format', 'json');
           $result = $task->printOutput(TRUE)->run();
           $output = $result->getOutputData();
           $features_overridden = preg_match('/(changed|conflicts|added)( *)$/', $output);

diff --git a/src/Robo/Tasks/DrushTask.php b/src/Robo/Tasks/DrushTask.php
@@ -20,7 +20,9 @@
  * ```
  */
 class DrushTask extends CommandStack {
-  use CommandArguments;
+  use CommandArguments {
+    option as traitOption;
+  }
 
   /**
    * Site alias to prepend to each command.
@@ -254,7 +256,7 @@ protected function setOptionsForLastCommand() {
    */
   protected function setGlobalOptions() {
     if (isset($this->uri) && !empty($this->uri)) {
-      $this->option('uri', $this->uri, '=');
+      $this->option('uri', $this->uri);
     }
 
     if (isset($this->assume) && is_bool($this->assume)) {
@@ -271,10 +273,17 @@ protected function setGlobalOptions() {
     }
 
     if ($this->include) {
-      $this->option('include', $this->include, '=');
+      $this->option('include', $this->include);
     }
   }
 
+  /**
+   * Overriding CommandArguments::option to default option separator to '='.
+   */
+  public function option($option, $value = NULL, $separator = '=') {
+    $this->traitOption($option, $value, $separator);
+  }
+
   /**
    * Overriding parent::run() method to remove printTaskInfo() calls.
    */