MAGETWO-52958: Better Semantic for UI Components

Author: maxwhite-ua

app/code/Magento/Ui/Config/Converter.php

@@ -128,27 +128,7 @@ private function toArray(\DOMNode $node)
                     $result[$attributes[static::NAME_ATTRIBUTE_KEY]] = $this->argumentParser->parse($node);
                 } else {
                     $resultComponent = $this->convertNode($node);
-                    $arguments = [];
-                    $childResult = [];
-                    for ($i = 0, $iLength = $node->childNodes->length; $i < $iLength; ++$i) {
-                        $itemNode = $node->childNodes->item($i);
-                        if ($itemNode->localName == null) {
-                            continue;
-                        }
-                        if ($itemNode->localName === static::ARGUMENT_KEY) {
-                            $arguments += $this->toArray($itemNode);
-                        } elseif (
-                            $this->converterUtils->isUiComponent($itemNode)
-                            && isset($this->schemaMap[$itemNode->localName])
-                        ) {
-                            $itemNodeName = $this->converterUtils->getComponentName($itemNode);
-                            $childResult[$itemNodeName] = $this->toArray($itemNode);
-                            // 'uiComponentType' is needed this for Reader to merge default values from definition
-                            $childResult[$itemNodeName]['uiComponentType'] = $itemNode->localName;
-                        } else {
-                            continue;
-                        }
-                    }
+                    list($arguments, $childResult) = $this->convertChildNodes($node);
 
                     $result = array_merge(
                         $this->processArguments($arguments, $resultComponent),
@@ -259,4 +239,37 @@ private function processChildResult(\DOMNode $node, array $childResult)
 
         return $result;
     }
+
+    /**
+     * Convert child nodes of $node
+     *
+     * @param \DOMNode $node
+     * @return array
+     */
+    private function convertChildNodes(\DOMNode $node)
+    {
+        $arguments = [];
+        $childResult = [];
+        for ($i = 0, $iLength = $node->childNodes->length; $i < $iLength; ++$i) {
+            $itemNode = $node->childNodes->item($i);
+            if ($itemNode->localName == null) {
+                continue;
+            }
+            if ($itemNode->localName === static::ARGUMENT_KEY) {
+                $arguments += $this->toArray($itemNode);
+            } elseif (
+                $this->converterUtils->isUiComponent($itemNode)
+                && isset($this->schemaMap[$itemNode->localName])
+            ) {
+                $itemNodeName = $this->converterUtils->getComponentName($itemNode);
+                $childResult[$itemNodeName] = $this->toArray($itemNode);
+                // 'uiComponentType' is needed this for Reader to merge default values from definition
+                $childResult[$itemNodeName]['uiComponentType'] = $itemNode->localName;
+            } else {
+                continue;
+            }
+        }
+
+        return array($arguments, $childResult);
+    }
 }

app/code/Magento/Ui/Config/Reader/DefinitionMap/Converter.php

@@ -85,23 +85,10 @@ private function toArray(\DOMNode $node)
                     $result[ $attributes[static::NAME_ATTRIBUTE_KEY] ] = $this->argumentParser->parse($node);
 
                 } else {
-                    $arguments = [];
-                    $childResult = [];
-                    foreach ($node->childNodes as $itemNode) {
-                        if (empty($itemNode->localName)) {
-                            continue;
-                        }
-                        if ($itemNode->localName === static::ARGUMENT_KEY) {
-                            $arguments += $this->toArray($itemNode);
-                        } else {
-                            $childResult[$this->getComponentName($itemNode)] = $this->toArray($itemNode);
-                        }
-                    }
+                    list($arguments, $childResult) = $this->convertChildNodes($node);
 
                     if (!empty($arguments)) {
-                        foreach ($arguments as $name => $argument) {
-                            $result[static::ARGUMENT_KEY][$name] = $argument;
-                        }
+                        $result[static::ARGUMENT_KEY] = $arguments;
                     }
 
                     $result += $childResult;
@@ -181,4 +168,28 @@ private function processMap($componentData, $sourceMap)
 
         return $result;
     }
+
+    /**
+     * Convert child nodes of $node
+     *
+     * @param \DOMNode $node
+     * @return array
+     */
+    private function convertChildNodes(\DOMNode $node)
+    {
+        $arguments = [];
+        $childResult = [];
+        foreach ($node->childNodes as $itemNode) {
+            if (empty($itemNode->localName)) {
+                continue;
+            }
+            if ($itemNode->localName === static::ARGUMENT_KEY) {
+                $arguments += $this->toArray($itemNode);
+            } else {
+                $childResult[$this->getComponentName($itemNode)] = $this->toArray($itemNode);
+            }
+        }
+
+        return array($arguments, $childResult);
+    }
 }

app/code/Magento/Ui/Config/Reader/Dom.php

@@ -117,11 +117,11 @@ private function nestedMerge(\DOMNode $contextNode, \DOMNodeList $insertedNodes)
     /**
      * Merge node to matched root elements
      *
-     * @param $rootMatchList
-     * @param $insertedItem
+     * @param \DOMNodeList $rootMatchList
+     * @param \DOMElement $insertedItem
      * @return void
      */
-    private function processMatchedNodes($rootMatchList, $insertedItem)
+    private function processMatchedNodes(\DOMNodeList $rootMatchList, \DOMElement $insertedItem)
     {
         foreach ($rootMatchList as $rootItem) {
             if ($this->_isTextNode($insertedItem) && $this->_isTextNode($rootItem)) {