MAGETWO-35748: Default Values are Set Every Time for Some Config Settings

- fixed test

Author: Ivan Gavryshko

lib/internal/Magento/Framework/Config/ConfigGenerator.php

@@ -65,7 +65,7 @@ public function createInstallConfig()
     {
         $configData = new ConfigData(ConfigFilePool::APP_CONFIG);
 
-        if (!$this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE)) {
+        if ($this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE) === null) {
             $configData->set(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE, date('r'));
         }
         return $configData;
@@ -82,7 +82,7 @@ public function createCryptConfig(array $data)
 
         $configData = new ConfigData(ConfigFilePool::APP_CONFIG);
         if (isset($data[ConfigOptionsList::INPUT_KEY_ENCRYPTION_KEY])) {
-            if ($currentKey) {
+            if ($currentKey !== null) {
                 $key = $currentKey . "\n" . $data[ConfigOptionsList::INPUT_KEY_ENCRYPTION_KEY];
             } else {
                 $key = $data[ConfigOptionsList::INPUT_KEY_ENCRYPTION_KEY];
@@ -170,10 +170,11 @@ public function createDbConfig(array $data)
             }
         }
 
-        if ($this->deploymentConfig->get(
-                ConfigOptionsList::CONFIG_PATH_DB_CONNECTION_DEFAULT . ConfigOptionsList::KEY_ACTIVE
-            ) === null
-        ) {
+        $currentStatus = $this->deploymentConfig->get(
+            ConfigOptionsList::CONFIG_PATH_DB_CONNECTION_DEFAULT . ConfigOptionsList::KEY_ACTIVE
+        );
+
+        if ($currentStatus === null) {
             $configData->set(ConfigOptionsList::CONFIG_PATH_DB_CONNECTION_DEFAULT . ConfigOptionsList::KEY_ACTIVE, '1');
         }
 
@@ -189,7 +190,7 @@ public function createResourceConfig()
     {
         $configData = new ConfigData(ConfigFilePool::APP_CONFIG);
 
-        if (!$this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_RESOURCE_DEFAULT_SETUP)) {
+        if ($this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_RESOURCE_DEFAULT_SETUP) === null) {
             $configData->set(ConfigOptionsList::CONFIG_PATH_RESOURCE_DEFAULT_SETUP, 'default');
         }
 

setup/src/Magento/Setup/Model/Installer.php

@@ -435,8 +435,7 @@ public function installDeploymentConfig($data)
         // reset object manager now that there is a deployment config
         $this->objectManagerProvider->reset();
     }
-
-
+    
     /**
      * Sets defaults if user input is missing
      *
@@ -457,8 +456,12 @@ private function setDefaultValues(array $userData)
         if (!isset($userData[ConfigOptionsList::INPUT_KEY_DB_INIT_STATEMENTS])) {
             $userData[ConfigOptionsList::INPUT_KEY_DB_INIT_STATEMENTS] = 'SET NAMES utf8;';
         }
+        if (!isset($userData[ConfigOptionsList::INPUT_KEY_DB_PREFIX])) {
+            $userData[ConfigOptionsList::INPUT_KEY_DB_PREFIX] = '';
+        }
         return $userData;
     }
+
     /**
      * Set up setup_module table to register modules' versions, skip this process if it already exists
      *