Skip to content

Commit a0e287e

Browse files
committed
MQE-2160: Extended data entity won't merge array items
1 parent 9ab02dc commit a0e287e

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
"symfony/finder": "^5.0",
3333
"symfony/mime": "^5.0",
3434
"symfony/process": "^4.4",
35-
"vlucas/phpdotenv": "^2.4"
35+
"vlucas/phpdotenv": "^2.4",
36+
"weew/helpers-array": "^1.3"
3637
},
3738
"require-dev": {
3839
"brainmaestro/composer-git-hooks": "^2.3.1",

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/verification/Resources/ExtendParentDataTest.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class ExtendParentDataTestCest
2727
public function ExtendParentDataTest(AcceptanceTester $I)
2828
{
2929
$I->createEntity("simpleDataKey", "test", "extendParentData", [], []); // stepKey: simpleDataKey
30-
$I->searchAndMultiSelectOption("#selector", ["name", "otherName"]); // stepKey: getName
30+
$I->searchAndMultiSelectOption("#selector", ["otherName"]); // stepKey: getName
3131
$I->searchAndMultiSelectOption("#selector", ["extendName"]); // stepKey: getNameExtend
32-
$I->searchAndMultiSelectOption("#selector", ["postname", "item"]); // stepKey: emptyPost
32+
$I->searchAndMultiSelectOption("#selector", ["item"]); // stepKey: emptyPost
3333
$I->searchAndMultiSelectOption("#selector", [msq("extendParentData") . "prename"]); // stepKey: originalPre
3434
$I->searchAndMultiSelectOption("#selector", ["postnameExtend" . msq("extendParentData")]); // stepKey: secondUniquePre
3535
}

dev/tests/verification/Resources/ExtendedParameterArrayTest.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ class ExtendParentDataTestCest
2626
public function ExtendParentDataTest(AcceptanceTester $I)
2727
{
2828
$I->createEntity("simpleDataKey", "test", "extendParentData", [], []); // stepKey: simpleDataKey
29-
$I->searchAndMultiSelectOption("#selector", ["name", "otherName"]);
29+
$I->searchAndMultiSelectOption("#selector", ["otherName"]);
3030
$I->searchAndMultiSelectOption("#selector", ["extendName"]);
31-
$I->searchAndMultiSelectOption("#selector", ["postname", "item"]);
31+
$I->searchAndMultiSelectOption("#selector", ["item"]);
3232
$I->searchAndMultiSelectOption("#selector", [msq("extendParentData") . "prename"]);
3333
$I->searchAndMultiSelectOption("#selector", ["postnameExtend" . msq("extendParentData")]);
3434
}

src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ private function processParserOutput($parserOutput)
226226
private function processArray($arrayItems, $data, $key)
227227
{
228228
$items = [];
229-
foreach ($arrayItems as $item) {
230-
$items[] = $item[self::_VALUE];
229+
foreach ($arrayItems as $key => $item) {
230+
$items[$key] = $item[self::_VALUE];
231231
}
232232

233233
return array_merge($items, $data[$key] ?? []);

src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataExtensionUtil.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function extendEntity($entityObject)
6262

6363
// Get all data for both parent and child and merge
6464
$referencedData = $parentEntity->getAllData();
65-
$newData = array_merge_recursive($referencedData, $entityObject->getAllData());
65+
$newData = array_extend($referencedData, $entityObject->getAllData());
6666

6767
// Get all linked references for both parent and child and merge
6868
$referencedLinks = $parentEntity->getLinkedEntities();

0 commit comments

Comments
 (0)