Merge pull request #727 from magento/DataEntity

Fix an issue with extended data array entity

Author: okolesnyk

composer.json

@@ -32,7 +32,8 @@
         "symfony/finder": "^5.0",
         "symfony/mime": "^5.0",
         "symfony/process": "^4.4",
-        "vlucas/phpdotenv": "^2.4"
+        "vlucas/phpdotenv": "^2.4",
+        "weew/helpers-array": "^1.3"
     },
     "require-dev": {
         "brainmaestro/composer-git-hooks": "^2.3.1",

composer.lock

@@ -17,4 +17,10 @@
             <item name="three">3</item>
         </array>
     </entity>
+
+    <entity name="ExtendedMessageData" extends="MessageData">
+        <array key="numbers">
+            <item name="TESTING CASE">TESTING CASE</item>
+        </array>
+    </entity>
 </entities>

dev/tests/functional/tests/MFTF/DevDocs/Data/MessageData.xml

@@ -48,8 +48,8 @@
         </actionGroup>
 
         <assertEqualsCanonicalizing stepKey="assertMergedArray">
-            <actualResult type="array">{{MessageData.numbers}}</actualResult>
-            <expectedResult type="array">["Something New", "0", "1", "2", "3"]</expectedResult>
+            <actualResult type="array">{{ExtendedMessageData.numbers}}</actualResult>
+            <expectedResult type="array">["Something New", "0", "1", "2", "3", "TESTING CASE"]</expectedResult>
         </assertEqualsCanonicalizing>
     </test>
 </tests>

dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml

@@ -226,8 +226,8 @@ private function processParserOutput($parserOutput)
     private function processArray($arrayItems, $data, $key)
     {
         $items = [];
-        foreach ($arrayItems as $item) {
-            $items[] = $item[self::_VALUE];
+        foreach ($arrayItems as $key => $item) {
+            $items[$key] = $item[self::_VALUE];
         }
 
         return array_merge($items, $data[$key] ?? []);

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

@@ -62,7 +62,7 @@ public function extendEntity($entityObject)
 
         // Get all data for both parent and child and merge
         $referencedData = $parentEntity->getAllData();
-        $newData = array_merge($referencedData, $entityObject->getAllData());
+        $newData = array_extend($referencedData, $entityObject->getAllData());
 
         // Get all linked references for both parent and child and merge
         $referencedLinks = $parentEntity->getLinkedEntities();