Merge branch 'MAGETWO-55279' of github.com:magento-frontend/magento2ce into PR

Author: Karpenko, Oleksandr

lib/internal/Magento/Framework/Config/Test/Unit/XsdTest.php

@@ -38,6 +38,6 @@ public function testInvalidXmlFile($xsdFile, $invalidXmlFile, $expectedErrorsQty
      */
     public function invalidXmlFileDataProvider()
     {
-        return [['view.xsd', 'view_invalid.xml', 1], ['theme.xsd', 'theme_invalid.xml', 1]];
+        return [['view.xsd', 'view_invalid.xml', 8], ['theme.xsd', 'theme_invalid.xml', 1]];
     }
 }

lib/internal/Magento/Framework/Config/Test/Unit/_files/view_invalid.xml

@@ -10,4 +10,21 @@
         <var name="var1">Value1</var>
         <var name="var1">Value1</var><!-- duplicate var name -->
     </vars>
+    <media>
+        <images module="Magento_Catalog">
+            <!-- Valid image type values -->
+            <image id="test" type="valid"/>
+            <image id="test" type="valid_image"/>
+            <image id="test" type="valid_image_type"/>
+            <!-- Invalid image type values -->
+            <image id="test" type="_invalid_image_type"/>
+            <image id="test" type="invalid-image"/>
+            <image id="test" type="Invalid"/>
+            <image id="test" type="invalid_"/>
+            <image id="test" type="invalid__image"/>
+            <image id="test" type="i"/>
+            <image id="test" type="?invalid"/>
+            <image id="test" type="123"/>
+        </images>
+    </media>
 </view>

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

@@ -66,13 +66,22 @@
                     <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:pattern value="[a-z]+(_?[a-z])+"/>
+                                    </xs:restriction>
+                                </xs:simpleType>
+                            </xs:union>
                         </xs:simpleType>
                     </xs:attribute>
                 </xs:complexType>