MAGETWO-36920: Use dashes instead of underscores in option names

- db-host
- db-name
- db-user
- db-password
- db-prefix
- db-model
- db_init_statements

dev/tests/api-functional/config/install-config-mysql.php.dist

@@ -9,10 +9,10 @@ return [
     'language'                     => 'en_US',
     'timezone'                     => 'America/Los_Angeles',
     'currency'                     => 'USD',
-    'db_host'                      => 'localhost',
-    'db_name'                      => 'magento_functional_tests',
-    'db_user'                      => 'root',
-    'db_password'                  => '',
+    'db-host'                      => 'localhost',
+    'db-name'                      => 'magento_functional_tests',
+    'db-user'                      => 'root',
+    'db-password'                  => '',
     'backend-frontname'            => 'backend',
     'base_url'                     => 'http://localhost/',
     'use_secure'                   => '0',

dev/tests/integration/etc/install-config-mysql.php.dist

@@ -5,11 +5,11 @@
  */
 
 return [
-    'db_host' => 'localhost',
-    'db_user' => 'root',
-    'db_password' => '',
-    'db_name' => 'magento_integration_tests',
-    'db_prefix' => '',
+    'db-host' => 'localhost',
+    'db-user' => 'root',
+    'db-password' => '',
+    'db-name' => 'magento_integration_tests',
+    'db-prefix' => '',
     'backend-frontname' => 'backend',
     'admin_user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
     'admin_password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,

dev/tests/integration/etc/install-config-mysql.travis.php.dist

@@ -5,11 +5,11 @@
  */
 
 return [
-    'db_host' => '127.0.0.1',
-    'db_user' => 'travis',
-    'db_password' => '',
-    'db_name' => 'magento_integration_tests',
-    'db_prefix' => 'travis_',
+    'db-host' => '127.0.0.1',
+    'db-user' => 'travis',
+    'db-password' => '',
+    'db-name' => 'magento_integration_tests',
+    'db-prefix' => 'travis_',
     'backend-frontname' => 'backend',
     'admin_user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
     'admin_password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,

dev/tests/integration/framework/Magento/TestFramework/Application.php

@@ -172,10 +172,10 @@ class Application
                 $dbName = $dbInfo['dbname'];
             } else {
                 $installConfig = $this->getInstallConfig();
-                $host = $installConfig['db_host'];
-                $user = $installConfig['db_user'];
-                $password = $installConfig['db_password'];
-                $dbName = $installConfig['db_name'];
+                $host = $installConfig['db-host'];
+                $user = $installConfig['db-user'];
+                $password = $installConfig['db-password'];
+                $dbName = $installConfig['db-name'];
             }
             $this->_db = new Db\Mysql(
                 $host,

dev/tests/integration/testsuite/Magento/DatabaseTest.php

@@ -21,7 +21,7 @@ class DatabaseTest extends \PHPUnit_Framework_TestCase
 
         $db = Bootstrap::getInstance()->getBootstrap()->getApplication()->getDbInstance();
         $command = $checkerPath . ' -d ' . $db->getSchema()
-            . ' h=' . $db->getHost()['db_host'] . ',u=' . $db->getUser() . ',p=' . $db->getPassword();
+            . ' h=' . $db->getHost()['db-host'] . ',u=' . $db->getUser() . ',p=' . $db->getPassword();
 
         exec($command, $output, $exitCode);
         $this->assertEquals(0, $exitCode);

dev/tests/performance/config.php.dist

@@ -13,10 +13,10 @@ return array(
                 'language'                   => 'en_US',
                 'timezone'                   => 'America/Los_Angeles',
                 'currency'                   => 'USD',
-                'db_host'                    => 'localhost',
-                'db_name'                    => 'magento',
-                'db_user'                    => 'root',
-                'db_password'                => '',
+                'db-host'                    => 'localhost',
+                'db-name'                    => 'magento',
+                'db-user'                    => 'root',
+                'db-password'                => '',
                 'use_secure'                 => '0',
                 'use_secure_admin'           => '0',
                 'use_rewrites'               => '0',

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

@@ -34,13 +34,13 @@ class ConfigOptionsList implements ConfigOptionsListInterface
     const INPUT_KEY_ENCRYPTION_KEY = 'key';
     const INPUT_KEY_SESSION_SAVE = 'session-save';
     const INPUT_KEY_DEFINITION_FORMAT = 'definition-format';
-    const INPUT_KEY_DB_HOST = 'db_host';
-    const INPUT_KEY_DB_NAME = 'db_name';
-    const INPUT_KEY_DB_USER = 'db_user';
-    const INPUT_KEY_DB_PASSWORD = 'db_password';
-    const INPUT_KEY_DB_PREFIX = 'db_prefix';
-    const INPUT_KEY_DB_MODEL = 'db_model';
-    const INPUT_KEY_DB_INIT_STATEMENTS = 'db_init_statements';
+    const INPUT_KEY_DB_HOST = 'db-host';
+    const INPUT_KEY_DB_NAME = 'db-name';
+    const INPUT_KEY_DB_USER = 'db-user';
+    const INPUT_KEY_DB_PASSWORD = 'db-password';
+    const INPUT_KEY_DB_PREFIX = 'db-prefix';
+    const INPUT_KEY_DB_MODEL = 'db-model';
+    const INPUT_KEY_DB_INIT_STATEMENTS = 'db-init-statements';
     const INPUT_KEY_RESOURCE = 'resource';
     /**#@-*/
 

setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php

@@ -33,7 +33,7 @@ class ConfigSetCommandTest extends \PHPUnit_Framework_TestCase
         $option
             ->expects($this->any())
             ->method('getName')
-            ->will($this->returnValue('db_host'));
+            ->will($this->returnValue('db-host'));
         $this->configModel = $this->getMock('Magento\Setup\Model\ConfigModel', [], [], '', false);
         $this->configModel
             ->expects($this->exactly(2))
@@ -53,9 +53,9 @@ class ConfigSetCommandTest extends \PHPUnit_Framework_TestCase
         $this->configModel
             ->expects($this->once())
             ->method('process')
-            ->with(['db_host' => 'host']);
+            ->with(['db-host' => 'host']);
         $commandTester = new CommandTester($this->command);
-        $commandTester->execute(['--db_host' => 'host']);
+        $commandTester->execute(['--db-host' => 'host']);
         $this->assertSame(
             'You saved the new configuration.' . PHP_EOL,
             $commandTester->getDisplay()
@@ -71,7 +71,7 @@ class ConfigSetCommandTest extends \PHPUnit_Framework_TestCase
         $this->configModel
             ->expects($this->once())
             ->method('process')
-            ->with(['db_host' => 'host']);
+            ->with(['db-host' => 'host']);
         $this->checkInteraction(true);
     }
 
@@ -112,7 +112,7 @@ class ConfigSetCommandTest extends \PHPUnit_Framework_TestCase
         $this->command->setHelperSet($helperSet);
 
         $commandTester = new CommandTester($this->command);
-        $commandTester->execute(['--db_host' => 'host']);
+        $commandTester->execute(['--db-host' => 'host']);
         if ($interactionType) {
             $message = 'You saved the new configuration.' . PHP_EOL;
         } else {