Skip to content

Commit c08ade3

Browse files
committed
MAGETWO-35135: Integrate config command
- fixing phpmd error
1 parent ef445a0 commit c08ade3

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

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

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -422,18 +422,7 @@ public function installDeploymentConfig($data)
422422
$userData = is_array($data) ? $data : $data->getArrayCopy();
423423

424424
// TODO: remove this when moving install command to symfony
425-
if (!isset($userData[ConfigOptionsList::INPUT_KEY_SESSION_SAVE])) {
426-
$userData[ConfigOptionsList::INPUT_KEY_SESSION_SAVE] = ConfigOptionsList::SESSION_SAVE_FILES;
427-
}
428-
if (!isset($userData[ConfigOptionsList::INPUT_KEY_DB_PASS])) {
429-
$userData[ConfigOptionsList::INPUT_KEY_DB_PASS] = '';
430-
}
431-
if (!isset($userData[ConfigOptionsList::INPUT_KEY_DB_MODEL])) {
432-
$userData[ConfigOptionsList::INPUT_KEY_DB_MODEL] = 'mysql4';
433-
}
434-
if (!isset($userData[ConfigOptionsList::INPUT_KEY_DB_INIT_STATEMENTS])) {
435-
$userData[ConfigOptionsList::INPUT_KEY_DB_INIT_STATEMENTS] = 'SET NAMES utf8;';
436-
}
425+
$userData = $this->setDefaultValues($userData);
437426

438427
$this->setupConfigModel->process($userData);
439428

@@ -447,6 +436,29 @@ public function installDeploymentConfig($data)
447436
$this->objectManagerProvider->reset();
448437
}
449438

439+
440+
/**
441+
* Sets defaults if user input is missing
442+
*
443+
* @param array $userData
444+
* @return array
445+
*/
446+
private function setDefaultValues(array $userData)
447+
{
448+
if (!isset($userData[ConfigOptionsList::INPUT_KEY_SESSION_SAVE])) {
449+
$userData[ConfigOptionsList::INPUT_KEY_SESSION_SAVE] = ConfigOptionsList::SESSION_SAVE_FILES;
450+
}
451+
if (!isset($userData[ConfigOptionsList::INPUT_KEY_DB_PASS])) {
452+
$userData[ConfigOptionsList::INPUT_KEY_DB_PASS] = '';
453+
}
454+
if (!isset($userData[ConfigOptionsList::INPUT_KEY_DB_MODEL])) {
455+
$userData[ConfigOptionsList::INPUT_KEY_DB_MODEL] = 'mysql4';
456+
}
457+
if (!isset($userData[ConfigOptionsList::INPUT_KEY_DB_INIT_STATEMENTS])) {
458+
$userData[ConfigOptionsList::INPUT_KEY_DB_INIT_STATEMENTS] = 'SET NAMES utf8;';
459+
}
460+
return $userData;
461+
}
450462
/**
451463
* Set up setup_module table to register modules' versions, skip this process if it already exists
452464
*

0 commit comments

Comments
 (0)