Skip to content

Commit 4f878da

Browse files
committed
Merge remote-tracking branch 'origin/AC-15248' into spartans_pr_31072025_AC-15248
2 parents e347a9f + 24de48e commit 4f878da

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

dev/tests/integration/framework/Magento/TestFramework/App/Config.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?php
22
/**
3-
* Application configuration object. Used to access configuration when application is initialized and installed.
4-
*
5-
* Copyright © Magento, Inc. All rights reserved.
6-
* See COPYING.txt for license details.
3+
* Copyright 2016 Adobe
4+
* All Rights Reserved.
75
*/
86
namespace Magento\TestFramework\App;
97

@@ -77,7 +75,8 @@ public function setValue(
7775
}
7876

7977
if (empty($scopeCode)) {
80-
$scopeCode = $this->getScopeCodeResolver()->resolve($scope, $scopeCode);
78+
$scopeCode = $this->getScopeCodeResolver()
79+
->resolve(ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode);
8180
}
8281

8382
$keys = explode('/', $path);

dev/tests/integration/testsuite/Magento/Integration/_files/integration_all_data.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2021 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -14,8 +14,8 @@
1414
$data = [
1515
'name' => 'Fixture Integration',
1616
'email' => '[email protected]',
17-
'endpoint' => 'https://example.com/endpoint',
18-
'identity_link_url' => 'https://example.com/link',
17+
'endpoint' => 'http://localhost/endpoint',
18+
'identity_link_url' => 'http://localhost/link',
1919
'all_resources' => 0,
2020
];
2121
$integrationService->create($data);

0 commit comments

Comments
 (0)