Skip to content

Commit 93e5768

Browse files
committed
Resolve merge conflicts: Merge remote-tracking branch 'origin/sprint-develop' into MQE-326-multi-stores
# Conflicts: # src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php # src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php # src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataElement.php # src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php # src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
1 parent 97bd6b8 commit 93e5768

File tree

6 files changed

+67
-728
lines changed

6 files changed

+67
-728
lines changed

src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php

Lines changed: 0 additions & 368 deletions
This file was deleted.

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class DataDefinitionObjectHandler implements ObjectHandlerInterface
4040
const ENTITY_OPERATION_OBJECT_KEY = 'key';
4141
const ENTITY_OPERATION_OBJECT_VALUE = 'value';
4242
const ENTITY_OPERATION_DATA_OBJECT = 'metaDataObject';
43+
const ENTITY_OPERATION_REQUIRED = 'required';
4344

4445
/**
4546
* Singleton Instance of class
@@ -173,7 +174,8 @@ private function initDataDefinitions()
173174
$metaData[] = new DataElement(
174175
$dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
175176
$dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
176-
DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY
177+
DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY,
178+
$dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null
177179
);
178180
}
179181
}
@@ -201,6 +203,7 @@ private function initDataDefinitions()
201203
$dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
202204
$value,
203205
$type,
206+
$dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
204207
$subMetaData
205208
);
206209
}

0 commit comments

Comments
 (0)