M2-5381: Allow multiple modules for mediaType #5831

Author: strajeru

app/code/Magento/Catalog/Block/Product/AbstractProduct.php

@@ -94,6 +94,11 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
      */
     protected $stockRegistry;
 
+    /**
+     * @var ImageBuilder
+     */
+    protected $imageBuilder;
+
     /**
      * @param Context $context
      * @param array $data

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

@@ -38,10 +38,10 @@
         <xs:attribute name="value" type="xs:string"/>
     </xs:complexType>
     <xs:complexType name="mediaType" mixed="true">
-        <xs:all>
-            <xs:element name="images" type="imageType" minOccurs="0"/>
-            <xs:element name="videos" type="videoType" minOccurs="0"/>
-        </xs:all>
+        <xs:sequence>
+            <xs:element name="images" type="imageType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="videos" type="videoType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
     </xs:complexType>
 
     <xs:complexType name="imageType">