Skip to content

Commit b621c46

Browse files
author
Bohdan Korablov
committed
MAGETWO-65422: Write default configs to shared configuration file by app:config:dump
1 parent eb21ab1 commit b621c46

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

app/code/Magento/Store/Model/ScopeTypeNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Store\Model;

app/code/Magento/Store/Test/Unit/Model/ScopeTypeNormalizerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Store\Test\Unit\Model;

dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ function (Mock $output) {
492492
$output->expects($this->once())
493493
->method('writeln')
494494
->with(
495-
'<error>Invalid value. Value must be a URL or one of placeholders: {{base_url}}</error>'
495+
'<error>Invalid Base URL. Value must be a URL or one of placeholders: {{base_url}}</error>'
496496
);
497497
},
498498
'web/unsecure/base_url',

dev/tests/integration/testsuite/Magento/Deploy/Console/Command/App/ConfigImportCommandTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,10 @@ public function testImportConfig()
287287

288288
$commandTester->execute([]);
289289

290-
$this->assertContains('Import failed: Invalid value. Value must be', $commandTester->getDisplay());
290+
$this->assertContains(
291+
'Invalid Secure Base URL. Value must be a URL or one of placeholders: {{base_url}},{{unsecure_base_url}}',
292+
$commandTester->getDisplay()
293+
);
291294
$this->assertSame(Cli::RETURN_FAILURE, $commandTester->getStatusCode());
292295

293296
$this->writeConfig($this->config, $wrongCurrency);

0 commit comments

Comments
 (0)