From 749f3c3ceed18f4e34a938307ec6d25555e2bfcc Mon Sep 17 00:00:00 2001
From: voidtek <vdacosta@voidtek.com>
Date: Mon, 1 Oct 2018 09:08:34 +0000
Subject: [PATCH] OPENEUROPA-1149: Update the logic of the force option.

---
 composer.json                                           | 2 +-
 config/runner.yml                                       | 1 -
 src/Commands/DrupalCommands.php                         | 4 ++--
 tests/fixtures/commands/drupal-settings-setup-force.yml | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index c1c3099a..3daf81a1 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "consolidation/robo": "^1.2.2",
+        "consolidation/robo": "^1.3",
         "gitonomy/gitlib": "^1.0",
         "nuvoleweb/robo-config": "^0.2.1",
         "jakeasmith/http_build_url": "^1.0.1"
diff --git a/config/runner.yml b/config/runner.yml
index a98ef9b6..07af8532 100644
--- a/config/runner.yml
+++ b/config/runner.yml
@@ -33,7 +33,6 @@ drupal:
     sites_subdir: "default"
     config_dir: ~
     settings_override_file: "settings.override.php"
-    force: true
 
   # Administrator account information.
   account:
diff --git a/src/Commands/DrupalCommands.php b/src/Commands/DrupalCommands.php
index 4ceb84be..9fedb934 100644
--- a/src/Commands/DrupalCommands.php
+++ b/src/Commands/DrupalCommands.php
@@ -280,7 +280,7 @@ public function drushSetup(array $options = [
      * @option root                     Drupal root.
      * @option sites-subdir             Drupal site subdirectory.
      * @option settings-override-file   Drupal site settings override filename.
-     * @option force                    Drupal force site settings override.
+     * @option force                    Drupal force generation of a new settings.php.
      *
      * @param array $options
      *
@@ -290,7 +290,7 @@ public function settingsSetup(array $options = [
         'root' => InputOption::VALUE_REQUIRED,
         'sites-subdir' => InputOption::VALUE_REQUIRED,
         'settings-override-file' => InputOption::VALUE_REQUIRED,
-        'force' => InputOption::VALUE_REQUIRED,
+        'force' => false,
     ])
     {
         $settings_default_path = $options['root'] . '/sites/' . $options['sites-subdir'] . '/default.settings.php';
diff --git a/tests/fixtures/commands/drupal-settings-setup-force.yml b/tests/fixtures/commands/drupal-settings-setup-force.yml
index 2bc9fd7b..ae080c86 100644
--- a/tests/fixtures/commands/drupal-settings-setup-force.yml
+++ b/tests/fixtures/commands/drupal-settings-setup-force.yml
@@ -14,4 +14,4 @@
   expected:
     - file: "build/sites/default/settings.php"
       contains: "include $app_root . '/' . $site_path . '/settings.override.php';"
-      not_contains: "# Already existing file."
\ No newline at end of file
+      not_contains: "# Already existing file."