diff --git a/app/code/Magento/Backend/Setup/ConfigOptionsList.php b/app/code/Magento/Backend/Setup/ConfigOptionsList.php index 83a953cd2f2232cc36e741682e95e3c406dfc194..4872cd18fe2099561e1b9bf5cb580ea43d756f56 100644 --- a/app/code/Magento/Backend/Setup/ConfigOptionsList.php +++ b/app/code/Magento/Backend/Setup/ConfigOptionsList.php @@ -19,7 +19,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface /** * Input key for the options */ - const INPUT_KEY_BACKEND_FRONTNAME = 'backend_frontname'; + const INPUT_KEY_BACKEND_FRONTNAME = 'backend-frontname'; /** * Path to the values in the deployment config diff --git a/dev/tests/api-functional/config/install-config-mysql.php.dist b/dev/tests/api-functional/config/install-config-mysql.php.dist index 535cfb7232e8f1ef2a58a98916fe49b98bea5d6a..a6ed54006dddb5d32c808c913a89769167235f29 100644 --- a/dev/tests/api-functional/config/install-config-mysql.php.dist +++ b/dev/tests/api-functional/config/install-config-mysql.php.dist @@ -13,7 +13,7 @@ return [ 'db_name' => 'magento_functional_tests', 'db_user' => 'root', 'db_password' => '', - 'backend_frontname' => 'backend', + 'backend-frontname' => 'backend', 'base_url' => 'http://localhost/', 'use_secure' => '0', 'use_rewrites' => '0', diff --git a/dev/tests/integration/etc/install-config-mysql.php.dist b/dev/tests/integration/etc/install-config-mysql.php.dist index 0d8fb591eb14454b4d3c46045e3606ab6e47dea3..1887855e3a1e2b728203993d00a9afaed0fba0ef 100644 --- a/dev/tests/integration/etc/install-config-mysql.php.dist +++ b/dev/tests/integration/etc/install-config-mysql.php.dist @@ -10,7 +10,7 @@ return [ 'db_password' => '', 'db_name' => 'magento_integration_tests', 'db_prefix' => '', - 'backend_frontname' => 'backend', + 'backend-frontname' => 'backend', 'admin_user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME, 'admin_password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD, 'admin_email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL, diff --git a/dev/tests/integration/etc/install-config-mysql.travis.php.dist b/dev/tests/integration/etc/install-config-mysql.travis.php.dist index a0e25fd80384beb21201843bca7e59a435a26c34..5e4a2a5138452ac89a0cfe3709855f20cc7b4913 100644 --- a/dev/tests/integration/etc/install-config-mysql.travis.php.dist +++ b/dev/tests/integration/etc/install-config-mysql.travis.php.dist @@ -10,7 +10,7 @@ return [ 'db_password' => '', 'db_name' => 'magento_integration_tests', 'db_prefix' => 'travis_', - 'backend_frontname' => 'backend', + 'backend-frontname' => 'backend', 'admin_user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME, 'admin_password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD, 'admin_email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL, diff --git a/dev/tests/performance/config.php.dist b/dev/tests/performance/config.php.dist index e145b9768ffe2d8b6178edc2e718e0c8220d0770..5e70a3617ac8e306282c45a840c6a6dca12c3306 100644 --- a/dev/tests/performance/config.php.dist +++ b/dev/tests/performance/config.php.dist @@ -26,7 +26,7 @@ return array( 'admin_user' => 'admin', 'admin_password' => '123123q', 'admin_use_security_key' => '0', - 'backend_frontname' => 'backend', + 'backend-frontname' => 'backend', ), 'options_no_value' => array( 'cleanup_database', diff --git a/dev/tests/performance/framework/Magento/TestFramework/Performance/Config.php b/dev/tests/performance/framework/Magento/TestFramework/Performance/Config.php index bd01b881c6bb9bb427690147be710d7a21a1900f..75eab279b5855ca01cd90e6321e0882a223a8e47 100644 --- a/dev/tests/performance/framework/Magento/TestFramework/Performance/Config.php +++ b/dev/tests/performance/framework/Magento/TestFramework/Performance/Config.php @@ -117,7 +117,7 @@ class Config } // Validate admin options data - $requiredAdminKeys = ['admin_user', 'admin_password', 'backend_frontname']; + $requiredAdminKeys = ['admin_user', 'admin_password', 'backend-frontname']; foreach ($requiredAdminKeys as $requiredKeyName) { if (empty($configData['application']['installation']['options'][$requiredKeyName])) { throw new \Magento\Framework\Exception\LocalizedException( @@ -277,7 +277,7 @@ class Config \Magento\TestFramework\Performance\Scenario::ARG_HOST => $this->getApplicationUrlHost(), \Magento\TestFramework\Performance\Scenario::ARG_PATH => $this->getApplicationUrlPath(), \Magento\TestFramework\Performance\Scenario::ARG_BASEDIR => $this->getApplicationBaseDir(), - \Magento\TestFramework\Performance\Scenario::ARG_BACKEND_FRONTNAME => $options['backend_frontname'], + \Magento\TestFramework\Performance\Scenario::ARG_BACKEND_FRONTNAME => $options['backend-frontname'], \Magento\TestFramework\Performance\Scenario::ARG_ADMIN_USER => $options['admin_user'], \Magento\TestFramework\Performance\Scenario::ARG_ADMIN_PASSWORD => $options['admin_password'], 'jmeter.save.saveservice.output_format' => 'xml', diff --git a/dev/tests/performance/framework/Magento/TestFramework/Performance/Scenario.php b/dev/tests/performance/framework/Magento/TestFramework/Performance/Scenario.php index ab19c64f5aebea70028fa971cd2b2c8a96995ee8..bcb56c85e197104200864d5c0a5cee8f4734d955 100644 --- a/dev/tests/performance/framework/Magento/TestFramework/Performance/Scenario.php +++ b/dev/tests/performance/framework/Magento/TestFramework/Performance/Scenario.php @@ -28,7 +28,7 @@ class Scenario const ARG_ADMIN_PASSWORD = 'admin_password'; - const ARG_BACKEND_FRONTNAME = 'backend_frontname'; + const ARG_BACKEND_FRONTNAME = 'backend-frontname'; /**#@-*/ diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php index 39685b58894125220e63fd532b39f5b0f54282ac..7a2dba1f220c4a2c4461252a65b40d3cc780e450 100644 --- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php +++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php @@ -144,7 +144,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase $expectedOptions = [ 'option1' => 'value 1', 'option2' => 'value 2', - 'backend_frontname' => 'backend', + 'backend-frontname' => 'backend', 'admin_user' => 'admin', 'admin_password' => 'password1', ]; diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_dist/config.php.dist b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_dist/config.php.dist index 6db1c505bff49c76b7f1472e68c6f83022d73eb4..7f63b4ad90f9124818605fde4b5ea7f335cd7da4 100644 --- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_dist/config.php.dist +++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_dist/config.php.dist @@ -10,7 +10,7 @@ return array( 'url_path' => '/', 'installation' => array( 'options' => array( - 'backend_frontname' => 'backend', + 'backend-frontname' => 'backend', 'admin_user' => 'admin', 'admin_password' => 'password1', ), diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php index 463b896d34d68ed13d2a2b1dd7c1c70e1d8e9126..a85b38987cd542d91ffab2b6de9a16c617aa4afc 100644 --- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php +++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php @@ -10,7 +10,7 @@ return [ 'url_path' => '/', 'installation' => [ 'options' => [ - 'backend_frontname' => 'backend', + 'backend-frontname' => 'backend', 'admin_user' => 'admin', 'admin_password' => 'password1', ], diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php.dist b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php.dist index 577aadcc45bac471f1262da433d3ae0decc30fd3..21325212b5a8ddf15e11448969b0d486fd1bd2cb 100644 --- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php.dist +++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php.dist @@ -10,7 +10,7 @@ return array( 'url_path' => '/', 'installation' => array( 'options' => array( - 'backend_frontname' => 'backend', + 'backend-frontname' => 'backend', 'admin_user' => 'admin', 'admin_password' => 'password1', ), diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/config_data.php b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/config_data.php index eaa852c5e31a6ece36b932dfac4c552430aee3dd..629f6737ca11c489437a1d350fc9da2185e8fa3b 100644 --- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/config_data.php +++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/config_data.php @@ -12,7 +12,7 @@ return [ 'options' => [ 'option1' => 'value 1', 'option2' => 'value 2', - 'backend_frontname' => 'backend', + 'backend-frontname' => 'backend', 'admin_user' => 'admin', 'admin_password' => 'password1', ], diff --git a/dev/tests/performance/testsuite/backend.jmx b/dev/tests/performance/testsuite/backend.jmx index 7108005cdfa54d60462f05c561aff65d064fec08..28ca78a63bc57193694b1b4525c3612bd8935af9 100644 --- a/dev/tests/performance/testsuite/backend.jmx +++ b/dev/tests/performance/testsuite/backend.jmx @@ -20,7 +20,7 @@ </elementProp> <elementProp name="ADMIN_PATH" elementType="Argument"> <stringProp name="Argument.name">ADMIN_PATH</stringProp> - <stringProp name="Argument.value">${__P(path,/)}${__P(backend_frontname,backend)}/</stringProp> + <stringProp name="Argument.value">${__P(path,/)}${__P(backend-frontname,backend)}/</stringProp> <stringProp name="Argument.metadata">=</stringProp> </elementProp> <elementProp name="ADMIN_USER" elementType="Argument"> diff --git a/dev/tests/performance/testsuite/checkout.jmx b/dev/tests/performance/testsuite/checkout.jmx index aa9c58a401a7a44444d236e723da72d3951057e7..38e52803f7de4f0869f431f7359568b2e5557a6c 100644 --- a/dev/tests/performance/testsuite/checkout.jmx +++ b/dev/tests/performance/testsuite/checkout.jmx @@ -40,7 +40,7 @@ </elementProp> <elementProp name="ADMIN_PATH" elementType="Argument"> <stringProp name="Argument.name">ADMIN_PATH</stringProp> - <stringProp name="Argument.value">${__P(path,/)}${__P(backend_frontname,backend)}/</stringProp> + <stringProp name="Argument.value">${__P(path,/)}${__P(backend-frontname,backend)}/</stringProp> <stringProp name="Argument.metadata">=</stringProp> </elementProp> <elementProp name="ADMIN_USER" elementType="Argument"> diff --git a/dev/tests/performance/testsuite/product_edit.jmx b/dev/tests/performance/testsuite/product_edit.jmx index 384381cac015b0f43400f9790a8539e25d95bee9..8e2f81f8ae1a11209665b3ffa8b132573b440cad 100644 --- a/dev/tests/performance/testsuite/product_edit.jmx +++ b/dev/tests/performance/testsuite/product_edit.jmx @@ -20,7 +20,7 @@ </elementProp> <elementProp name="ADMIN_PATH" elementType="Argument"> <stringProp name="Argument.name">ADMIN_PATH</stringProp> - <stringProp name="Argument.value">${__P(path,/)}${__P(backend_frontname,backend)}/</stringProp> + <stringProp name="Argument.value">${__P(path,/)}${__P(backend-frontname,backend)}/</stringProp> <stringProp name="Argument.metadata">=</stringProp> </elementProp> <elementProp name="USERS" elementType="Argument"> diff --git a/dev/tests/performance/testsuite/reusable/admin_login.jmx b/dev/tests/performance/testsuite/reusable/admin_login.jmx index 57f291edb6a81a9f407a7e481a46e5b6781b3ba6..8964b81dcb3e76ec270316e91d9d437253f969c2 100644 --- a/dev/tests/performance/testsuite/reusable/admin_login.jmx +++ b/dev/tests/performance/testsuite/reusable/admin_login.jmx @@ -155,7 +155,7 @@ </elementProp> <elementProp name="ADMIN_PATH" elementType="Argument"> <stringProp name="Argument.name">ADMIN_PATH</stringProp> - <stringProp name="Argument.value">${__P(path,/)}${__P(backend_frontname,backend)}/</stringProp> + <stringProp name="Argument.value">${__P(path,/)}${__P(backend-frontname,backend)}/</stringProp> <stringProp name="Argument.metadata">=</stringProp> </elementProp> <elementProp name="ADMIN_USER" elementType="Argument">