File tree Expand file tree Collapse file tree 2 files changed +5
-2
lines changed
dev/tests/verification/TestModule/Data
src/Magento/FunctionalTestingFramework/DataGenerator/Util Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Original file line number Diff line number Diff line change 13
13
<data key =" uniqueNamePre" unique =" prefix" >prename</data >
14
14
<data key =" uniqueNamePost" unique =" suffix" >postname</data >
15
15
</entity >
16
- <entity name =" extendParentData" type = " extendParentData " extends =" parentData" >
16
+ <entity name =" extendParentData" extends =" parentData" >
17
17
<data key =" name" >otherName</data >
18
18
<data key =" nameExtend" >extendName</data >
19
19
<data key =" uniqueNamePost" >item</data >
Original file line number Diff line number Diff line change @@ -56,6 +56,9 @@ public function extendEntity($entityObject)
56
56
echo ("Extending Data: " . $ parentEntity ->getName () . " => " . $ entityObject ->getName () . PHP_EOL );
57
57
}
58
58
59
+ //get parent entity type if child does not have a type
60
+ $ newType = $ entityObject ->getType () ?? $ parentEntity ->getType ();
61
+
59
62
// Get all data for both parent and child and merge
60
63
$ referencedData = $ parentEntity ->getAllData ();
61
64
$ newData = array_merge ($ referencedData , $ entityObject ->getAllData ());
@@ -84,7 +87,7 @@ public function extendEntity($entityObject)
84
87
// Create new Test object to return
85
88
$ extendedEntity = new EntityDataObject (
86
89
$ entityObject ->getName (),
87
- $ parentEntity -> getType () ,
90
+ $ newType ,
88
91
$ newData ,
89
92
$ newLinkedReferences ,
90
93
$ newUniqueReferences ,
You can’t perform that action at this time.
0 commit comments