Skip to content

Adding the ability to have nested objects that are not DataObject #36689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 2.4-develop
Choose a base branch
from
Open

Adding the ability to have nested objects that are not DataObject #36689

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9ce4f4
Adding the ability to have nested objects that are not DataObject
MeCapron Dec 30, 2022
917c251
Merge branch '2.4-develop' into feature/allow_nested_objects_from_dto_2
Den4ik Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 48 additions & 5 deletions lib/internal/Magento/Framework/Api/DataObjectHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@

namespace Magento\Framework\Api;

use Magento\Framework\DataObject;
use Magento\Framework\Reflection\MethodsMap;

use function get_class;
use function is_subclass_of;

/**
* Service class allow populating object from array data
*
Expand Down Expand Up @@ -220,16 +224,15 @@ protected function setComplexValue(
$value[$extensionAttributeKey][$key] = $extensionAttribute;
}
} else {
$value[$extensionAttributeKey] = $this->objectFactory->create(
$extensionAttributeType,
['data' => $extensionAttributeValue]
);
$object = $this->createSubObject($extensionAttributeType, $extensionAttributeValue);

$value[$extensionAttributeKey] = $object;
}
}
}
$object = $this->extensionFactory->create(get_class($dataObject), ['data' => $value]);
} else {
$object = $this->objectFactory->create($returnType, $value);
$object = $this->createSubObject($returnType, $value);
}
$dataObject->$methodName($object);
return $this;
Expand Down Expand Up @@ -339,4 +342,44 @@ public function setCustomAttributes(mixed $dataObject, array $data, array $attri
}
return $data;
}

/**
* Check if the object is a DataObject or similar, then its value is already prepared. Expand object instead.
*
* @param string $returnType
* @param array $value
*
* @return object
*/
private function createSubObject(string $returnType, array $value): object
{
$object = $this->objectFactory->create($returnType, []);

if ($this->isValueForDataObject(get_class($object), $value)) {
$value = $value['data'];
}

$this->populateWithArray(
$object,
$value,
$returnType
);

return $object;
}

/**
* Check if the value is already prepared to be created for a DataObject.
*
* @param string $returnType
* @param array $value
* @return bool
*/
private function isValueForDataObject(string $returnType, array $value): bool
{
$isDataObject = is_subclass_of($returnType, DataObject::class) ||
is_subclass_of($returnType, AbstractSimpleObject::class);

return $isDataObject && isset($value['data']);
}
}