Fix integration tests

aa-kashk · aa-kashk · commit 290f5a60244e · 2021-10-22T14:52:36.000-05:00
diff --git a/lib/internal/Magento/Framework/Api/DataObjectHelper.php b/lib/internal/Magento/Framework/Api/DataObjectHelper.php
@@ -108,7 +108,10 @@ protected function _setDataValues($dataObject, array $data, $interfaceName)
             }
             unset($data[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES]);
         }
-        if ($dataObject instanceof \Magento\Framework\Model\AbstractModel && !isset($data['id'])) {// && !$dataObject instanceof ) {
+        if ($dataObject instanceof \Magento\Framework\Model\AbstractModel
+            && !isset($data['id'])
+            && !isset($data['items'])?? $data['items'][0]['is_tax_included'])
+            {
             $simpleData = array_filter($data, function ($e) { return is_scalar($e) || is_null($e); });
             $dataObject->addData($simpleData);
             $data = array_filter(array_diff_key($data, $simpleData));

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,10 @@ protected function _setDataValues($dataObject, array $data, $interfaceName)`
`108`	`108`	`}`
`109`	`109`	`unset($data[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES]);`
`110`	`110`	`}`
`111`		`- if ($dataObject instanceof \Magento\Framework\Model\AbstractModel && !isset($data['id'])) {// && !$dataObject instanceof ) {`
	`111`	`+ if ($dataObject instanceof \Magento\Framework\Model\AbstractModel`
	`112`	`+ && !isset($data['id'])`
	`113`	`+ && !isset($data['items'])?? $data['items'][0]['is_tax_included'])`
	`114`	`+ {`
`112`	`115`	`$simpleData = array_filter($data, function ($e) { return is_scalar($e) \|\| is_null($e); });`
`113`	`116`	`$dataObject->addData($simpleData);`
`114`	`117`	`$data = array_filter(array_diff_key($data, $simpleData));`