Skip to content

Commit fc748b1

Browse files
sverasvera
authored
Merge branch '2.4-develop' into purchase-order-graphql
2 parents 898e704 + fd4a70e commit fc748b1

File tree

8 files changed

+46
-61
lines changed

8 files changed

+46
-61
lines changed

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminCreateActiveHtmlTermEntityTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@
2121
</annotations>
2222
<before>
2323
<magentoCLI command="config:set checkout/options/enable_agreements 1" stepKey="setEnableTermsOnCheckout"/>
24-
24+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2525
<createData entity="SimpleTwo" stepKey="createProduct"/>
2626
<magentoCron stepKey="runCronIndex" groups="index"/>
2727

2828
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
2929
</before>
3030
<after>
3131
<magentoCLI command="config:set checkout/options/enable_agreements 0" stepKey="setDisableTermsOnCheckout"/>
32+
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
3233
<deleteData createDataKey="createProduct" stepKey="deletedProduct"/>
3334

3435
<actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openTermsGridToDelete"/>

‎app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,20 @@ class EnvironmentConfigSource implements ConfigSourceInterface
3333
*/
3434
private $placeholder;
3535

36+
/**
37+
* cache for loadConfig()
38+
*
39+
* @var array|null
40+
*/
41+
private $loadConfigCache;
42+
43+
/**
44+
* cache for loadConfig()
45+
*
46+
* @var string|null
47+
*/
48+
private $loadConfigCacheEnv;
49+
3650
/**
3751
* @param ArrayManager $arrayManager
3852
* @param PlaceholderFactory $placeholderFactory
@@ -57,27 +71,32 @@ public function get($path = '')
5771

5872
/**
5973
* Loads config from environment variables.
74+
* Caching the result for when this method is called multiple times.
75+
* The environment variables don't change in run time, so it is safe to cache.
6076
*
6177
* @return array
6278
*/
6379
private function loadConfig()
6480
{
6581
$config = [];
66-
82+
// phpcs:disable Magento2.Security.Superglobal
6783
$environmentVariables = $_ENV;
68-
84+
// phpcs:enable
85+
if (null !== $this->loadConfigCache && $this->loadConfigCacheEnv === $environmentVariables) {
86+
return $this->loadConfigCache;
87+
}
6988
foreach ($environmentVariables as $template => $value) {
7089
if (!$this->placeholder->isApplicable($template)) {
7190
continue;
7291
}
73-
7492
$config = $this->arrayManager->set(
7593
$this->placeholder->restore($template),
7694
$config,
7795
$value
7896
);
7997
}
80-
98+
$this->loadConfigCache = $config;
99+
$this->loadConfigCacheEnv = $environmentVariables;
81100
return $config;
82101
}
83102
}

‎app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -323,18 +323,11 @@ private function filterPaths(string $prefix, array $groups, array $systemXmlConf
323323
public function filterNodes(array $configData): array
324324
{
325325
if (!empty($configData['groups'])) {
326-
$systemXmlPathsFromKeys = array_keys($this->_configStructure->getFieldPaths());
327-
$systemXmlPathsFromValues = array_reduce(
328-
array_values($this->_configStructure->getFieldPaths()),
329-
'array_merge',
330-
[]
331-
);
332326
//Full list of paths defined in system.xml
333-
$systemXmlConfig = array_merge($systemXmlPathsFromKeys, $systemXmlPathsFromValues);
334-
327+
$fieldPaths = $this->_configStructure->getFieldPaths();
328+
$systemXmlConfig = array_merge(array_keys($fieldPaths), ...array_values($fieldPaths));
335329
$configData['groups'] = $this->filterPaths($configData['section'], $configData['groups'], $systemXmlConfig);
336330
}
337-
338331
return $configData;
339332
}
340333

‎app/code/Magento/Config/Model/Config/Structure.php

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -384,32 +384,22 @@ public function getFieldPaths()
384384
* Iteration that collects config field paths recursively from config files.
385385
*
386386
* @param array $elements The elements to be parsed
387+
* @param array $result used for recursive calls
387388
* @return array An array of config path to config structure path map
388389
*/
389-
private function getFieldsRecursively(array $elements = [])
390+
private function getFieldsRecursively(array $elements = [], &$result = [])
390391
{
391-
$result = [];
392-
393392
foreach ($elements as $element) {
394393
if (isset($element['children'])) {
395-
$result = array_merge_recursive(
396-
$result,
397-
$this->getFieldsRecursively($element['children'])
398-
);
394+
$this->getFieldsRecursively($element['children'], $result);
399395
} else {
400396
if ($element['_elementType'] === 'field') {
401397
$structurePath = (isset($element['path']) ? $element['path'] . '/' : '') . $element['id'];
402398
$configPath = isset($element['config_path']) ? $element['config_path'] : $structurePath;
403-
404-
if (!isset($result[$configPath])) {
405-
$result[$configPath] = [];
406-
}
407-
408399
$result[$configPath][] = $structurePath;
409400
}
410401
}
411402
}
412-
413403
return $result;
414404
}
415405
}

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/UserDeletesFolderFromMediaGalleryTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323

