Skip to content

Commit b608bbb

Browse files
committed
MAGETWO-48820: Refactor UI component to merge metadata
1 parent 6f4f96a commit b608bbb

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

lib/internal/Magento/Framework/View/Element/UiComponentFactory.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,13 +290,16 @@ protected function mergeMetadataElement(array $bundleComponents, $name, array $d
290290
: array_replace_recursive($bundleComponents[$name], $data);
291291
return [$bundleComponents, true];
292292
} else {
293-
foreach ($bundleComponents as $childName => &$childData) {
293+
foreach ($bundleComponents as &$childData) {
294294
if (isset($childData['attributes']['class'])
295295
&& is_a($childData['attributes']['class'], 'Magento\Ui\Component\Container', true)
296296
&& isset($childData['children']) && is_array($childData['children'])
297297
) {
298298
list($childData['children'], $isMerged) = $this->mergeMetadataElement(
299-
$childData['children'], $name, $data, $reverseMerge
299+
$childData['children'],
300+
$name,
301+
$data,
302+
$reverseMerge
300303
);
301304
if ($isMerged) {
302305
return [$bundleComponents, true];
@@ -325,7 +328,10 @@ protected function mergeMetadataItem(array $bundleComponents, array $metadata, $
325328
}
326329

327330
list($bundleComponents, $isMerged) = $this->mergeMetadataElement(
328-
$bundleComponents, $name, $selfData, $reverseMerge
331+
$bundleComponents,
332+
$name,
333+
$selfData,
334+
$reverseMerge
329335
);
330336

331337
if (!$isMerged) {
@@ -367,7 +373,7 @@ protected function mergeMetadataItem(array $bundleComponents, array $metadata, $
367373
*/
368374
protected function getDataProvider($identifier, array $bundleComponents)
369375
{
370-
foreach ($bundleComponents[$identifier]['children'] as $childrenIdentifier => $childrenData) {
376+
foreach ($bundleComponents[$identifier]['children'] as $childrenData) {
371377
if (isset($childrenData['arguments']['dataProvider'])
372378
&& $childrenData['arguments']['dataProvider'] instanceof DataProviderInterface
373379
) {

0 commit comments

Comments
 (0)