Skip to content

Fix #24681 Support camelCase webapi #39237

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.

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 6 commits into
base: 2.4-develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 28 additions & 2 deletions lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ class DataObjectProcessor
*/
private $excludedMethodsClassMap;

/**
* @var array[]
*/
private $objectKeyMap;

/**
* @param MethodsMap $methodsMapProcessor
* @param TypeCaster $typeCaster
Expand All @@ -59,6 +64,7 @@ class DataObjectProcessor
* @param ExtensionAttributesProcessor $extensionAttributesProcessor
* @param array $processors
* @param array $excludedMethodsClassMap
* @param array $objectKeyMap
*/
public function __construct(
MethodsMap $methodsMapProcessor,
Expand All @@ -67,7 +73,8 @@ public function __construct(
CustomAttributesProcessor $customAttributesProcessor,
ExtensionAttributesProcessor $extensionAttributesProcessor,
array $processors = [],
array $excludedMethodsClassMap = []
array $excludedMethodsClassMap = [],
array $objectKeyMap = []
) {
$this->methodsMapProcessor = $methodsMapProcessor;
$this->typeCaster = $typeCaster;
Expand All @@ -76,6 +83,7 @@ public function __construct(
$this->customAttributesProcessor = $customAttributesProcessor;
$this->processors = $processors;
$this->excludedMethodsClassMap = $excludedMethodsClassMap;
$this->objectKeyMap = $objectKeyMap;
}

/**
Expand Down Expand Up @@ -143,7 +151,7 @@ public function buildOutputDataArray($dataObject, $dataObjectType)
}
}

$outputData[$key] = $value;
$outputData[$this->getKeyByObjectType($key, $dataObjectType)] = $value;
}

$outputData = $this->changeOutputArray($dataObject, $outputData);
Expand All @@ -168,4 +176,22 @@ private function changeOutputArray($dataObject, array $outputData): array

return $outputData;
}

/**
* Mapping argument processor to modify output api key
*
* @param string $key
* @param string $dataObjectType
* @return string
*/
private function getKeyByObjectType(string $key, string $dataObjectType): string
{
$dataObjectType = ltrim($dataObjectType, '\\');
if (array_key_exists($dataObjectType, $this->objectKeyMap) &&
array_key_exists($key, $this->objectKeyMap[$dataObjectType])
) {
$key = $this->objectKeyMap[$dataObjectType][$key];
}
return $key;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ public function testBuildOutputDataArray(
) {
$objectManager = new ObjectManager($this);

$objectKeyMap = [
TestDataInterface::class => [
'required_billing' => 'requiredBilling'
],
];

$this->dataObjectProcessor = $objectManager->getObject(
DataObjectProcessor::class,
[
Expand All @@ -84,6 +90,7 @@ public function testBuildOutputDataArray(
'fieldNamer' => $objectManager->getObject(FieldNamer::class),
'extensionAttributesProcessor' => $this->extensionAttributesProcessorMock,
'excludedMethodsClassMap' => $excludedMethodsClassMap,
'objectKeyMap' => $objectKeyMap,
]
);

Expand Down Expand Up @@ -121,7 +128,7 @@ public static function buildOutputDataArrayDataProvider()
'id' => '1',
'address' => 'someAddress',
'default_shipping' => 'true',
'required_billing' => 'false',
'requiredBilling' => 'false'
];

$extensionAttributes = [
Expand Down