2424
<!-- Step2 Disabled Old Media Gallery and Page Builder -->
2525
<magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
26-
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
26+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disablePageBuilder"/>
2727
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
2828
</before>
2929
<after>
3030
<magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enableOldMediaGallery"/>
31-
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
31+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="enablePageBuilder"/>
3232
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
3333
</after>
3434

‎app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<createData entity="defaultSimpleProduct" stepKey="createProduct">
2727
<requiredEntity createDataKey="createCategory"/>
2828
</createData>
29+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2930
</before>
3031
<after>
3132
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>

‎app/code/Magento/Store/Model/Config/Placeholder.php

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -43,48 +43,30 @@ public function __construct(\Magento\Framework\App\RequestInterface $request, $u
4343
*
4444
* @param array $data
4545
* @return array
46+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
4647
*/
4748
public function process(array $data = [])
4849
{
49-
// check provided arguments
5050
if (empty($data)) {
5151
return [];
5252
}
53-
54-
// initialize $pointer, $parents and $level variable
55-
reset($data);
56-
$pointer = &$data;
57-
$parents = [];
58-
$level = 0;
59-
60-
while ($level >= 0) {
61-
$current = &$pointer[key($pointer)];
62-
if (is_array($current)) {
63-
reset($current);
64-
$parents[$level] = &$pointer;
65-
$pointer = &$current;
66-
$level++;
67-
} else {
68-
$current = $this->_processPlaceholders($current, $data);
69-
70-
// move pointer of last queue layer to next element
71-
// or remove layer if all path elements were processed
72-
while ($level >= 0 && next($pointer) === false) {
73-
$level--;
74-
// removal of last element of $parents is skipped here for better performance
75-
// on next iteration that element will be overridden
76-
$pointer = &$parents[$level];
53+
array_walk_recursive(
54+
$data,
55+
function (&$value, $key, $data) {
56+
if (is_string($value) && str_contains($value, '{')) { // If _getPlaceholder() would do nothing, skip
57+
$value = $this->_processPlaceholders($value, $data);
7758
}
78-
}
79-
}
80-
59+
},
60+
$data
61+
);
8162
return $data;
8263
}
8364

8465
/**
8566
* Process array data recursively
8667
*
8768
* @deprecated 101.0.4 This method isn't used in process() implementation anymore
69+
* @see process()
8870
*
8971
* @param array &$data
9072
* @param string $path
@@ -179,6 +161,7 @@ protected function _getValue($path, array $data)
179161
* Set array value by path
180162
*
181163
* @deprecated 101.0.4 This method isn't used in process() implementation anymore
164+
* @see process()
182165
*
183166
* @param array &$container
184167
* @param string $path
@@ -187,7 +170,7 @@ protected function _getValue($path, array $data)
187170
*/
188171
protected function _setValue(array &$container, $path, $value)
189172
{
190-
$segments = explode('/', (string)$path);
173+
$segments = explode('/', (string)$path);
191174
$currentPointer = &$container;
192175
foreach ($segments as $segment) {
193176
if (!isset($currentPointer[$segment])) {

‎app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserRoleTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<testCaseId value="MC-27895"/>
1919
<group value="user"/>
2020
<group value="mtf_migrated"/>
21-
<skip>
22-
<issueId value="AC-7467"/>
23-
</skip>
2421
</annotations>
2522
<before>
2623
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -31,6 +28,7 @@
3128
<!--Create New Role-->
3229
<actionGroup ref="AdminStartCreateUserRoleActionGroup" stepKey="startCreateUserRole">
3330
<argument name="roleName" value="{{roleSales.name}}"/>
31+
<argument name="userPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
3432
</actionGroup>
3533
<actionGroup ref="AdminSaveUserRoleActionGroup" stepKey="saveNewRole"/>
3634
</before>

0 commit comments

Comments
 (0)