MAGETWO-65587: [GitHub][PR] update allowed container tags #8056

Author: magento-team

dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php

@@ -273,8 +273,8 @@ public function addContainerDataProvider()
     public function testAddContainerInvalidHtmlTag()
     {
         $msg = 'Html tag "span" is forbidden for usage in containers. ' .
-            'Consider to use one of the allowed: dd, div, dl, fieldset, main, header, ' .
-            'footer, ol, p, section, table, tfoot, ul, nav.';
+            'Consider to use one of the allowed: aside, dd, div, dl, fieldset, main, nav, ' .
+            'header, footer, ol, p, section, table, tfoot, ul.';
         $this->setExpectedException(\Magento\Framework\Exception\LocalizedException::class, $msg);
         $this->_layout->addContainer('container', 'Container', ['htmlTag' => 'span']);
     }

lib/internal/Magento/Framework/View/Layout/Generator/Container.php

@@ -24,11 +24,13 @@ class Container implements Layout\GeneratorInterface
      * @var array
      */
     protected $allowedTags = [
+        'aside',
         'dd',
         'div',
         'dl',
         'fieldset',
         'main',
+        'nav',
         'header',
         'footer',
         'ol',
@@ -37,7 +39,6 @@ class Container implements Layout\GeneratorInterface
         'table',
         'tfoot',
         'ul',
-        'nav',
     ];
 
     /**

lib/internal/Magento/Framework/View/Layout/etc/elements.xsd

@@ -338,11 +338,13 @@
 
     <xs:simpleType name="htmlTagType">
         <xs:restriction base="xs:string">
+            <xs:enumeration value="aside"/>
             <xs:enumeration value="dd"/>
             <xs:enumeration value="div"/>
             <xs:enumeration value="dl"/>
             <xs:enumeration value="fieldset"/>
             <xs:enumeration value="main"/>
+            <xs:enumeration value="nav"/>
             <xs:enumeration value="header"/>
             <xs:enumeration value="footer"/>
             <xs:enumeration value="ol"/>