Skip to content

Commit 782a084

Browse files
author
Olga Kopylova
committed
MAGETWO-36172: Contribution of Sprint 27
Merge remote-tracking branch 'origin/MAGETWO-34621-move-update-commands' into develop Conflicts: composer.lock dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
2 parents d4f4da9 + bfe305b commit 782a084

File tree

102 files changed

+3498
-2568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+3498
-2568
lines changed

‎bin/magento‎

100644100755
File mode changed.

‎composer.lock‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ return [
1212
'db_host' => 'localhost',
1313
'db_name' => 'magento_functional_tests',
1414
'db_user' => 'root',
15-
'db_pass' => '',
15+
'db_password' => '',
1616
'backend_frontname' => 'backend',
1717
'base_url' => 'http://localhost/',
1818
'use_secure' => '0',
1919
'use_rewrites' => '0',
2020
'admin_lastname' => 'Admin',
2121
'admin_firstname' => 'Admin',
2222
'admin_email' => 'admin@example.com',
23-
'admin_username' => 'admin',
23+
'admin_user' => 'admin',
2424
'admin_password' => '123123q',
2525
'admin_use_security_key' => '0',
2626
/* PayPal has limitation for order number - 20 characters. 10 digits prefix + 8 digits number is good enough */

‎dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function install()
3333

3434
/* Install application */
3535
if ($installOptions) {
36-
$installCmd = 'php -f ' . BP . '/setup/index.php install';
36+
$installCmd = 'php -f ' . BP . '/bin/magento setup:install';
3737
$installArgs = [];
3838
foreach ($installOptions as $optionName => $optionValue) {
3939
if (is_bool($optionValue)) {

‎dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function __inject(Install $installPage, CmsIndex $homePage)
9090
{
9191
$magentoBaseDir = dirname(dirname(dirname(MTF_BP)));
9292
// Uninstall Magento.
93-
shell_exec("php -f $magentoBaseDir/setup/index.php uninstall");
93+
shell_exec("php -f $magentoBaseDir/bin/magento setup:uninstall -n");
9494
$this->installPage = $installPage;
9595
$this->homePage = $homePage;
9696
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
return [
88
'db_host' => 'localhost',
99
'db_user' => 'root',
10-
'db_pass' => '',
10+
'db_password' => '',
1111
'db_name' => 'magento_integration_tests',
1212
'db_prefix' => '',
1313
'backend_frontname' => 'backend',
14-
'admin_username' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
14+
'admin_user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
1515
'admin_password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
1616
'admin_email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
1717
'admin_firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
return [
88
'db_host' => '127.0.0.1',
99
'db_user' => 'travis',
10-
'db_pass' => '',
10+
'db_password' => '',
1111
'db_name' => 'magento_integration_tests',
1212
'db_prefix' => 'travis_',
1313
'backend_frontname' => 'backend',
14-
'admin_username' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
14+
'admin_user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
1515
'admin_password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
1616
'admin_email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
1717
'admin_firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public function getDbInstance()
174174
$installConfig = $this->getInstallConfig();
175175
$host = $installConfig['db_host'];
176176
$user = $installConfig['db_user'];
177-
$password = $installConfig['db_pass'];
177+
$password = $installConfig['db_password'];
178178
$dbName = $installConfig['db_name'];
179179
}
180180
$this->_db = new Db\Mysql(
@@ -371,12 +371,16 @@ public function run()
371371
*/
372372
public function cleanup()
373373
{
374+
$this->_ensureDirExists($this->installDir);
375+
$this->_ensureDirExists($this->_configDir);
376+
377+
$this->copyAppConfigFiles();
374378
/**
375379
* @see \Magento\Setup\Mvc\Bootstrap\InitParamListener::BOOTSTRAP_PARAM
376380
*/
377381
$this->_shell->execute(
378-
'php -f %s uninstall --magento_init_params=%s',
379-
[BP . '/setup/index.php', $this->getInitParamsQuery()]
382+
'php -f %s setup:uninstall -n --magento_init_params=%s',
383+
[BP . '/bin/magento', $this->getInitParamsQuery()]
380384
);
381385
}
382386

@@ -407,8 +411,8 @@ public function install()
407411

408412
// run install script
409413
$this->_shell->execute(
410-
'php -f %s install ' . implode(' ', array_keys($installParams)),
411-
array_merge([BP . '/setup/index.php'], array_values($installParams))
414+
'php -f %s setup:install ' . implode(' ', array_keys($installParams)),
415+
array_merge([BP . '/bin/magento'], array_values($installParams))
412416
);
413417

414418
// enable only specified list of caches

‎dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function testValidationUpToDateDb()
1515
/**
1616
* @magentoDbIsolation enabled
1717
* @expectedException \Magento\Framework\Exception\LocalizedException
18-
* @expectedExceptionMessage Please update your database
18+
* @expectedExceptionMessage Please upgrade your database
1919
*/
2020
public function testValidationOutdatedDb()
2121
{

‎dev/tests/performance/config.php.dist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ return array(
1616
'db_host' => 'localhost',
1717
'db_name' => 'magento',
1818
'db_user' => 'root',
19-
'db_pass' => '',
19+
'db_password' => '',
2020
'use_secure' => '0',
2121
'use_secure_admin' => '0',
2222
'use_rewrites' => '0',
2323
'admin_lastname' => 'Admin',
2424
'admin_firstname' => 'Admin',
2525
'admin_email' => 'admin@example.com',
26-
'admin_username' => 'admin',
26+
'admin_user' => 'admin',
2727
'admin_password' => '123123q',
2828
'admin_use_security_key' => '0',
2929
'backend_frontname' => 'backend',

0 commit comments

Comments
 (0)