MAGETWO-55279: XSD for view.xml is too strict

Author: Evgeniy Kolesov

lib/internal/Magento/Framework/Config/etc/view.xsd

@@ -66,13 +66,23 @@
                     <xs:attribute name="id" type="xs:string" use="required"/>
                     <xs:attribute name="type">
                         <xs:simpleType>
-                            <xs:restriction base="xs:string">
-                                <xs:enumeration value="thumbnail"/>
-                                <xs:enumeration value="small_image"/>
-                                <xs:enumeration value="image"/>
-                                <xs:enumeration value="swatch_image"/>
-                                <xs:enumeration value="swatch_thumb"/>
-                            </xs:restriction>
+                            <xs:union>
+                                <xs:simpleType>
+                                    <xs:restriction base="xs:string">
+                                        <xs:enumeration value="thumbnail"/>
+                                        <xs:enumeration value="small_image"/>
+                                        <xs:enumeration value="image"/>
+                                        <xs:enumeration value="swatch_image"/>
+                                        <xs:enumeration value="swatch_thumb"/>
+                                    </xs:restriction>
+                                </xs:simpleType>
+                                <xs:simpleType>
+                                    <xs:restriction base="xs:string">
+                                        <xs:minLength value="1"/>
+                                        <xs:pattern value="[a-z]+[a-z_]+[a-z]+"/>
+                                    </xs:restriction>
+                                </xs:simpleType>
+                            </xs:union>
                         </xs:simpleType>
                     </xs:attribute>
                 </xs:complexType>