OPENEUROPA-1149: Update the logic of the force option.

openeuropa · Oct 1, 2018 · 63f4048 · 63f4048
1 parent e19ac9b
commit 63f4048
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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';