Merge pull request #52 from schloram/schloram-patch-1

helhum · Feb 7, 2024 · 785883c · 785883c
2 parents bd32e6c + cecccdf
commit 785883c
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Install/Action/SetupConfigurationAction.php b/src/Install/Action/SetupConfigurationAction.php
@@ -89,6 +89,9 @@ private function populateCustomSettings(array $actionDefinition, array $options)
         foreach ($arguments as $argumentName => $argumentValue) {
             $customConfig = Config::setValue($customConfig, $argumentDefinitions[$argumentName]['configPath'], $argumentValue);
         }
+        if ($customConfig === []) {
+            return;
+        }
         $this->addValuesToOverrides($customConfig);
     }
 
@@ -125,8 +128,12 @@ private function removeOverrides(array $actionDefinition): void
     private function addValuesToOverrides(array $values): void
     {
         $configFile = SettingsFiles::getOverrideSettingsFile();
-        $currentConfig = (new ConfigurationReaderFactory(dirname($configFile)))->createReader($configFile)->readConfig();
-        $this->configDumper->dumpToFile(array_replace_recursive($currentConfig, $values), $configFile);
+        $reader = (new ConfigurationReaderFactory(dirname($configFile)))->createReader($configFile);
+        $currentConfig = $reader->hasConfig() ? $reader->readConfig() : [];
+        $this->configDumper->dumpToFile(
+            array_replace_recursive($currentConfig, $values),
+            $configFile
+        );
     }
 
     private function copyEnvDistFile(): void