MC-2217: Add support for new config structure

- Updated content_type.xsd required attributes
- Updated converter naming convention and documentation

Author: Michael Yu

app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php

@@ -55,12 +55,9 @@ private function convertTypes(\DOMDocument $source): array
         /** @var \DOMNode $contentType */
         foreach ($contentTypes as $contentType) {
             $name = $contentType->attributes->getNamedItem('name')->nodeValue;
-            /** @var \DOMElement $key */
-            /** @var \DOMElement $value */
-            foreach ($contentType->attributes as $key => $value) {
-                $typesData[$name][$key] = $contentType->hasAttribute($key)
-                    ? $contentType->attributes->getNamedItem($key)->nodeValue
-                    : null;
+            /** @var \DOMElement $attributeValue */
+            foreach ($contentType->attributes as $attributeName => $attributeValue) {
+                $typesData[$name][$attributeName] = $attributeValue->nodeValue;
             }
             /** @var \DOMElement $childNode */
             foreach ($contentType->childNodes as $childNode) {

app/code/Magento/PageBuilder/Model/Config/Group/Converter.php

@@ -39,11 +39,9 @@ private function convertGroups(\DOMDocument $source): array
         foreach ($groups->item(0)->childNodes as $group) {
             if ($group->nodeType == XML_ELEMENT_NODE && $group->tagName == 'group') {
                 $name = $group->attributes->getNamedItem('name')->nodeValue;
-                /** @var \DOMElement $childNode */
-                foreach ($group->attributes as $key => $value) {
-                    $groupsData[$name][$key] = $group->hasAttribute($key)
-                        ? $group->attributes->getNamedItem($key)->nodeValue
-                        : null;
+                /** @var \DOMElement $attributeValue */
+                foreach ($group->attributes as $attributeName => $attributeValue) {
+                    $groupsData[$name][$attributeName] = $attributeValue->nodeValue;
                 }
             }
         }
@@ -53,18 +51,4 @@ private function convertGroups(\DOMDocument $source): array
 
         return $groupsData;
     }
-
-    /**
-     * Check if node is configuration node
-     *
-     * @param \DOMNode $node
-     * @return bool
-     */
-    private function isConfigNode(\DOMNode $node): bool
-    {
-        return $node->nodeType === XML_ELEMENT_NODE
-            || ($node->nodeType === XML_CDATA_SECTION_NODE
-                || $node->nodeType === XML_TEXT_NODE
-                && trim($node->nodeValue) !== '');
-    }
 }

app/code/Magento/PageBuilder/etc/content_type.xsd

@@ -159,7 +159,7 @@
         <xs:attribute type="xs:string" name="virtual" use="optional"/>
     </xs:complexType>
     <xs:complexType name="static_property">
-        <xs:attribute type="xs:string" name="source" use="optional"/>
+        <xs:attribute type="xs:string" name="source" use="required"/>
         <xs:attribute type="xs:string" name="value" use="optional"/>
     </xs:complexType>
     <xs:complexType name="attributes">
@@ -186,7 +186,7 @@
         <xs:attribute type="xs:boolean" name="persist" use="optional"/>
     </xs:complexType>
     <xs:complexType name="static_attribute">
-        <xs:attribute type="xs:string" name="source" use="optional"/>
+        <xs:attribute type="xs:string" name="source" use="required"/>
         <xs:attribute type="xs:string" name="value" use="optional"/>
     </xs:complexType>
     <xs:complexType name="html">
@@ -207,7 +207,7 @@
         </xs:sequence>
     </xs:complexType>
     <xs:complexType name="class">
-        <xs:attribute type="xs:string" name="source" use="optional"/>
+        <xs:attribute type="xs:string" name="source" use="required"/>
     </xs:complexType>
     <xs:complexType name="tag">
         <xs:attribute type="xs:string" name="name" use="required"/>