Merge branch 'hotfix/3.5.20'

Author: stmh

Changelog.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.5.20 / 2020-10-11
+
+### New:
+  * Add new option `alterSettingsFile` which defaults to true
+
+### Changed:
+  * Allow inheritance to merge arrays if one of them is associative
+
 ## 3.5.19 / 2020-10-09
 
 ### Fixed:

docs/configuration.md

@@ -192,6 +192,7 @@ This will print all host configuration for the host `staging`.
 * `adminUser`, default is `admin`, the name of the admin-user to set when running the reset-task on `dev`-instances
 * `adminPass`, default is empty, will be computed on request. You can get it via `phab -c<config> get:property adminPass` -- this can be overridden per host or globally.
 * `replaceSettingsFile`, default is true. If set to false, the settings.php file will not be replaced when running an install.
+* `alterSettingsFile`, default is true. If set to false, the settings.php file wont be touched by phabalicious.
 * `installOptions` default is `distribution: minimal, locale: en, options: ''`. You can change the distribution to install and/ or the locale.
 * `drupalVersion` set the drupal-version to use. If not set phabalicious is trying to guess it from the `needs`-configuration.
 * `drushVersion` set the used crush-version, default is `8`. Drush is not 100% backwards-compatible, for phabalicious needs to know its version.

src/Method/DrushMethod.php

@@ -55,6 +55,7 @@ public function getGlobalSettings(): array
             ],
             'revertFeatures' => true,
             'replaceSettingsFile' => true,
+            'alterSettingsFile' => true,
             'configurationManagement' => [
                 'staging' => [
                     '#!drush config-import -y staging'
@@ -336,7 +337,7 @@ public function install(HostConfig $host_config, TaskContextInterface $context)
             $shell->run('#!mysql' .
                 ' -h ' . $o['host'] .
                 ' -u ' . $o['user'] .
-                ' --password=' . $o['pass'] .
+                ' --password="' . $o['pass'] . '"' .
                 ' -e "' . $cmd . '"');
         }
 
@@ -367,7 +368,8 @@ public function install(HostConfig $host_config, TaskContextInterface $context)
             if ($host_config['database']['prefix']) {
                 $cmd_options .= ' --db-prefix=' . $host_config['database']['prefix'];
             }
-            $cmd_options .= ' --db-url=mysql://' . $o['user'] . ':' . $o['pass'] . '@' . $o['host'] . '/' . $o['name'];
+            $cmd_options .= ' --db-url="mysql://' . $o['user'] . ':' . $o['pass'] .
+                '@' . $o['host'] . '/' . $o['name'] . '"';
         }
         $cmd_options .= ' ' . $host_config['installOptions']['options'];
         $this->runDrush($shell, 'site-install %s %s', $host_config['installOptions']['distribution'], $cmd_options);
@@ -662,7 +664,7 @@ private function waitForDatabase(HostConfig $host_config, TaskContextInterface $
 
     private function setupConfigurationManagement(HostConfig $host_config, TaskContextInterface $context)
     {
-        if ($host_config['drupalVersion'] < 8) {
+        if ($host_config['drupalVersion'] < 8 || empty($host_config['alterSettingsFile'])) {
             return;
         }
 

src/Utilities/Utilities.php

@@ -9,7 +9,7 @@
 class Utilities
 {
 
-    const FALLBACK_VERSION = '3.5.19';
+    const FALLBACK_VERSION = '3.5.20';
     const COMBINED_ARGUMENTS = 'combined';
     const UNNAMED_ARGUMENTS = 'unnamedArguments';
 
@@ -19,7 +19,7 @@ public static function mergeData(array $data, array $override_data): array
         foreach ($override_data as $key => $value) {
             if (isset($data[$key])) {
                 // Do a merge
-                if (self::isAssocArray($data[$key]) && self::isAssocArray($value)) {
+                if (self::isAssocArray($data[$key]) || self::isAssocArray($value)) {
                     $result[$key] = self::mergeData($data[$key], $value);
                 } else {
                     $result[$key] = $value;