MC-3363: Additional configuration node changes

- Resolved static test failure
- Resolved failed expected integration test results

Author: Michael Yu

dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/expected_merged_array.php

@@ -4,23 +4,25 @@
  * See COPYING.txt for license details.
  */
 return [
-    'group1' => [
-        'label' => 'Group 1',
-        'sortOrder' => '1',
-        'name' => 'group1',
-        'translate' => 'label'
-    ],
-    'group2' => [
-        'label' => 'Group 2 Label',
-        'sortOrder' => '3',
-        'name' => 'group2',
-        'translate' => 'label'
-    ],
-    'group3' => [
-        'label' => 'Group 3 Label',
-        'sortOrder' => '2',
-        'name' => 'group3',
-        'translate' => 'label'
+    'groups' => [
+        'group1' => [
+            'label' => 'Group 1',
+            'sortOrder' => '1',
+            'name' => 'group1',
+            'translate' => 'label'
+        ],
+        'group2' => [
+            'label' => 'Group 2 Label',
+            'sortOrder' => '3',
+            'name' => 'group2',
+            'translate' => 'label'
+        ],
+        'group3' => [
+            'label' => 'Group 3 Label',
+            'sortOrder' => '2',
+            'name' => 'group3',
+            'translate' => 'label'
+        ]
     ],
     'types' => [
         'type1' => [

dev/tests/static/testsuite/Magento/Test/Integrity/Xml/GroupsTest.php

@@ -91,8 +91,7 @@ private function getContentTypeGroups(): array
         foreach ($files as $filename) {
             $dom = new \DOMDocument();
             $dom->loadXML(file_get_contents($filename));
-            $groups = $dom->getElementsByTagName('group');
-            foreach ($groups->childNodes as $group) {
+            foreach ($dom->getElementsByTagName('group') as $group) {
                 if ($group->nodeType == XML_ELEMENT_NODE && $group->tagName == 'group') {
                     $data[] = $group->attributes->getNamedItem('name')->nodeValue;
                 }