From 11f432fd8fb2878de7ed3b1ee25f4814b178e443 Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Wed, 21 Oct 2015 17:14:34 +0300
Subject: [PATCH 01/32] PV-5: revert changes for configs

---
 .../Magento/Catalog}/etc/view.xsd             |   2 +-
 .../ProductVideo/Model/VideoExtractor.php     |   2 +-
 app/code/Magento/ProductVideo/etc/view.xml    |   2 +-
 .../code/Magento}/ProductVideo/etc/view.xsd   |   2 +-
 app/code/Magento/Swatches/etc/view.xml        |   2 +-
 .../adminhtml/Magento/backend/etc/view.xml    |   2 +-
 .../frontend/Magento/blank/etc/view.xml       |   2 +-
 .../frontend/Magento/blank/etc/view.xsd       |  57 ----
 app/design/frontend/Magento/luma/etc/view.xml |   2 +-
 app/design/frontend/Magento/luma/etc/view.xsd |  57 ----
 .../Magento/Framework/Catalog/README.md       |   1 -
 .../Magento/Framework/Catalog/etc/view.xsd    |  57 ----
 .../Magento/Framework/Config/View.php         |  13 +-
 .../Magento/Framework/Config/etc/view.xsd     |  68 ++++-
 .../Magento/Framework/ProductVideo/README.md  |   1 -
 .../Magento/Framework/Validator/Config.php    |   2 +-
 .../Framework/View/PageLayout/Config.php      |   2 +-
 .../Magento/Framework/View/Xsd/Reader.php     | 248 ------------------
 18 files changed, 81 insertions(+), 441 deletions(-)
 rename app/{design/adminhtml/Magento/backend => code/Magento/Catalog}/etc/view.xsd (97%)
 rename {lib/internal/Magento/Framework => app/code/Magento}/ProductVideo/etc/view.xsd (96%)
 delete mode 100644 app/design/frontend/Magento/blank/etc/view.xsd
 delete mode 100644 app/design/frontend/Magento/luma/etc/view.xsd
 delete mode 100644 lib/internal/Magento/Framework/Catalog/README.md
 delete mode 100644 lib/internal/Magento/Framework/Catalog/etc/view.xsd
 delete mode 100644 lib/internal/Magento/Framework/ProductVideo/README.md
 delete mode 100644 lib/internal/Magento/Framework/View/Xsd/Reader.php

diff --git a/app/design/adminhtml/Magento/backend/etc/view.xsd b/app/code/Magento/Catalog/etc/view.xsd
similarity index 97%
rename from app/design/adminhtml/Magento/backend/etc/view.xsd
rename to app/code/Magento/Catalog/etc/view.xsd
index a695016f03565..670c6f56dc850 100644
--- a/app/design/adminhtml/Magento/backend/etc/view.xsd
+++ b/app/code/Magento/Catalog/etc/view.xsd
@@ -20,7 +20,7 @@
 
     <xs:complexType name="imageType">
         <xs:sequence>
-            <xs:element name="image" maxOccurs="unbounded">
+            <xs:element name="image" minOccurs="1" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element name="width" type="xs:positiveInteger" minOccurs="0"/>
diff --git a/app/code/Magento/ProductVideo/Model/VideoExtractor.php b/app/code/Magento/ProductVideo/Model/VideoExtractor.php
index be97959b6df52..aa9267e5a324e 100644
--- a/app/code/Magento/ProductVideo/Model/VideoExtractor.php
+++ b/app/code/Magento/ProductVideo/Model/VideoExtractor.php
@@ -12,7 +12,7 @@ class VideoExtractor implements \Magento\Framework\View\Xsd\Media\TypeDataExtrac
     /**
      * Media Entry type code
      */
-    const MEDIA_TYPE_CODE = 'image';
+    const MEDIA_TYPE_CODE = 'video';
 
     /**
      * Extract configuration data of videos from the DOM structure
diff --git a/app/code/Magento/ProductVideo/etc/view.xml b/app/code/Magento/ProductVideo/etc/view.xml
index 3a09480fc4c57..f5ce5d81d6ff7 100644
--- a/app/code/Magento/ProductVideo/etc/view.xml
+++ b/app/code/Magento/ProductVideo/etc/view.xml
@@ -5,7 +5,7 @@
 * See COPYING.txt for license details.
 */
 -->
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ProductVideo/etc/view.xsd">
+<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
     <media>
         <videos module="Magento_ProductVideo">
             <video id="play_if_base" type="play_if_base">
diff --git a/lib/internal/Magento/Framework/ProductVideo/etc/view.xsd b/app/code/Magento/ProductVideo/etc/view.xsd
similarity index 96%
rename from lib/internal/Magento/Framework/ProductVideo/etc/view.xsd
rename to app/code/Magento/ProductVideo/etc/view.xsd
index e5af826629af4..ff0751399e965 100644
--- a/lib/internal/Magento/Framework/ProductVideo/etc/view.xsd
+++ b/app/code/Magento/ProductVideo/etc/view.xsd
@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:redefine schemaLocation="../../Config/etc/view.xsd">
+    <xs:redefine schemaLocation="urn:magento:framework:Config/etc/view.xsd">
         <xs:complexType name="mediaType" mixed="true">
             <xs:complexContent>
                 <xs:extension base="mediaType">
diff --git a/app/code/Magento/Swatches/etc/view.xml b/app/code/Magento/Swatches/etc/view.xml
index b880f30786d5d..dd20b5cec838f 100644
--- a/app/code/Magento/Swatches/etc/view.xml
+++ b/app/code/Magento/Swatches/etc/view.xml
@@ -5,7 +5,7 @@
 * See COPYING.txt for license details.
 */
 -->
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Catalog/etc/view.xsd">
+<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
     <media>
         <images module="Magento_Catalog">
             <image id="swatch_image" type="swatch_image">
diff --git a/app/design/adminhtml/Magento/backend/etc/view.xml b/app/design/adminhtml/Magento/backend/etc/view.xml
index a846813648e5d..eae913a23c235 100644
--- a/app/design/adminhtml/Magento/backend/etc/view.xml
+++ b/app/design/adminhtml/Magento/backend/etc/view.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Catalog/etc/view.xsd">
+<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
     <vars module="Js_Bundle">
         <var name="bundle_size">1MB</var>
     </vars>
diff --git a/app/design/frontend/Magento/blank/etc/view.xml b/app/design/frontend/Magento/blank/etc/view.xml
index bdb3014469903..2e036c02197d6 100644
--- a/app/design/frontend/Magento/blank/etc/view.xml
+++ b/app/design/frontend/Magento/blank/etc/view.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Catalog/etc/view.xsd">
+<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
     <media>
         <images module="Magento_Catalog">
             <image id="bundled_product_customization_page" type="thumbnail">
diff --git a/app/design/frontend/Magento/blank/etc/view.xsd b/app/design/frontend/Magento/blank/etc/view.xsd
deleted file mode 100644
index a695016f03565..0000000000000
--- a/app/design/frontend/Magento/blank/etc/view.xsd
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:redefine schemaLocation="urn:magento:framework:Config/etc/view.xsd">
-        <xs:complexType name="mediaType" mixed="true">
-            <xs:complexContent>
-                <xs:extension base="mediaType">
-                    <xs:sequence>
-                        <xs:element name="images" type="imageType" minOccurs="0"/>
-                    </xs:sequence>
-                </xs:extension>
-            </xs:complexContent>
-        </xs:complexType>
-    </xs:redefine>
-
-    <xs:complexType name="imageType">
-        <xs:sequence>
-            <xs:element name="image" maxOccurs="unbounded">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="width" type="xs:positiveInteger" minOccurs="0"/>
-                        <xs:element name="height" type="xs:positiveInteger" minOccurs="0"/>
-                        <xs:element name="constrain" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="aspect_ratio" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="frame" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="transparency" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="background" minOccurs="0">
-                            <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                    <xs:pattern value="\[(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\]"/>
-                                </xs:restriction>
-                            </xs:simpleType>
-                        </xs:element>
-                    </xs:sequence>
-                    <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:simpleType>
-                    </xs:attribute>
-                </xs:complexType>
-            </xs:element>
-        </xs:sequence>
-        <xs:attribute name="module" type="xs:string" use="required"/>
-    </xs:complexType>
-</xs:schema>
diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
index 974c4c9fe5a80..e4f42fabb5c33 100644
--- a/app/design/frontend/Magento/luma/etc/view.xml
+++ b/app/design/frontend/Magento/luma/etc/view.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Catalog/etc/view.xsd">
+<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
     <media>
         <images module="Magento_Catalog">
             <image id="bundled_product_customization_page" type="thumbnail">
diff --git a/app/design/frontend/Magento/luma/etc/view.xsd b/app/design/frontend/Magento/luma/etc/view.xsd
deleted file mode 100644
index a695016f03565..0000000000000
--- a/app/design/frontend/Magento/luma/etc/view.xsd
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:redefine schemaLocation="urn:magento:framework:Config/etc/view.xsd">
-        <xs:complexType name="mediaType" mixed="true">
-            <xs:complexContent>
-                <xs:extension base="mediaType">
-                    <xs:sequence>
-                        <xs:element name="images" type="imageType" minOccurs="0"/>
-                    </xs:sequence>
-                </xs:extension>
-            </xs:complexContent>
-        </xs:complexType>
-    </xs:redefine>
-
-    <xs:complexType name="imageType">
-        <xs:sequence>
-            <xs:element name="image" maxOccurs="unbounded">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="width" type="xs:positiveInteger" minOccurs="0"/>
-                        <xs:element name="height" type="xs:positiveInteger" minOccurs="0"/>
-                        <xs:element name="constrain" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="aspect_ratio" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="frame" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="transparency" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="background" minOccurs="0">
-                            <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                    <xs:pattern value="\[(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\]"/>
-                                </xs:restriction>
-                            </xs:simpleType>
-                        </xs:element>
-                    </xs:sequence>
-                    <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:simpleType>
-                    </xs:attribute>
-                </xs:complexType>
-            </xs:element>
-        </xs:sequence>
-        <xs:attribute name="module" type="xs:string" use="required"/>
-    </xs:complexType>
-</xs:schema>
diff --git a/lib/internal/Magento/Framework/Catalog/README.md b/lib/internal/Magento/Framework/Catalog/README.md
deleted file mode 100644
index 6cb1e7b6ec3b2..0000000000000
--- a/lib/internal/Magento/Framework/Catalog/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Library contains schema files used to validate XML files in Magento\Catalog module
diff --git a/lib/internal/Magento/Framework/Catalog/etc/view.xsd b/lib/internal/Magento/Framework/Catalog/etc/view.xsd
deleted file mode 100644
index cc9c4fec4a74d..0000000000000
--- a/lib/internal/Magento/Framework/Catalog/etc/view.xsd
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:redefine schemaLocation="../../Config/etc/view.xsd">
-        <xs:complexType name="mediaType" mixed="true">
-            <xs:complexContent>
-                <xs:extension base="mediaType">
-                    <xs:sequence>
-                        <xs:element name="images" type="imageType" minOccurs="0"/>
-                    </xs:sequence>
-                </xs:extension>
-            </xs:complexContent>
-        </xs:complexType>
-    </xs:redefine>
-
-    <xs:complexType name="imageType">
-        <xs:sequence>
-            <xs:element name="image" minOccurs="1" maxOccurs="unbounded">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="width" type="xs:positiveInteger" minOccurs="0"/>
-                        <xs:element name="height" type="xs:positiveInteger" minOccurs="0"/>
-                        <xs:element name="constrain" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="aspect_ratio" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="frame" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="transparency" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="background" minOccurs="0">
-                            <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                    <xs:pattern value="\[(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\]"/>
-                                </xs:restriction>
-                            </xs:simpleType>
-                        </xs:element>
-                    </xs:sequence>
-                    <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:simpleType>
-                    </xs:attribute>
-                </xs:complexType>
-            </xs:element>
-        </xs:sequence>
-        <xs:attribute name="module" type="xs:string" use="required"/>
-    </xs:complexType>
-</xs:schema>
diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
index 98a9614018816..d4fdf5f10f87e 100644
--- a/lib/internal/Magento/Framework/Config/View.php
+++ b/lib/internal/Magento/Framework/Config/View.php
@@ -10,7 +10,6 @@
 namespace Magento\Framework\Config;
 
 use Magento\Framework\Config\Dom\UrnResolver;
-use Magento\Framework\View\Xsd\Reader;
 use Magento\Framework\View\Xsd\Media\TypeDataExtractorPool;
 
 class View extends \Magento\Framework\Config\AbstractXml
@@ -35,14 +34,12 @@ class View extends \Magento\Framework\Config\AbstractXml
 
     /**
      * @param array $configFiles
-     * @param Reader $xsdReader
      * @param UrnResolver $urnResolver
      * @param TypeDataExtractorPool $extractorPool
      * @param array $xpath
      */
     public function __construct(
         $configFiles,
-        Reader $xsdReader,
         UrnResolver $urnResolver,
         TypeDataExtractorPool $extractorPool,
         $xpath = []
@@ -50,19 +47,17 @@ public function __construct(
         $this->xpath = $xpath;
         $this->extractorPool = $extractorPool;
         $this->urnResolver = $urnResolver;
-        $this->xsdReader = $xsdReader;
         parent::__construct($configFiles);
     }
-    
+
     /**
-     * Merged file view.xsd
+     * Path to view.xsd
      *
      * @return string
      */
     public function getSchemaFile()
     {
-        $configXsd = $this->xsdReader->read();
-        return $configXsd;
+        return $this->urnResolver->getRealPath('urn:magento:framework:Config/etc/view.xsd');
     }
 
     /**
@@ -97,7 +92,7 @@ protected function _extractData(\DOMDocument $dom)
                                     $mediaNode,
                                     $childNode->tagName
                                 );
-                            $result = array_merge($result, $mediaNodesArray);
+                            $result = array_merge_recursive($result, $mediaNodesArray);
                         }
                     }
                     break;
diff --git a/lib/internal/Magento/Framework/Config/etc/view.xsd b/lib/internal/Magento/Framework/Config/etc/view.xsd
index 1ded09402a6b0..060ec8b9fe627 100644
--- a/lib/internal/Magento/Framework/Config/etc/view.xsd
+++ b/lib/internal/Magento/Framework/Config/etc/view.xsd
@@ -38,8 +38,74 @@
         <xs:attribute name="value" type="xs:string"/>
     </xs:complexType>
     <xs:complexType name="mediaType" mixed="true">
-        <xs:all />
+        <xs:all>
+            <xs:element name="images" type="imageType" minOccurs="0"/>
+            <xs:element name="videos" type="videoType" minOccurs="0"/>
+        </xs:all>
     </xs:complexType>
+
+    <xs:complexType name="imageType">
+        <xs:sequence>
+            <xs:element name="image" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="width" type="xs:positiveInteger" minOccurs="0"/>
+                        <xs:element name="height" type="xs:positiveInteger" minOccurs="0"/>
+                        <xs:element name="constrain" type="xs:boolean" minOccurs="0"/>
+                        <xs:element name="aspect_ratio" type="xs:boolean" minOccurs="0"/>
+                        <xs:element name="frame" type="xs:boolean" minOccurs="0"/>
+                        <xs:element name="transparency" type="xs:boolean" minOccurs="0"/>
+                        <xs:element name="background" minOccurs="0">
+                            <xs:simpleType>
+                                <xs:restriction base="xs:string">
+                                    <xs:pattern value="\[(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\]"/>
+                                </xs:restriction>
+                            </xs:simpleType>
+                        </xs:element>
+                    </xs:sequence>
+                    <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:simpleType>
+                    </xs:attribute>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="module" type="xs:string" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="videoType">
+        <xs:sequence>
+            <xs:element name="video" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="play_if_base" type="xs:boolean" minOccurs="0"/>
+                        <xs:element name="show_related" type="xs:boolean" minOccurs="0"/>
+                        <xs:element name="video_auto_restart" type="xs:boolean" minOccurs="0"/>
+                    </xs:sequence>
+                    <xs:attribute name="id" type="xs:string" use="required"/>
+                    <xs:attribute name="type" use="required">
+                        <xs:simpleType>
+                            <xs:restriction base="xs:string">
+                                <xs:enumeration value="play_if_base"/>
+                                <xs:enumeration value="show_related"/>
+                                <xs:enumeration value="video_auto_restart"/>
+                            </xs:restriction>
+                        </xs:simpleType>
+                    </xs:attribute>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="module" type="xs:string" use="required"/>
+    </xs:complexType>
+
     <xs:complexType name="excludeType">
         <xs:sequence>
             <xs:element name="item" type="itemType" maxOccurs="unbounded"/>
diff --git a/lib/internal/Magento/Framework/ProductVideo/README.md b/lib/internal/Magento/Framework/ProductVideo/README.md
deleted file mode 100644
index 88bf074ef9210..0000000000000
--- a/lib/internal/Magento/Framework/ProductVideo/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Library contains schema files used to validate XML files in Magento\ProductVideo module
diff --git a/lib/internal/Magento/Framework/Validator/Config.php b/lib/internal/Magento/Framework/Validator/Config.php
index 9b10f61bb596d..fca8c4c937723 100644
--- a/lib/internal/Magento/Framework/Validator/Config.php
+++ b/lib/internal/Magento/Framework/Validator/Config.php
@@ -11,7 +11,7 @@
 use Magento\Framework\Validator\Constraint\Option\Callback;
 use Magento\Framework\Validator\Constraint\OptionInterface;
 
-class Config extends \Magento\Framework\Config\AbstractXml
+class Config extends \Magento\Framework\Config\Reader\Filesystem
 {
     /**#@+
      * Constraints types
diff --git a/lib/internal/Magento/Framework/View/PageLayout/Config.php b/lib/internal/Magento/Framework/View/PageLayout/Config.php
index 31279b31a0616..5853ec728afac 100644
--- a/lib/internal/Magento/Framework/View/PageLayout/Config.php
+++ b/lib/internal/Magento/Framework/View/PageLayout/Config.php
@@ -9,7 +9,7 @@
 /**
  * Page layouts configuration
  */
-class Config extends \Magento\Framework\Config\AbstractXml
+class Config extends \Magento\Framework\Config\Reader\Filesystem
 {
     /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolver;
diff --git a/lib/internal/Magento/Framework/View/Xsd/Reader.php b/lib/internal/Magento/Framework/View/Xsd/Reader.php
deleted file mode 100644
index 7891ba7e0143c..0000000000000
--- a/lib/internal/Magento/Framework/View/Xsd/Reader.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\View\Xsd;
-
-use Magento\Framework\Component\ComponentRegistrar;
-use Magento\Framework\Component\DirSearch;
-use Magento\Framework\Config\Dom\UrnResolver;
-use Magento\Framework\Config\FileIteratorFactory;
-use Magento\Framework\Filesystem;
-
-class Reader implements \Magento\Framework\Config\ReaderInterface
-{
-    /**
-     * @var string
-     */
-    protected $defaultScope;
-
-    /**
-     * @var string
-     */
-    protected $fileName;
-
-    /**
-     * @var DirSearch
-     */
-    protected $componentDirSearch;
-
-    /**
-     * @var string
-     */
-    protected $searchFilesPattern;
-
-    /** @var \Magento\Framework\Config\Dom\UrnResolver */
-    protected $urnResolver;
-
-    /**
-     * @var FileIteratorFactory
-     */
-    private $iteratorFactory;
-
-    /**
-     * @param DirSearch $dirSearch
-     * @param UrnResolver $urnResolver
-     * @param FileIteratorFactory $iteratorFactory
-     * @param string $fileName
-     * @param string $defaultScope
-     * @param string $searchFilesPattern
-     */
-    public function __construct(
-        DirSearch $dirSearch,
-        UrnResolver $urnResolver,
-        FileIteratorFactory $iteratorFactory,
-        $fileName,
-        $defaultScope,
-        $searchFilesPattern
-    ) {
-        $this->componentDirSearch = $dirSearch;
-        $this->urnResolver = $urnResolver;
-        $this->fileName = $fileName;
-        $this->defaultScope = $defaultScope;
-        $this->searchFilesPattern = $searchFilesPattern;
-        $this->iteratorFactory = $iteratorFactory;
-    }
-
-    /**
-     * Get list of xsd files
-     *
-     * @param string $filename
-     * @return array
-     */
-    public function getListXsdFiles($filename)
-    {
-        return $this->iteratorFactory->create(
-            array_merge(
-                $this->componentDirSearch->collectFiles(ComponentRegistrar::MODULE, 'etc/' . $filename),
-                $this->componentDirSearch->collectFiles(ComponentRegistrar::LIBRARY, '*/etc/' . $filename)
-            )
-        );
-    }
-
-    /**
-     * Read xsd files from list
-     *
-     * @param null $scope
-     * @return array
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function read($scope = null)
-    {
-        $fileList = $this->getListXsdFiles($this->fileName);
-        if (!count($fileList)) {
-            return [];
-        }
-        $mergeXsd = $this->readXsdFiles($fileList);
-
-        return $mergeXsd;
-    }
-
-    /**
-     * Get merged xsd file
-     *
-     * @param array $fileList
-     * @param string $baseXsd
-     * @return null|string
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    public function readXsdFiles($fileList, $baseXsd = null)
-    {
-        $baseXsd = new \DOMDocument();
-        $baseXsdPath = $this->urnResolver->getRealPath($this->searchFilesPattern . $this->fileName);
-        $baseXsd->load($baseXsdPath);
-        $configMerge = null;
-        foreach ($fileList as $key => $content) {
-            if ($key == $baseXsdPath) {
-                continue;
-            }
-            try {
-                if (!empty($content)) {
-                    if ($configMerge) {
-                        $configMerge = $this->mergeXsd($configMerge, $content);
-                    } else {
-                        $configMerge = $this->mergeXsd($baseXsd->saveXML(), $content);
-                    }
-                }
-            } catch (\Magento\Framework\Config\Dom\ValidationException $e) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    new \Magento\Framework\Phrase("Invalid XSD in file %1:\n%2", [$key, $e->getMessage()])
-                );
-            }
-        }
-
-        return $configMerge;
-    }
-
-    /**
-     * Merge xsd files
-     *
-     * @param string $parent
-     * @param string $child
-     * @return string
-     */
-    protected function mergeXsd($parent, $child)
-    {
-        $domParent = $this->createDomInstance($parent);
-        $domChild = $this->createDomInstance($child);
-        $domChild = $domChild->documentElement;
-
-        $domParentElement = $domParent->getElementsByTagName('complexType');
-        $parentDomElements = $this->findDomElement($domParentElement, 'name');
-        foreach ($parentDomElements->childNodes as $findElement) {
-            if ($findElement instanceof \DOMElement) {
-                $domParentNode = $findElement;
-                break;
-            }
-        }
-        $domChildElement = $domChild->getElementsByTagName('extension');
-        $childDomElements = $this->findDomElement($domChildElement, 'base');
-        $domParent = $this->addHeadChildIntoParent($childDomElements, $domParent, $domParentNode);
-        $delete = $domChild->getElementsByTagName('redefine')->item(0);
-        $domChild->removeChild($delete);
-        $domParent = $this->addBodyChildIntoParent($domChild, $domParent);
-
-        return $domParent->saveXML();
-    }
-
-    /**
-     * Create DOM instance
-     *
-     * @param string $source
-     * @return \DOMDocument
-     */
-    protected function createDomInstance($source)
-    {
-        $domInstance = new \DOMDocument('1.0', 'UTF-8');
-        $domInstance->formatOutput = true;
-        $domInstance->loadXML($source);
-        $domInstance->preserveWhiteSpace = true;
-
-        return $domInstance;
-    }
-
-    /**
-     * Find searched element in DOM
-     *
-     * @param \DOMNodeList $domParentElement
-     * @param string $attribute
-     * @return mixed
-     */
-    protected function findDomElement(\DOMNodeList $domParentElement, $attribute)
-    {
-        foreach ($domParentElement as $child) {
-            if ($child->getAttribute($attribute) === 'mediaType'
-                && $child instanceof \DOMElement
-                && $child->hasChildNodes()
-            ) {
-                return $child;
-            }
-        }
-    }
-
-    /**
-     * Add into parent head elements from child
-     *
-     * @param \DOMElement $childDomElements
-     * @param \DOMDocument $domParent
-     * @param \DOMElement $domParentNode
-     * @return \DOMDocument
-     */
-    protected function addHeadChildIntoParent(
-        \DOMElement $childDomElements,
-        \DOMDocument $domParent,
-        \DOMElement $domParentNode
-    ) {
-        foreach ($childDomElements->childNodes as $sequence) {
-            if ($sequence instanceof \DOMElement && $sequence->hasChildNodes()) {
-                foreach ($sequence->childNodes as $findElement) {
-                    if ($findElement instanceof \DOMElement) {
-                        $importedNodes = $domParent->importNode($findElement, true);
-                        $domParentNode->appendChild($importedNodes);
-                    }
-                }
-            }
-        }
-
-        return $domParent;
-    }
-
-    /**
-     * Add into parent body elements from child
-     *
-     * @param \DOMElement $domChild
-     * @param \DOMDocument $domParent
-     * @return \DOMDocument
-     */
-    protected function addBodyChildIntoParent(\DOMElement $domChild, \DOMDocument $domParent)
-    {
-        foreach ($domChild->childNodes as $node) {
-            $importNode = $domParent->importNode($node, true);
-            $domParent->documentElement->appendChild($importNode);
-        }
-
-        return $domParent;
-    }
-}

From c3eb0c9950dff08c67091c0f7c2a56dd9fd977c3 Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Wed, 21 Oct 2015 18:02:00 +0300
Subject: [PATCH 02/32] PV-5: delete unused files

---
 app/code/Magento/Catalog/etc/view.xsd      | 57 ----------------------
 app/code/Magento/ProductVideo/etc/view.xsd | 45 -----------------
 2 files changed, 102 deletions(-)
 delete mode 100644 app/code/Magento/Catalog/etc/view.xsd
 delete mode 100644 app/code/Magento/ProductVideo/etc/view.xsd

diff --git a/app/code/Magento/Catalog/etc/view.xsd b/app/code/Magento/Catalog/etc/view.xsd
deleted file mode 100644
index 670c6f56dc850..0000000000000
--- a/app/code/Magento/Catalog/etc/view.xsd
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:redefine schemaLocation="urn:magento:framework:Config/etc/view.xsd">
-        <xs:complexType name="mediaType" mixed="true">
-            <xs:complexContent>
-                <xs:extension base="mediaType">
-                    <xs:sequence>
-                        <xs:element name="images" type="imageType" minOccurs="0"/>
-                    </xs:sequence>
-                </xs:extension>
-            </xs:complexContent>
-        </xs:complexType>
-    </xs:redefine>
-
-    <xs:complexType name="imageType">
-        <xs:sequence>
-            <xs:element name="image" minOccurs="1" maxOccurs="unbounded">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="width" type="xs:positiveInteger" minOccurs="0"/>
-                        <xs:element name="height" type="xs:positiveInteger" minOccurs="0"/>
-                        <xs:element name="constrain" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="aspect_ratio" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="frame" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="transparency" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="background" minOccurs="0">
-                            <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                    <xs:pattern value="\[(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\]"/>
-                                </xs:restriction>
-                            </xs:simpleType>
-                        </xs:element>
-                    </xs:sequence>
-                    <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:simpleType>
-                    </xs:attribute>
-                </xs:complexType>
-            </xs:element>
-        </xs:sequence>
-        <xs:attribute name="module" type="xs:string" use="required"/>
-    </xs:complexType>
-</xs:schema>
diff --git a/app/code/Magento/ProductVideo/etc/view.xsd b/app/code/Magento/ProductVideo/etc/view.xsd
deleted file mode 100644
index ff0751399e965..0000000000000
--- a/app/code/Magento/ProductVideo/etc/view.xsd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:redefine schemaLocation="urn:magento:framework:Config/etc/view.xsd">
-        <xs:complexType name="mediaType" mixed="true">
-            <xs:complexContent>
-                <xs:extension base="mediaType">
-                    <xs:sequence>
-                        <xs:element name="videos" type="videoType" minOccurs="0"/>
-                    </xs:sequence>
-                </xs:extension>
-            </xs:complexContent>
-        </xs:complexType>
-    </xs:redefine>
-
-    <xs:complexType name="videoType">
-        <xs:sequence>
-            <xs:element name="video" minOccurs="1" maxOccurs="unbounded">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="play_if_base" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="show_related" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="video_auto_restart" type="xs:boolean" minOccurs="0"/>
-                    </xs:sequence>
-                    <xs:attribute name="id" type="xs:string" use="required"/>
-                    <xs:attribute name="type" use="required">
-                        <xs:simpleType>
-                            <xs:restriction base="xs:string">
-                                <xs:enumeration value="play_if_base"/>
-                                <xs:enumeration value="show_related"/>
-                                <xs:enumeration value="video_auto_restart"/>
-                            </xs:restriction>
-                        </xs:simpleType>
-                    </xs:attribute>
-                </xs:complexType>
-            </xs:element>
-        </xs:sequence>
-        <xs:attribute name="module" type="xs:string" use="required"/>
-    </xs:complexType>
-</xs:schema>
\ No newline at end of file

From 5b1323b9c590d401204d34f62fa8e8a1e981d687 Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Tue, 27 Oct 2015 16:05:51 +0300
Subject: [PATCH 03/32] new changes for next PR

---
 .../Framework/Config/Reader/Filesystem.php    | 17 +++--
 .../Framework/Config/SchemaLocator.php        | 55 ++++++++++++++
 .../Magento/Framework/Config/View.php         | 75 +++++++++++++++++--
 .../Magento/Framework/Config/ViewFactory.php  |  2 +-
 4 files changed, 138 insertions(+), 11 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Config/SchemaLocator.php

diff --git a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
index 992158c6edf63..426d612123661 100644
--- a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
+++ b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
@@ -129,6 +129,17 @@ public function read($scope = null)
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _readFiles($fileList)
+    {
+        $configMerger = $this->getMergedConfig($fileList);
+
+        $output = [];
+        if ($configMerger) {
+            $output = $this->_converter->convert($configMerger->getDom());
+        }
+        return $output;
+    }
+
+    public function getMergedConfig($fileList)
     {
         /** @var \Magento\Framework\Config\Dom $configMerger */
         $configMerger = null;
@@ -155,11 +166,7 @@ protected function _readFiles($fileList)
             }
         }
 
-        $output = [];
-        if ($configMerger) {
-            $output = $this->_converter->convert($configMerger->getDom());
-        }
-        return $output;
+        return $configMerger;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Config/SchemaLocator.php
new file mode 100644
index 0000000000000..d61da4c75f397
--- /dev/null
+++ b/lib/internal/Magento/Framework/Config/SchemaLocator.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Menu configuration schema locator
+ *
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Config;
+
+use Magento\Framework\Config\Dom\UrnResolver;
+
+class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
+{
+    /**
+     * Path to corresponding XSD file with validation rules for merged config
+     *
+     * @var string
+     */
+    protected $_schema = null;
+
+    /**
+     * Path to corresponding XSD file with validation rules for separate config files
+     *
+     * @var string
+     */
+    protected $_perFileSchema = null;
+
+    /**
+     * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
+     */
+    public function __construct(UrnResolver $urnResolver)
+    {
+        $this->_schema = $urnResolver->getRealPath('urn:magento:framework:Config/etc/view.xsd');
+    }
+
+    /**
+     * Get path to merged config schema
+     *
+     * @return string|null
+     */
+    public function getSchema()
+    {
+        return $this->_schema;
+    }
+
+    /**
+     * Get path to pre file validation schema
+     *
+     * @return string|null
+     */
+    public function getPerFileSchema()
+    {
+        return $this->_perFileSchema;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
index d4fdf5f10f87e..f216b7e429cdd 100644
--- a/lib/internal/Magento/Framework/Config/View.php
+++ b/lib/internal/Magento/Framework/Config/View.php
@@ -12,7 +12,7 @@
 use Magento\Framework\Config\Dom\UrnResolver;
 use Magento\Framework\View\Xsd\Media\TypeDataExtractorPool;
 
-class View extends \Magento\Framework\Config\AbstractXml
+class View extends \Magento\Framework\Config\Reader\Filesystem
 {
     /** @var UrnResolver */
     protected $urnResolver;
@@ -32,14 +32,20 @@ class View extends \Magento\Framework\Config\AbstractXml
      */
     private $xsdReader;
 
+    private $data;
+
     /**
-     * @param array $configFiles
+     * @param array $fileList
      * @param UrnResolver $urnResolver
      * @param TypeDataExtractorPool $extractorPool
      * @param array $xpath
      */
     public function __construct(
-        $configFiles,
+        \Magento\Framework\Config\FileResolverInterface $fileResolver,
+        \Magento\Framework\Config\ConverterInterface $converter,
+        \Magento\Framework\Config\SchemaLocator $schemaLocator,
+        \Magento\Framework\Config\ValidationStateInterface $validationState,
+        $fileList,
         UrnResolver $urnResolver,
         TypeDataExtractorPool $extractorPool,
         $xpath = []
@@ -47,7 +53,18 @@ public function __construct(
         $this->xpath = $xpath;
         $this->extractorPool = $extractorPool;
         $this->urnResolver = $urnResolver;
-        parent::__construct($configFiles);
+        //parent::__construct($fileList);
+        $idAttributes = $this->_getIdAttributes();
+        parent::__construct(
+            $fileResolver,
+            $converter,
+            $schemaLocator,
+            $validationState,
+            'view.xml',
+            $idAttributes
+        );
+        //$test = $this->_readFiles($fileList);
+        $this->data = $this->getExtractedData($fileList);
     }
 
     /**
@@ -60,6 +77,18 @@ public function getSchemaFile()
         return $this->urnResolver->getRealPath('urn:magento:framework:Config/etc/view.xsd');
     }
 
+    public function getExtractedData($fileList)
+    {
+        $test = $this->getMergedConfig($fileList);
+        $test2 = $this->extractData($test);
+        return $test2;
+    }
+
+    public function getMergedConfig($fileList)
+    {
+        return $this->_readFiles($fileList);
+    }
+
     /**
      * Extract configuration data from the DOM structure
      *
@@ -67,7 +96,7 @@ public function getSchemaFile()
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function _extractData(\DOMDocument $dom)
+    protected function _extractData2(\DOMDocument $dom)
     {
         $result = [];
         /** @var $varsNode \DOMElement */
@@ -101,6 +130,42 @@ protected function _extractData(\DOMDocument $dom)
         return $result;
     }
 
+    protected function extractData(array $dom)
+    {
+        $result = [];
+        /** @var $varsNode \DOMElement */
+        foreach ($dom['view'][0] as $key => $childNode) {
+            switch ($key) {
+                case 'vars':
+                    //$moduleName = $childNode->getAttribute('module');
+                    $moduleName = $childNode[$key][0]['@attributes']['module'];
+                    //$result[$childNode->tagName][$moduleName] = $this->parseVarElement($childNode);
+                    $result[$key][$moduleName] = 'test';
+                    break;
+//                case 'exclude':
+//                    /** @var $itemNode \DOMElement */
+//                    foreach ($childNode->getElementsByTagName('item') as $itemNode) {
+//                        $itemType = $itemNode->getAttribute('type');
+//                        $result[$childNode->tagName][$itemType][] = $itemNode->nodeValue;
+//                    }
+//                    break;
+//                case 'media':
+//                    foreach ($childNode->childNodes as $mediaNode) {
+//                        if ($mediaNode instanceof \DOMElement) {
+//                            $mediaNodesArray =
+//                                $this->extractorPool->nodeProcessor($mediaNode->tagName)->process(
+//                                    $mediaNode,
+//                                    $childNode->tagName
+//                                );
+//                            $result = array_merge_recursive($result, $mediaNodesArray);
+//                        }
+//                    }
+//                    break;
+            }
+        }
+        return $result;
+    }
+
     /**
      * Recursive parser for <var> nodes
      *
diff --git a/lib/internal/Magento/Framework/Config/ViewFactory.php b/lib/internal/Magento/Framework/Config/ViewFactory.php
index 5b0247ddf7291..76032da97adb7 100644
--- a/lib/internal/Magento/Framework/Config/ViewFactory.php
+++ b/lib/internal/Magento/Framework/Config/ViewFactory.php
@@ -31,7 +31,7 @@ public function create($configFiles)
     {
         return $this->objectManager->create(
             'Magento\Framework\Config\View',
-            ['configFiles' => $configFiles]
+            ['fileList' => $configFiles]
         );
     }
 }

From d303ca2be74fc7edfc4e7fe12678a9161bcdac43 Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Wed, 28 Oct 2015 22:12:09 +0300
Subject: [PATCH 04/32] MAGETWO-44227: improvements

---
 app/etc/di.xml                                |   6 +-
 .../Magento/Framework/Config/Converter.php    |  93 ++++++++++
 .../Framework/Config/SchemaLocator.php        |   2 +-
 .../Magento/Framework/Config/View.php         | 166 +++---------------
 4 files changed, 118 insertions(+), 149 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Config/Converter.php

diff --git a/app/etc/di.xml b/app/etc/di.xml
index 598bc2c341ed3..63d04bf4b975c 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -1062,11 +1062,9 @@
     </type>
     <type name="Magento\Framework\Api\Search\SearchCriteriaBuilder" shared="false"/>
     <type name="Magento\Framework\Api\Search\FilterGroupBuilder" shared="false"/>
-    <type name="Magento\Framework\View\Xsd\Reader">
+    <type name="Magento\Framework\Config\View">
         <arguments>
-            <argument name="fileName" xsi:type="string">view.xsd</argument>
-            <argument name="defaultScope" xsi:type="string">global</argument>
-            <argument name="searchFilesPattern" xsi:type="string">urn:magento:framework:Config/etc/</argument>
+            <argument name="fileName" xsi:type="string">view.xml</argument>
         </arguments>
     </type>
 </config>
diff --git a/lib/internal/Magento/Framework/Config/Converter.php b/lib/internal/Magento/Framework/Config/Converter.php
new file mode 100644
index 0000000000000..090edc518dab4
--- /dev/null
+++ b/lib/internal/Magento/Framework/Config/Converter.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Config;
+
+use Magento\Framework\View\Xsd\Media\TypeDataExtractorPool;
+
+class Converter implements \Magento\Framework\Config\ConverterInterface
+{
+    /**
+     * @var \Magento\Framework\View\Xsd\Media\TypeDataExtractorPool
+     */
+    protected $extractorPool;
+
+    /**
+     * @param TypeDataExtractorPool $extractorPool
+     */
+    public function __construct(TypeDataExtractorPool $extractorPool)
+    {
+        $this->extractorPool = $extractorPool;
+    }
+
+    /**
+     * Convert dom node tree to array
+     *
+     * @param \DOMDocument $source
+     * @return array
+     * @throws \InvalidArgumentException
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function convert($source)
+    {
+        $xpath = new \DOMXPath($source);
+        $output = [];
+        foreach ($xpath->evaluate('/view') as $typeNode) {
+            foreach ($typeNode->childNodes as $childNode) {
+                if ($childNode->nodeType != XML_ELEMENT_NODE) {
+                    continue;
+                }
+                switch ($childNode->nodeName) {
+                    case 'vars':
+                        $moduleName = $childNode->getAttribute('module');
+                        $output[$childNode->tagName][$moduleName] = $this->parseVarElement($childNode);
+                        break;
+                    case 'exclude':
+                        /** @var $itemNode \DOMElement */
+                        foreach ($childNode->getElementsByTagName('item') as $itemNode) {
+                            $itemType = $itemNode->getAttribute('type');
+                            $output[$childNode->tagName][$itemType][] = $itemNode->nodeValue;
+                        }
+                        break;
+                    case 'media':
+                        foreach ($childNode->childNodes as $mediaNode) {
+                            if ($mediaNode instanceof \DOMElement) {
+                                $mediaNodesArray =
+                                    $this->extractorPool->nodeProcessor($mediaNode->tagName)->process(
+                                        $mediaNode,
+                                        $childNode->tagName
+                                    );
+                                $output = array_merge_recursive($output, $mediaNodesArray);
+                            }
+                        }
+                        break;
+                }
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * Recursive parser for <var> nodes
+     *
+     * @param \DOMElement $node
+     * @return string|boolean|number|null|[]
+     */
+    protected function parseVarElement(\DOMElement $node)
+    {
+        $result = [];
+        for ($varNode = $node->firstChild; $varNode !== null; $varNode = $varNode->nextSibling) {
+            if ($varNode instanceof \DOMElement && $varNode->tagName == "var") {
+                $varName = $varNode->getAttribute('name');
+                $result[$varName] = $this->parseVarElement($varNode);
+            }
+        }
+        if (!count($result)) {
+            $result = $node->nodeValue;
+        }
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Config/SchemaLocator.php
index d61da4c75f397..833a0e0f1a9a9 100644
--- a/lib/internal/Magento/Framework/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Config/SchemaLocator.php
@@ -50,6 +50,6 @@ public function getSchema()
      */
     public function getPerFileSchema()
     {
-        return $this->_perFileSchema;
+        return $this->_schema;
     }
 }
diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
index f216b7e429cdd..746193f1fb420 100644
--- a/lib/internal/Magento/Framework/Config/View.php
+++ b/lib/internal/Magento/Framework/Config/View.php
@@ -10,60 +10,53 @@
 namespace Magento\Framework\Config;
 
 use Magento\Framework\Config\Dom\UrnResolver;
-use Magento\Framework\View\Xsd\Media\TypeDataExtractorPool;
 
 class View extends \Magento\Framework\Config\Reader\Filesystem
 {
     /** @var UrnResolver */
     protected $urnResolver;
 
-    /**
-     * @var \Magento\Framework\View\Xsd\Media\TypeDataExtractorPool
-     */
-    protected $extractorPool;
-
     /**
      * @var array
      */
     protected $xpath;
 
-    /**
-     * @var Reader
+    /*
+     * @var array
      */
-    private $xsdReader;
-
     private $data;
 
     /**
+     * @param FileResolverInterface $fileResolver
+     * @param Converter $converter
+     * @param SchemaLocator $schemaLocator
+     * @param ValidationStateInterface $validationState
+     * @param string $fileName
      * @param array $fileList
      * @param UrnResolver $urnResolver
-     * @param TypeDataExtractorPool $extractorPool
      * @param array $xpath
      */
     public function __construct(
-        \Magento\Framework\Config\FileResolverInterface $fileResolver,
-        \Magento\Framework\Config\ConverterInterface $converter,
-        \Magento\Framework\Config\SchemaLocator $schemaLocator,
-        \Magento\Framework\Config\ValidationStateInterface $validationState,
+        FileResolverInterface $fileResolver,
+        Converter $converter,
+        SchemaLocator $schemaLocator,
+        ValidationStateInterface $validationState,
+        $fileName,
         $fileList,
         UrnResolver $urnResolver,
-        TypeDataExtractorPool $extractorPool,
         $xpath = []
     ) {
         $this->xpath = $xpath;
-        $this->extractorPool = $extractorPool;
         $this->urnResolver = $urnResolver;
-        //parent::__construct($fileList);
         $idAttributes = $this->_getIdAttributes();
         parent::__construct(
             $fileResolver,
             $converter,
             $schemaLocator,
             $validationState,
-            'view.xml',
+            $fileName,
             $idAttributes
         );
-        //$test = $this->_readFiles($fileList);
         $this->data = $this->getExtractedData($fileList);
     }
 
@@ -79,112 +72,8 @@ public function getSchemaFile()
 
     public function getExtractedData($fileList)
     {
-        $test = $this->getMergedConfig($fileList);
-        $test2 = $this->extractData($test);
-        return $test2;
-    }
-
-    public function getMergedConfig($fileList)
-    {
-        return $this->_readFiles($fileList);
-    }
-
-    /**
-     * Extract configuration data from the DOM structure
-     *
-     * @param \DOMDocument $dom
-     * @return array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
-    protected function _extractData2(\DOMDocument $dom)
-    {
-        $result = [];
-        /** @var $varsNode \DOMElement */
-        foreach ($dom->childNodes->item(0)->childNodes as $childNode) {
-            switch ($childNode->tagName) {
-                case 'vars':
-                    $moduleName = $childNode->getAttribute('module');
-                    $result[$childNode->tagName][$moduleName] = $this->parseVarElement($childNode);
-                    break;
-                case 'exclude':
-                    /** @var $itemNode \DOMElement */
-                    foreach ($childNode->getElementsByTagName('item') as $itemNode) {
-                        $itemType = $itemNode->getAttribute('type');
-                        $result[$childNode->tagName][$itemType][] = $itemNode->nodeValue;
-                    }
-                    break;
-                case 'media':
-                    foreach ($childNode->childNodes as $mediaNode) {
-                        if ($mediaNode instanceof \DOMElement) {
-                            $mediaNodesArray =
-                                $this->extractorPool->nodeProcessor($mediaNode->tagName)->process(
-                                    $mediaNode,
-                                    $childNode->tagName
-                                );
-                            $result = array_merge_recursive($result, $mediaNodesArray);
-                        }
-                    }
-                    break;
-            }
-        }
-        return $result;
-    }
-
-    protected function extractData(array $dom)
-    {
-        $result = [];
-        /** @var $varsNode \DOMElement */
-        foreach ($dom['view'][0] as $key => $childNode) {
-            switch ($key) {
-                case 'vars':
-                    //$moduleName = $childNode->getAttribute('module');
-                    $moduleName = $childNode[$key][0]['@attributes']['module'];
-                    //$result[$childNode->tagName][$moduleName] = $this->parseVarElement($childNode);
-                    $result[$key][$moduleName] = 'test';
-                    break;
-//                case 'exclude':
-//                    /** @var $itemNode \DOMElement */
-//                    foreach ($childNode->getElementsByTagName('item') as $itemNode) {
-//                        $itemType = $itemNode->getAttribute('type');
-//                        $result[$childNode->tagName][$itemType][] = $itemNode->nodeValue;
-//                    }
-//                    break;
-//                case 'media':
-//                    foreach ($childNode->childNodes as $mediaNode) {
-//                        if ($mediaNode instanceof \DOMElement) {
-//                            $mediaNodesArray =
-//                                $this->extractorPool->nodeProcessor($mediaNode->tagName)->process(
-//                                    $mediaNode,
-//                                    $childNode->tagName
-//                                );
-//                            $result = array_merge_recursive($result, $mediaNodesArray);
-//                        }
-//                    }
-//                    break;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Recursive parser for <var> nodes
-     *
-     * @param \DOMElement $node
-     * @return string|boolean|number|null|[]
-     */
-    protected function parseVarElement(\DOMElement $node)
-    {
-        $result = [];
-        for ($varNode = $node->firstChild; $varNode !== null; $varNode = $varNode->nextSibling) {
-            if ($varNode instanceof \DOMElement && $varNode->tagName == "var") {
-                $varName = $varNode->getAttribute('name');
-                $result[$varName] = $this->parseVarElement($varNode);
-            }
-        }
-        if (!count($result)) {
-            $result = $node->nodeValue;
-        }
-        return $result;
+        $output = $this->_readFiles($fileList);
+        return $output;
     }
 
     /**
@@ -197,7 +86,7 @@ protected function parseVarElement(\DOMElement $node)
      */
     public function getVars($module)
     {
-        return isset($this->_data['vars'][$module]) ? $this->_data['vars'][$module] : [];
+        return isset($this->data['vars'][$module]) ? $this->data['vars'][$module] : [];
     }
 
     /**
@@ -209,11 +98,11 @@ public function getVars($module)
      */
     public function getVarValue($module, $var)
     {
-        if (!isset($this->_data['vars'][$module])) {
+        if (!isset($this->data['vars'][$module])) {
             return false;
         }
 
-        $value = $this->_data['vars'][$module];
+        $value = $this->data['vars'][$module];
         foreach (explode('/', $var) as $node) {
             if (is_array($value) && isset($value[$node])) {
                 $value = $value[$node];
@@ -234,7 +123,7 @@ public function getVarValue($module, $var)
      */
     public function getMediaEntities($module, $mediaType)
     {
-        return isset($this->_data['media'][$module][$mediaType]) ? $this->_data['media'][$module][$mediaType] : [];
+        return isset($this->data['media'][$module][$mediaType]) ? $this->data['media'][$module][$mediaType] : [];
     }
 
     /**
@@ -247,8 +136,8 @@ public function getMediaEntities($module, $mediaType)
      */
     public function getMediaAttributes($module, $mediaType, $mediaId)
     {
-        return isset($this->_data['media'][$module][$mediaType][$mediaId])
-            ? $this->_data['media'][$module][$mediaType][$mediaId]
+        return isset($this->data['media'][$module][$mediaType][$mediaId])
+            ? $this->data['media'][$module][$mediaType][$mediaId]
             : [];
     }
 
@@ -262,17 +151,6 @@ public function getDomConfigCopy()
         return clone $this->_getDomConfigModel();
     }
 
-    /**
-     * Getter for initial view.xml contents
-     *
-     * @return string
-     */
-    protected function _getInitialXml()
-    {
-        return '<?xml version="1.0" encoding="UTF-8"?>' .
-        '<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"></view>';
-    }
-
     /**
      * Variables are identified by module and name
      *
@@ -340,6 +218,6 @@ public function getExcludedDir()
      */
     protected function getItems()
     {
-        return isset($this->_data['exclude']) ? $this->_data['exclude'] : [];
+        return isset($this->data['exclude']) ? $this->data['exclude'] : [];
     }
 }

From be5c5f2c1c358a797290179c80f9eebf1e9246fb Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Wed, 28 Oct 2015 22:28:16 +0300
Subject: [PATCH 05/32] MAGETWO-44227: small fixes

---
 .../Framework/Config/Reader/Filesystem.php      | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
index 426d612123661..992158c6edf63 100644
--- a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
+++ b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
@@ -129,17 +129,6 @@ public function read($scope = null)
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _readFiles($fileList)
-    {
-        $configMerger = $this->getMergedConfig($fileList);
-
-        $output = [];
-        if ($configMerger) {
-            $output = $this->_converter->convert($configMerger->getDom());
-        }
-        return $output;
-    }
-
-    public function getMergedConfig($fileList)
     {
         /** @var \Magento\Framework\Config\Dom $configMerger */
         $configMerger = null;
@@ -166,7 +155,11 @@ public function getMergedConfig($fileList)
             }
         }
 
-        return $configMerger;
+        $output = [];
+        if ($configMerger) {
+            $output = $this->_converter->convert($configMerger->getDom());
+        }
+        return $output;
     }
 
     /**

From 8451749a233306faae9554fa2fc1b8cd1923b235 Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Thu, 29 Oct 2015 13:38:17 +0300
Subject: [PATCH 06/32] MAGETWO-44227: change complexity

---
 .../Magento/Framework/Config/Converter.php    | 66 +++++++++++--------
 .../Framework/Config/SchemaLocator.php        | 15 ++---
 2 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/lib/internal/Magento/Framework/Config/Converter.php b/lib/internal/Magento/Framework/Config/Converter.php
index 090edc518dab4..9cd008f96846f 100644
--- a/lib/internal/Magento/Framework/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Config/Converter.php
@@ -28,8 +28,6 @@ public function __construct(TypeDataExtractorPool $extractorPool)
      * @param \DOMDocument $source
      * @return array
      * @throws \InvalidArgumentException
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function convert($source)
     {
@@ -40,36 +38,50 @@ public function convert($source)
                 if ($childNode->nodeType != XML_ELEMENT_NODE) {
                     continue;
                 }
-                switch ($childNode->nodeName) {
-                    case 'vars':
-                        $moduleName = $childNode->getAttribute('module');
-                        $output[$childNode->tagName][$moduleName] = $this->parseVarElement($childNode);
-                        break;
-                    case 'exclude':
-                        /** @var $itemNode \DOMElement */
-                        foreach ($childNode->getElementsByTagName('item') as $itemNode) {
-                            $itemType = $itemNode->getAttribute('type');
-                            $output[$childNode->tagName][$itemType][] = $itemNode->nodeValue;
-                        }
-                        break;
-                    case 'media':
-                        foreach ($childNode->childNodes as $mediaNode) {
-                            if ($mediaNode instanceof \DOMElement) {
-                                $mediaNodesArray =
-                                    $this->extractorPool->nodeProcessor($mediaNode->tagName)->process(
-                                        $mediaNode,
-                                        $childNode->tagName
-                                    );
-                                $output = array_merge_recursive($output, $mediaNodesArray);
-                            }
-                        }
-                        break;
-                }
+                $result = $this->parseNodes($childNode);
+                $output = array_merge_recursive($output, $result);
             }
         }
         return $output;
     }
 
+    /**
+     * Parse node values from xml nodes
+     *
+     * @param $childNode
+     * @return array
+     */
+    protected function parseNodes($childNode)
+    {
+        $output = [];
+        switch ($childNode->nodeName) {
+            case 'vars':
+                $moduleName = $childNode->getAttribute('module');
+                $output[$childNode->tagName][$moduleName] = $this->parseVarElement($childNode);
+                break;
+            case 'exclude':
+                /** @var $itemNode \DOMElement */
+                foreach ($childNode->getElementsByTagName('item') as $itemNode) {
+                    $itemType = $itemNode->getAttribute('type');
+                    $output[$childNode->tagName][$itemType][] = $itemNode->nodeValue;
+                }
+                break;
+            case 'media':
+                foreach ($childNode->childNodes as $mediaNode) {
+                    if ($mediaNode instanceof \DOMElement) {
+                        $mediaNodesArray =
+                            $this->extractorPool->nodeProcessor($mediaNode->tagName)->process(
+                                $mediaNode,
+                                $childNode->tagName
+                            );
+                        $output = array_merge_recursive($output, $mediaNodesArray);
+                    }
+                }
+                break;
+        }
+        return $output;
+    }
+
     /**
      * Recursive parser for <var> nodes
      *
diff --git a/lib/internal/Magento/Framework/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Config/SchemaLocator.php
index 833a0e0f1a9a9..1ec89ef06a53f 100644
--- a/lib/internal/Magento/Framework/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Config/SchemaLocator.php
@@ -16,21 +16,14 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      *
      * @var string
      */
-    protected $_schema = null;
-
-    /**
-     * Path to corresponding XSD file with validation rules for separate config files
-     *
-     * @var string
-     */
-    protected $_perFileSchema = null;
+    protected $schema = null;
 
     /**
      * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
      */
     public function __construct(UrnResolver $urnResolver)
     {
-        $this->_schema = $urnResolver->getRealPath('urn:magento:framework:Config/etc/view.xsd');
+        $this->schema = $urnResolver->getRealPath('urn:magento:framework:Config/etc/view.xsd');
     }
 
     /**
@@ -40,7 +33,7 @@ public function __construct(UrnResolver $urnResolver)
      */
     public function getSchema()
     {
-        return $this->_schema;
+        return $this->schema;
     }
 
     /**
@@ -50,6 +43,6 @@ public function getSchema()
      */
     public function getPerFileSchema()
     {
-        return $this->_schema;
+        return $this->getSchema();
     }
 }

From 5c997d44b8dbba5b65fe6f513365842e55296983 Mon Sep 17 00:00:00 2001
From: Mikalai_Eutsikhieu <Mikalai_Eutsikhieu@epam.com>
Date: Thu, 29 Oct 2015 17:27:05 +0300
Subject: [PATCH 07/32] Fix tab bug on storefront

---
 .../Magento_ProductVideo/web/css/source/_module.less | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less
index f13d4143e5a0d..e686f59b9481c 100644
--- a/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less
@@ -81,3 +81,15 @@ and (orientation : landscape) {
     bottom: 89%;
     top: auto;
 }
+
+.fotorama__stage__shaft:focus .fotorama__stage__frame.fotorama__active:after {
+    bottom: 0;
+    content: '';
+    height: 100px;
+    left: 0;
+    margin: auto;
+    position: absolute;
+    right: 0;
+    top: 12px;
+    width: 100px;
+}

From 57610ce22efc77aa9148f64f568f4053b48eabf3 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Thu, 29 Oct 2015 21:46:32 +0300
Subject: [PATCH 08/32] Rename button Delete

---
 .../ProductVideo/view/adminhtml/web/js/new-video-dialog.js      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
index fe8e76ded235d..35dac88217e20 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
@@ -729,6 +729,8 @@ define([
             $productGalleryWrapper.parent().addClass('video-item');
             $imageWidget.removeClass('video-item');
             $productGalleryWrapper.removeClass('video-item');
+            $('.video-item .action-delete').attr('title',  $.mage.__('Delete video'));
+            $('.video-item .action-delete span').html($.mage.__('Delete video'));
         },
 
         /**

From 5a4886358531cd7600f3cd4e2e59ac4a64781f3a Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Fri, 30 Oct 2015 11:04:39 +0300
Subject: [PATCH 09/32] Add additional params on configurations

---
 app/code/Magento/ProductVideo/Helper/Media.php | 14 ++++++++++++++
 .../ProductVideo/etc/adminhtml/system.xml      | 14 +++++++++++++-
 app/code/Magento/ProductVideo/etc/config.xml   | 18 ++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/ProductVideo/etc/config.xml

diff --git a/app/code/Magento/ProductVideo/Helper/Media.php b/app/code/Magento/ProductVideo/Helper/Media.php
index 657c81f3aaede..28674d4795553 100644
--- a/app/code/Magento/ProductVideo/Helper/Media.php
+++ b/app/code/Magento/ProductVideo/Helper/Media.php
@@ -46,6 +46,20 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
      */
     const XML_PATH_YOUTUBE_API_KEY = 'catalog/product_video/youtube_api_key';
 
+    /**
+     * Configuration path for video play
+     */
+    const XML_PATH_PLAY_IF_BASE = 'catalog/product_video/play_if_base';
+
+    /**
+     * Configuration path
+     */
+    const XML_PATH_SHOW_RELATED = 'catalog/product_video/show_related';
+    /**
+     * Configuration path
+     */
+    const XML_PATH_VIDEO_AUTO_RESTART = 'catalog/product_video/youtube_api_key';
+
     /**
      * @var ConfigInterface
      */
diff --git a/app/code/Magento/ProductVideo/etc/adminhtml/system.xml b/app/code/Magento/ProductVideo/etc/adminhtml/system.xml
index d00f9a78e6b65..e229fc80d4743 100644
--- a/app/code/Magento/ProductVideo/etc/adminhtml/system.xml
+++ b/app/code/Magento/ProductVideo/etc/adminhtml/system.xml
@@ -10,9 +10,21 @@
         <section id="catalog">
             <group id="product_video" translate="label" type="text" sortOrder="350" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Product Video</label>
-                <field id="youtube_api_key" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="youtube_api_key" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>YouTube API Key</label>
                 </field>
+                <field id="play_if_base" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Autostart base video</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="show_related" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Show related video</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="video_auto_restart" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Auto restart video</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
         </section>
     </system>
diff --git a/app/code/Magento/ProductVideo/etc/config.xml b/app/code/Magento/ProductVideo/etc/config.xml
new file mode 100644
index 0000000000000..127ba79e77d60
--- /dev/null
+++ b/app/code/Magento/ProductVideo/etc/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <catalog>
+            <product_video>
+                <play_if_base>1</play_if_base>
+                <show_related>0</show_related>
+                <video_auto_restart>0</video_auto_restart>
+            </product_video>
+        </catalog>
+    </default>
+</config>

From bcf996cc342683a91754473604674f2c6fafcd03 Mon Sep 17 00:00:00 2001
From: Mikalai_Eutsikhieu <Mikalai_Eutsikhieu@epam.com>
Date: Fri, 30 Oct 2015 12:44:53 +0300
Subject: [PATCH 10/32] Fixed arrows on storefront. Arrows now hide and show
 properly

---
 .../view/frontend/web/js/fotorama-add-video-events.js           | 2 ++
 .../blank/Magento_ProductVideo/web/css/source/_module.less      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
index 16f3aa9f922ae..3aa8551748156 100644
--- a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
+++ b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
@@ -499,6 +499,7 @@ define([
                     if (!self.isFullscreen) {
                         self._showCloseVideo();
                     }
+                    $('.' + self.FTAR).addClass('hidden-video');
                 }
             });
             this._handleBaseVideo(fotorama, number); //check for video is it base and handle it if it's base
@@ -579,6 +580,7 @@ define([
                 self._hideCloseVideo();
 
             });
+            $('.' + this.FTAR).removeClass('hidden-video');
         }
     });
 
diff --git a/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less
index e686f59b9481c..0d0f8c38bc381 100644
--- a/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less
@@ -74,7 +74,7 @@ and (orientation : landscape) {
 }
 
 .fotorama__arr.hidden-video {
-    z-index: -1;
+    z-index: -1 !important;
 }
 
 .fotorama__video-close {

From 7f007f9083d175d97285cbece31d1ac60e3bfb92 Mon Sep 17 00:00:00 2001
From: Mikalai_Eutsikhieu <Mikalai_Eutsikhieu@epam.com>
Date: Fri, 30 Oct 2015 15:45:59 +0300
Subject: [PATCH 11/32] Fixed video behavior on storefront

---
 .../web/js/fotorama-add-video-events.js       | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
index 3aa8551748156..a15e8c1c1a023 100644
--- a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
+++ b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
@@ -102,6 +102,7 @@ define([
         FTVC: 'fotorama__video-close',
         FTAR: 'fotorama__arr',
         isFullscreen: 0,
+        inFullscreen: false,
         Base: 0, //on check for video is base this setting become true if there is any video with base role
         MobileMaxWidth: 767,
         GP: 'gallery-placeholder', //gallery placeholder class is needed to find and erase <script> tag
@@ -113,6 +114,7 @@ define([
         _init: function () {
             if (this._checkForVideoExist()) {
                 this._checkFullscreen();
+                this._listenForFullscreen();
                 this._checkForVimeo();
                 this._isVideoBase();
                 this._initFotoramaVideo();
@@ -130,6 +132,19 @@ define([
             }
         },
 
+        /**
+         *
+         * @private
+         */
+        _listenForFullscreen: function () {
+            $(this.element).on('fotorama:fullscreenenter', $.proxy(function () {
+                this.inFullscreen = true;
+            }, this));
+            $(this.element).on('fotorama:fullscreenexit', $.proxy(function () {
+                this.inFullscreen = false;
+            }, this));
+        },
+
         /**
          *
          * @param {Object} inputData
@@ -502,6 +517,13 @@ define([
                     $('.' + self.FTAR).addClass('hidden-video');
                 }
             });
+
+            if (this.inFullscreen) {
+                $(this.element).data('fotorama').activeFrame.$stageFrame[0].click();
+            }
+            $(this.element).on('fotorama:fullscreenenter', $.proxy(function () {
+                $(this.element).data('fotorama').activeFrame.$stageFrame[0].click();
+            }, this));
             this._handleBaseVideo(fotorama, number); //check for video is it base and handle it if it's base
         },
 
@@ -533,7 +555,13 @@ define([
                     }, this), 50);
                 } else { //if not a vimeo - play it immediately with a little lag in case for fotorama fullscreen
                     setTimeout($.proxy(function () {
+                        fotorama.requestFullScreen();
                         $(this.element).data('fotorama').activeFrame.$stageFrame[0].click();
+                        $('.fotorama__fullscreen-icon').css({
+                            opacity: '1',
+                            visibility: 'visible',
+                            display: 'block'
+                        });
                         this.Base = false;
                     }, this), 50);
                 }

From 863a3b56fe3dc47405a1f4f7b95ead88cbe24815 Mon Sep 17 00:00:00 2001
From: Mikalai_Shostka <mikalai_shostka@epam.com>
Date: Fri, 30 Oct 2015 17:13:53 +0300
Subject: [PATCH 12/32] Fix remove item from product gallery

---
 .../Catalog/view/adminhtml/web/js/product-gallery.js      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/product-gallery.js b/app/code/Magento/Catalog/view/adminhtml/web/js/product-gallery.js
index 4fef5dbb06679..89edaedd7d059 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/product-gallery.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/product-gallery.js
@@ -181,6 +181,14 @@ define([
         _removeItem: function (event, imageData) {
             var $imageContainer = this.findElement(imageData);
             imageData.isRemoved = true;
+
+            if(!imageData['value_id']) {
+                delete this.options.images[imageData.file];
+                $imageContainer.remove();
+
+                return;
+            }
+
             $imageContainer.addClass('removed').hide().find('.is-removed').val(1);
         },
 

From 2e98407bd34c6c4ba8138d4b3a7f1acd7b5615dd Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Fri, 30 Oct 2015 19:19:07 +0300
Subject: [PATCH 13/32] Create getters for additional parameters

---
 .../Magento/ProductVideo/Helper/Media.php     | 98 ++-----------------
 1 file changed, 6 insertions(+), 92 deletions(-)

diff --git a/app/code/Magento/ProductVideo/Helper/Media.php b/app/code/Magento/ProductVideo/Helper/Media.php
index 28674d4795553..c4c5ca6af980a 100644
--- a/app/code/Magento/ProductVideo/Helper/Media.php
+++ b/app/code/Magento/ProductVideo/Helper/Media.php
@@ -8,8 +8,6 @@
 
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Helper\Context;
-use Magento\Framework\View\ConfigInterface;
-use Magento\Framework\View\DesignInterface;
 
 /**
  * Helper to get attributes for video
@@ -21,26 +19,6 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
      */
     const MODULE_NAME = 'Magento_ProductVideo';
 
-    /**
-     * Video play attribute
-     */
-    const NODE_CONFIG_PLAY_IF_BASE = 'play_if_base';
-
-    /**
-     * Video stop attribute
-     */
-    const NODE_CONFIG_SHOW_RELATED = 'show_related';
-
-    /**
-     * Video color attribute
-     */
-    const NODE_CONFIG_VIDEO_AUTO_RESTART = 'video_auto_restart';
-
-    /**
-     * Media config node
-     */
-    const MEDIA_TYPE_CONFIG_NODE = 'videos';
-
     /**
      * Configuration path
      */
@@ -52,64 +30,21 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
     const XML_PATH_PLAY_IF_BASE = 'catalog/product_video/play_if_base';
 
     /**
-     * Configuration path
+     * Configuration path for show related
      */
     const XML_PATH_SHOW_RELATED = 'catalog/product_video/show_related';
     /**
-     * Configuration path
+     * Configuration path for video auto restart
      */
-    const XML_PATH_VIDEO_AUTO_RESTART = 'catalog/product_video/youtube_api_key';
+    const XML_PATH_VIDEO_AUTO_RESTART = 'catalog/product_video/video_auto_restart';
 
     /**
-     * @var ConfigInterface
-     */
-    protected $viewConfig;
-
-    /**
-     * Theme
-     *
-     * @var DesignInterface
-     */
-    protected $currentTheme;
-
-    /**
-     * Cached video config
-     */
-    protected $cachedVideoConfig;
-
-    /**
-     * @param ConfigInterface $configInterface
-     * @param DesignInterface $designInterface
      * @param Context $context
      */
     public function __construct(
-        ConfigInterface $configInterface,
-        DesignInterface $designInterface,
         Context $context
     ) {
         parent::__construct($context);
-        $this->viewConfig = $configInterface;
-        $this->currentTheme = $designInterface->getDesignTheme();
-        $this->initConfig();
-    }
-
-    /**
-     * Cached video config
-     *
-     * @return $this
-     */
-    protected function initConfig()
-    {
-        if ($this->cachedVideoConfig === null) {
-            $this->cachedVideoConfig = $this->viewConfig->getViewConfig(
-                [
-                    'area' => Area::AREA_FRONTEND,
-                    'themeModel' => $this->currentTheme
-                ]
-            );
-        }
-
-        return $this;
     }
 
     /**
@@ -119,14 +54,7 @@ protected function initConfig()
      */
     public function getPlayIfBaseAttribute()
     {
-        $videoAttributes = $this->cachedVideoConfig->getMediaAttributes(
-            self::MODULE_NAME,
-            self::MEDIA_TYPE_CONFIG_NODE,
-            self::NODE_CONFIG_PLAY_IF_BASE
-        );
-        if (isset($videoAttributes[self::NODE_CONFIG_PLAY_IF_BASE])) {
-            return $videoAttributes[self::NODE_CONFIG_PLAY_IF_BASE];
-        }
+        return $this->scopeConfig->getValue(self::XML_PATH_PLAY_IF_BASE);
     }
 
     /**
@@ -136,14 +64,7 @@ public function getPlayIfBaseAttribute()
      */
     public function getShowRelatedAttribute()
     {
-        $videoAttributes = $this->cachedVideoConfig->getMediaAttributes(
-            self::MODULE_NAME,
-            self::MEDIA_TYPE_CONFIG_NODE,
-            self::NODE_CONFIG_SHOW_RELATED
-        );
-        if (isset($videoAttributes[self::NODE_CONFIG_SHOW_RELATED])) {
-            return $videoAttributes[self::NODE_CONFIG_SHOW_RELATED];
-        }
+        return $this->scopeConfig->getValue(self::XML_PATH_SHOW_RELATED);
     }
 
     /**
@@ -153,14 +74,7 @@ public function getShowRelatedAttribute()
      */
     public function getVideoAutoRestartAttribute()
     {
-        $videoAttributes = $this->cachedVideoConfig->getMediaAttributes(
-            self::MODULE_NAME,
-            self::MEDIA_TYPE_CONFIG_NODE,
-            self::NODE_CONFIG_VIDEO_AUTO_RESTART
-        );
-        if (isset($videoAttributes[self::NODE_CONFIG_VIDEO_AUTO_RESTART])) {
-            return $videoAttributes[self::NODE_CONFIG_VIDEO_AUTO_RESTART];
-        }
+        return $this->scopeConfig->getValue(self::XML_PATH_VIDEO_AUTO_RESTART);
     }
 
     /**

From 77807f787826d8dc62e763d82f454a983ecaa1ef Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Sat, 31 Oct 2015 02:07:40 +0300
Subject: [PATCH 14/32] MAGNTWO-44227: improvements for interfaces

---
 app/etc/di.xml                                |  3 +
 .../Magento/Framework/Config/FileResolver.php | 91 +++++++++++++++++++
 .../Magento/Framework/Config/View.php         | 28 ++----
 .../Magento/Framework/Config/ViewFactory.php  | 12 +--
 .../Magento/Framework/View/Config.php         | 81 ++---------------
 5 files changed, 117 insertions(+), 98 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Config/FileResolver.php

diff --git a/app/etc/di.xml b/app/etc/di.xml
index 63d04bf4b975c..cbbac487232e0 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -1065,6 +1065,9 @@
     <type name="Magento\Framework\Config\View">
         <arguments>
             <argument name="fileName" xsi:type="string">view.xml</argument>
+            <argument name="converterInterface" xsi:type="object">Magento\Framework\Config\Converter</argument>
+            <argument name="schemaLocatorInterface" xsi:type="object">Magento\Framework\Config\SchemaLocator</argument>
+            <argument name="fileResolver" xsi:type="object">Magento\Framework\Config\FileResolver</argument>
         </arguments>
     </type>
 </config>
diff --git a/lib/internal/Magento/Framework/Config/FileResolver.php b/lib/internal/Magento/Framework/Config/FileResolver.php
new file mode 100644
index 0000000000000..991b4b98fc095
--- /dev/null
+++ b/lib/internal/Magento/Framework/Config/FileResolver.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Application config file resolver
+ *
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Config;
+
+use Magento\Framework\Module\Dir\Reader;
+use Magento\Framework\Filesystem;
+use Magento\Framework\View\DesignInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+class FileResolver implements \Magento\Framework\Config\FileResolverInterface
+{
+    /**
+     * Module configuration file reader
+     *
+     * @var \Magento\Framework\Module\Dir\Reader
+     */
+    protected $moduleReader;
+
+    /**
+     * @var \Magento\Framework\Config\FileIteratorFactory
+     */
+    protected $iteratorFactory;
+
+    /**
+     * @var \Magento\Framework\View\DesignInterface
+     */
+    protected $currentTheme;
+
+    /**
+     * @var string
+     */
+    protected $themePath;
+
+    /**
+     * @var string
+     */
+    protected $area;
+
+    /**
+     * @param \Magento\Framework\Module\Dir\Reader $moduleReader
+     * @param FileIteratorFactory $iteratorFactory
+     * @param DesignInterface $designInterface
+     * @param \Magento\Framework\Filesystem $filesystem
+     * @param DirectoryList $directoryList
+     */
+    public function __construct(
+        Reader $moduleReader,
+        FileIteratorFactory $iteratorFactory,
+        DesignInterface $designInterface,
+        Filesystem $filesystem,
+        DirectoryList $directoryList
+    ) {
+        $this->directoryList = $directoryList;
+        $this->iteratorFactory = $iteratorFactory;
+        $this->moduleReader = $moduleReader;
+        $this->currentTheme = $designInterface->getDesignTheme();
+        $this->themePath = $designInterface->getThemePath($this->currentTheme);
+        $this->area = $designInterface->getArea();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get($filename, $scope)
+    {
+        switch ($scope) {
+            case 'global':
+                $iterator = $this->moduleReader->getConfigurationFiles($filename)->toArray();
+                $designPath =
+                    $this->directoryList->getPath(DirectoryList::APP)
+                    . '/design/'
+                    . $this->area
+                    . '/'
+                    . $this->themePath
+                    . '/etc/view.xml';
+                $designDom = new \DOMDocument;
+                $designDom->load($designPath);
+                $iterator[$designPath] = $designDom->saveXML();
+                break;
+            default:
+                $iterator = $this->iteratorFactory->create([]);
+                break;
+        }
+        return $iterator;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
index 746193f1fb420..025ff3f40baa1 100644
--- a/lib/internal/Magento/Framework/Config/View.php
+++ b/lib/internal/Magento/Framework/Config/View.php
@@ -28,22 +28,20 @@ class View extends \Magento\Framework\Config\Reader\Filesystem
 
     /**
      * @param FileResolverInterface $fileResolver
-     * @param Converter $converter
-     * @param SchemaLocator $schemaLocator
      * @param ValidationStateInterface $validationState
-     * @param string $fileName
-     * @param array $fileList
      * @param UrnResolver $urnResolver
+     * @param ValidationStateInterface $fileName
+     * @param ConverterInterface $converterInterface
+     * @param SchemaLocatorInterface $schemaLocatorInterface
      * @param array $xpath
      */
     public function __construct(
-        FileResolverInterface $fileResolver,
-        Converter $converter,
-        SchemaLocator $schemaLocator,
         ValidationStateInterface $validationState,
-        $fileName,
-        $fileList,
         UrnResolver $urnResolver,
+        ConverterInterface $converterInterface,
+        SchemaLocatorInterface $schemaLocatorInterface,
+        FileResolverInterface $fileResolver,
+        $fileName,
         $xpath = []
     ) {
         $this->xpath = $xpath;
@@ -51,13 +49,13 @@ public function __construct(
         $idAttributes = $this->_getIdAttributes();
         parent::__construct(
             $fileResolver,
-            $converter,
-            $schemaLocator,
+            $converterInterface,
+            $schemaLocatorInterface,
             $validationState,
             $fileName,
             $idAttributes
         );
-        $this->data = $this->getExtractedData($fileList);
+        $this->data = $this->read();
     }
 
     /**
@@ -70,12 +68,6 @@ public function getSchemaFile()
         return $this->urnResolver->getRealPath('urn:magento:framework:Config/etc/view.xsd');
     }
 
-    public function getExtractedData($fileList)
-    {
-        $output = $this->_readFiles($fileList);
-        return $output;
-    }
-
     /**
      * Get a list of variables in scope of specified module
      *
diff --git a/lib/internal/Magento/Framework/Config/ViewFactory.php b/lib/internal/Magento/Framework/Config/ViewFactory.php
index 76032da97adb7..575d8691cd9ac 100644
--- a/lib/internal/Magento/Framework/Config/ViewFactory.php
+++ b/lib/internal/Magento/Framework/Config/ViewFactory.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Framework\Config;
 
+use Magento\Framework\ObjectManagerInterface;
+
 class ViewFactory
 {
     /**
@@ -18,20 +20,18 @@ class ViewFactory
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      */
-    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
+    public function __construct(ObjectManagerInterface $objectManager)
     {
         $this->objectManager = $objectManager;
     }
 
     /**
-     * @param array $configFiles
-     * @return View
+     * @return mixed
      */
-    public function create($configFiles)
+    public function create()
     {
         return $this->objectManager->create(
-            'Magento\Framework\Config\View',
-            ['fileList' => $configFiles]
+            'Magento\Framework\Config\View'
         );
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Config.php b/lib/internal/Magento/Framework/View/Config.php
index fb4c687a73176..7831542cee7e2 100644
--- a/lib/internal/Magento/Framework/View/Config.php
+++ b/lib/internal/Magento/Framework/View/Config.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\View;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\View\Asset\Repository;
+use Magento\Framework\Config\ViewFactory;
 
 /**
  * Handles theme view.xml files
@@ -20,20 +20,6 @@ class Config implements \Magento\Framework\View\ConfigInterface
      */
     protected $viewConfigs = [];
 
-    /**
-     * Module configuration reader
-     *
-     * @var \Magento\Framework\Module\Dir\Reader
-     */
-    protected $moduleReader;
-
-    /**
-     * Root directory
-     *
-     * @var ReadInterface
-     */
-    protected $rootDirectory;
-
     /**
      * View service
      *
@@ -41,64 +27,25 @@ class Config implements \Magento\Framework\View\ConfigInterface
      */
     protected $assetRepo;
 
-    /**
-     * View file system model
-     *
-     * @var \Magento\Framework\View\FileSystem
-     */
-    protected $viewFileSystem;
-
-    /**
-     * File name
-     *
-     * @var string
-     */
-    protected $filename;
-
-    /**
-     * File iterator factory
-     *
-     * @var \Magento\Framework\Config\FileIteratorFactory
-     */
-    protected $fileIteratorFactory;
-
-    /** @var \Magento\Framework\Config\ViewFactory */
-    protected $viewConfigFactory;
-
     /**
      * File view factory
      *
      * @var \Magento\Framework\Config\ViewFactory
      */
-    protected $viewFactory;
+    protected $viewConfigFactory;
 
     /**
      * Constructor
      *
-     * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @param \Magento\Framework\Filesystem $filesystem
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @param \Magento\Framework\View\FileSystem $viewFileSystem
-     * @param \Magento\Framework\Config\FileIteratorFactory $fileIteratorFactory
+     * @param Asset\Repository $assetRepo
      * @param \Magento\Framework\Config\ViewFactory $viewConfigFactory
-     * @param string $filename
      */
     public function __construct(
-        \Magento\Framework\Module\Dir\Reader $moduleReader,
-        \Magento\Framework\Filesystem $filesystem,
-        \Magento\Framework\View\Asset\Repository $assetRepo,
-        \Magento\Framework\View\FileSystem $viewFileSystem,
-        \Magento\Framework\Config\FileIteratorFactory $fileIteratorFactory,
-        \Magento\Framework\Config\ViewFactory $viewConfigFactory,
-        $filename = self::CONFIG_FILE_NAME
+        Repository $assetRepo,
+        ViewFactory $viewConfigFactory
     ) {
-        $this->moduleReader = $moduleReader;
-        $this->rootDirectory = $filesystem->getDirectoryRead(DirectoryList::ROOT);
         $this->assetRepo = $assetRepo;
-        $this->viewFileSystem = $viewFileSystem;
-        $this->fileIteratorFactory = $fileIteratorFactory;
         $this->viewConfigFactory = $viewConfigFactory;
-        $this->filename = $filename;
     }
 
     /**
@@ -117,21 +64,7 @@ public function getViewConfig(array $params = [])
             return $this->viewConfigs[$key];
         }
 
-        $configFiles = $this->moduleReader->getConfigurationFiles(basename($this->filename))->toArray();
-        $themeConfigFile = $currentTheme->getCustomization()->getCustomViewConfigPath();
-        if (empty($themeConfigFile)
-            || !$this->rootDirectory->isExist($this->rootDirectory->getRelativePath($themeConfigFile))
-        ) {
-            $themeConfigFile = $this->viewFileSystem->getFilename($this->filename, $params);
-        }
-        if ($themeConfigFile
-            && $this->rootDirectory->isExist($this->rootDirectory->getRelativePath($themeConfigFile))
-        ) {
-            $configFiles[$this->rootDirectory->getRelativePath($themeConfigFile)] = $this->rootDirectory->readFile(
-                $this->rootDirectory->getRelativePath($themeConfigFile)
-            );
-        }
-        $config = $this->viewConfigFactory->create($configFiles);
+        $config = $this->viewConfigFactory->create();
 
         $this->viewConfigs[$key] = $config;
         return $config;

From 523fb715e6f3d73b2557e4aa933349ccef7030f9 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Sat, 31 Oct 2015 10:51:33 +0300
Subject: [PATCH 15/32] Delete wrong js code

---
 .../Catalog/view/adminhtml/web/js/product-gallery.js      | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/product-gallery.js b/app/code/Magento/Catalog/view/adminhtml/web/js/product-gallery.js
index 89edaedd7d059..4fef5dbb06679 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/product-gallery.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/product-gallery.js
@@ -181,14 +181,6 @@ define([
         _removeItem: function (event, imageData) {
             var $imageContainer = this.findElement(imageData);
             imageData.isRemoved = true;
-
-            if(!imageData['value_id']) {
-                delete this.options.images[imageData.file];
-                $imageContainer.remove();
-
-                return;
-            }
-
             $imageContainer.addClass('removed').hide().find('.is-removed').val(1);
         },
 

From a6a6935f88dfb892e12727c705475599bdf2a9c7 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Sat, 31 Oct 2015 11:28:31 +0300
Subject: [PATCH 16/32] Add constant

---
 app/code/Magento/ProductVideo/Helper/Media.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/code/Magento/ProductVideo/Helper/Media.php b/app/code/Magento/ProductVideo/Helper/Media.php
index c4c5ca6af980a..01ff848a96111 100644
--- a/app/code/Magento/ProductVideo/Helper/Media.php
+++ b/app/code/Magento/ProductVideo/Helper/Media.php
@@ -38,6 +38,11 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
      */
     const XML_PATH_VIDEO_AUTO_RESTART = 'catalog/product_video/video_auto_restart';
 
+    /**
+     * Media config node
+     */
+    const MEDIA_TYPE_CONFIG_NODE = 'videos';
+
     /**
      * @param Context $context
      */

From 75e1d418cac0a48a4399cda82c8a2a2d07689bae Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Sat, 31 Oct 2015 11:50:43 +0300
Subject: [PATCH 17/32] MAGNTWO-44227: change DOC comment

---
 lib/internal/Magento/Framework/Config/ViewFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Config/ViewFactory.php b/lib/internal/Magento/Framework/Config/ViewFactory.php
index 575d8691cd9ac..6fac9607edaa5 100644
--- a/lib/internal/Magento/Framework/Config/ViewFactory.php
+++ b/lib/internal/Magento/Framework/Config/ViewFactory.php
@@ -26,7 +26,7 @@ public function __construct(ObjectManagerInterface $objectManager)
     }
 
     /**
-     * @return mixed
+     * @return \Magento\Framework\Config\View
      */
     public function create()
     {

From adc344ad6a578cc18764b00a3821df0282f4edf7 Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Sat, 31 Oct 2015 13:12:09 +0300
Subject: [PATCH 18/32] MAGETWO-44227: revert unneeded changes

---
 lib/internal/Magento/Framework/Validator/Config.php       | 2 +-
 lib/internal/Magento/Framework/View/PageLayout/Config.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Validator/Config.php b/lib/internal/Magento/Framework/Validator/Config.php
index fca8c4c937723..9b10f61bb596d 100644
--- a/lib/internal/Magento/Framework/Validator/Config.php
+++ b/lib/internal/Magento/Framework/Validator/Config.php
@@ -11,7 +11,7 @@
 use Magento\Framework\Validator\Constraint\Option\Callback;
 use Magento\Framework\Validator\Constraint\OptionInterface;
 
-class Config extends \Magento\Framework\Config\Reader\Filesystem
+class Config extends \Magento\Framework\Config\AbstractXml
 {
     /**#@+
      * Constraints types
diff --git a/lib/internal/Magento/Framework/View/PageLayout/Config.php b/lib/internal/Magento/Framework/View/PageLayout/Config.php
index 5853ec728afac..31279b31a0616 100644
--- a/lib/internal/Magento/Framework/View/PageLayout/Config.php
+++ b/lib/internal/Magento/Framework/View/PageLayout/Config.php
@@ -9,7 +9,7 @@
 /**
  * Page layouts configuration
  */
-class Config extends \Magento\Framework\Config\Reader\Filesystem
+class Config extends \Magento\Framework\Config\AbstractXml
 {
     /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolver;

From f95caac85a1193c646b9f29ebe74d42efbe9ef6a Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Sat, 31 Oct 2015 14:54:07 +0300
Subject: [PATCH 19/32] MAGETWO44227: Fix statics and unit tests

---
 .../Magento/Framework/Config/View.php         | 14 ++---
 .../Framework/View/Test/Unit/ConfigTest.php   | 51 +------------------
 2 files changed, 4 insertions(+), 61 deletions(-)

diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
index 0ee4bf71263f9..78b725a7a7452 100644
--- a/lib/internal/Magento/Framework/Config/View.php
+++ b/lib/internal/Magento/Framework/Config/View.php
@@ -26,21 +26,13 @@ class View extends \Magento\Framework\Config\Reader\Filesystem
      */
     private $xsdReader;
 
-    /**
-     * @param array $configFiles
-     * @param UrnResolver $urnResolver
-     * @param ValidationStateInterface $fileName
-     * @param ConverterInterface $converterInterface
-     * @param SchemaLocatorInterface $schemaLocatorInterface
-     * @param array $xpath
-     */
     public function __construct(
-        ValidationStateInterface $validationState,
-        UrnResolver $urnResolver,
+        FileResolverInterface $fileResolver,
         ConverterInterface $converterInterface,
         SchemaLocatorInterface $schemaLocatorInterface,
-        FileResolverInterface $fileResolver,
+        ValidationStateInterface $validationState,
         $fileName,
+        UrnResolver $urnResolver,
         $xpath = []
     ) {
         $this->xpath = $xpath;
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/View/Test/Unit/ConfigTest.php
index c6c980ee74c53..22245af9509b4 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/ConfigTest.php
@@ -42,15 +42,9 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->readerMock = $this->getMock('Magento\Framework\Module\Dir\Reader', [], [], '', false);
         $this->filesystemMock = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
         $this->directoryReadMock = $this->getMock('Magento\Framework\Filesystem\Directory\ReadInterface');
-        $this->filesystemMock->expects($this->once())
-            ->method('getDirectoryRead')
-            ->with($this->equalTo(DirectoryList::ROOT))
-            ->will($this->returnValue($this->directoryReadMock));
         $this->repositoryMock = $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false);
-        $this->fileSystemMock = $this->getMock('Magento\Framework\View\FileSystem', [], [], '', false);
         $this->fileIteratorFactoryMock = $this->getMock(
             'Magento\Framework\Config\FileIteratorFactory',
             [],
@@ -63,10 +57,7 @@ protected function setUp()
         $this->config = $this->objectManagerHelper->getObject(
             'Magento\Framework\View\Config',
             [
-                'moduleReader' => $this->readerMock,
-                'filesystem' => $this->filesystemMock,
                 'assetRepo' => $this->repositoryMock,
-                'viewFileSystem' => $this->fileSystemMock,
                 'fileIteratorFactory' => $this->fileIteratorFactoryMock,
                 'viewConfigFactory' => $this->viewConfigFactoryMock
             ]
@@ -77,55 +68,15 @@ public function testGetViewConfig()
     {
         $themeMock = $this->getMock(
             'Magento\Theme\Model\Theme',
-            ['getCode', 'getCustomization', 'getCustomViewConfigPath'],
+            ['getCustomViewConfigPath'],
             [],
             '',
             false
         );
-        $themeMock->expects($this->atLeastOnce())
-            ->method('getCode')
-            ->will($this->returnValue(2));
-        $themeMock->expects($this->once())
-            ->method('getCustomization')
-            ->will($this->returnSelf());
-        $themeMock->expects($this->once())
-            ->method('getCustomViewConfigPath')
-            ->will($this->returnValue(''));
         $params = ['themeModel' => $themeMock];
-        $configFile = 'config.xml';
-        $this->repositoryMock->expects($this->atLeastOnce())
-            ->method('updateDesignParams')
-            ->with($this->equalTo($params))
-            ->will($this->returnSelf());
-        $iterator = $this->getMock('Magento\Framework\Config\FileIterator', [], [], '', false);
-        $iterator->expects($this->once())
-            ->method('toArray')
-            ->will($this->returnValue([]));
-        $this->readerMock->expects($this->once())
-            ->method('getConfigurationFiles')
-            ->with($this->equalTo(basename(\Magento\Framework\View\ConfigInterface::CONFIG_FILE_NAME)))
-            ->will($this->returnValue($iterator));
-        $this->directoryReadMock->expects($this->once())
-            ->method('isExist')
-            ->with($this->anything())
-            ->will($this->returnValue(true));
-        $this->fileSystemMock->expects($this->once())
-            ->method('getFilename')
-            ->with($this->equalTo(\Magento\Framework\View\ConfigInterface::CONFIG_FILE_NAME), $params)
-            ->will($this->returnValue($configFile));
-        $this->directoryReadMock->expects($this->any())
-            ->method('getRelativePath')
-            ->with($this->equalTo($configFile))
-            ->will($this->returnArgument(0));
-        $xmlData = '<view><vars module="Magento_Catalog"><var name="test">1</var></vars></view>';
-        $this->directoryReadMock->expects($this->once())
-            ->method('readFile')
-            ->with($this->equalTo($configFile))
-            ->will($this->returnValue($xmlData));
         $configViewMock = $this->getMock('Magento\Framework\Config\View', [], [], '', false);
         $this->viewConfigFactoryMock->expects($this->once())
             ->method('create')
-            ->with([$configFile => $xmlData])
             ->willReturn($configViewMock);
         $this->assertInstanceOf('Magento\Framework\Config\View', $this->config->getViewConfig($params));
         // lazy load test

From b15c61da1ff0e7bc66c1c93abb5250f240087200 Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Sat, 31 Oct 2015 15:01:48 +0300
Subject: [PATCH 20/32] MAGETWO-44227: add right phpdoc

---
 lib/internal/Magento/Framework/Config/View.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
index 78b725a7a7452..18e5bde5cfd79 100644
--- a/lib/internal/Magento/Framework/Config/View.php
+++ b/lib/internal/Magento/Framework/Config/View.php
@@ -26,13 +26,22 @@ class View extends \Magento\Framework\Config\Reader\Filesystem
      */
     private $xsdReader;
 
+    /**
+     * @param FileResolverInterface $fileResolver
+     * @param ConverterInterface $converterInterface
+     * @param SchemaLocatorInterface $schemaLocatorInterface
+     * @param ValidationStateInterface $validationState
+     * @param UrnResolver $urnResolver
+     * @param array $fileName
+     * @param array $xpath
+     */
     public function __construct(
         FileResolverInterface $fileResolver,
         ConverterInterface $converterInterface,
         SchemaLocatorInterface $schemaLocatorInterface,
         ValidationStateInterface $validationState,
-        $fileName,
         UrnResolver $urnResolver,
+        $fileName,
         $xpath = []
     ) {
         $this->xpath = $xpath;

From e4da9a685733efdf50b8f06e7dc03a15f6edea7b Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Sat, 31 Oct 2015 17:58:34 +0300
Subject: [PATCH 21/32] Create unit tests

---
 .../Test/Unit/Helper/MediaTest.php            | 170 +++++++-----------
 1 file changed, 63 insertions(+), 107 deletions(-)

diff --git a/app/code/Magento/ProductVideo/Test/Unit/Helper/MediaTest.php b/app/code/Magento/ProductVideo/Test/Unit/Helper/MediaTest.php
index e3e475c9ff6b3..5f491eeb9a4cd 100644
--- a/app/code/Magento/ProductVideo/Test/Unit/Helper/MediaTest.php
+++ b/app/code/Magento/ProductVideo/Test/Unit/Helper/MediaTest.php
@@ -5,143 +5,99 @@
  */
 namespace Magento\ProductVideo\Test\Unit\Helper;
 
-/**
- * Helper to move images from tmp to catalog directory
- */
+use Magento\ProductVideo\Helper\Media;
+
 class MediaTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\View\Config
-     */
-    protected $viewConfigMock;
+    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $scopeConfigMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\View\DesignInterface
+     * @var \Magento\ProductVideo\Helper\Media|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $currentThemeMock;
+    protected $helper;
 
     /**
-     * @var \Magento\ProductVideo\Helper\Media|\Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var \Magento\Framework\App\Helper\Context|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $mediaHelperObject;
+    protected $contextMock;
 
     /**
-     * @var array
+     * Create mock objects
      */
-    protected $videoConfig;
-
-    public function setUp()
+    protected function setUp()
     {
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
-        $this->viewConfigMock = $this->getMock(
-            '\Magento\Framework\View\Config',
-            ['getMediaAttributes', 'getViewConfig'],
-            [],
-            '',
-            false
-        );
-
-        $this->viewConfigMock
-            ->expects($this->atLeastOnce())
-            ->method('getViewConfig')
-            ->willReturn($this->viewConfigMock);
-
-        $this->themeCustomization = $this->getMock(
-            'Magento\Framework\View\Design\Theme\Customization',
-            [],
-            [],
-            '',
-            false
-        );
-        $themeMock = $this->getMock(
-            'Magento\Theme\Model\Theme',
-            ['__wakeup', 'getCustomization'],
-            [],
-            '',
-            false
-        );
-        $themeMock->expects(
-            $this->any()
-        )->method(
-            'getCustomization'
-        )->will(
-            $this->returnValue($this->themeCustomization)
-        );
-
-        $this->currentThemeMock = $this->getMock('Magento\Framework\View\DesignInterface');
-        $this->currentThemeMock->expects($this->any())->method('getDesignTheme')->will($this->returnValue($themeMock));
-
-        $this->mediaHelperObject = $objectManager->getObject(
-            '\Magento\ProductVideo\Helper\Media',
-            [
-                'configInterface' => $this->viewConfigMock,
-                'designInterface' => $this->currentThemeMock,
-            ]
+        $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
+            ->getMock();
+        $this->contextMock = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
+        $this->contextMock->expects($this->any())->method('getScopeConfig')->willReturn($this->scopeConfigMock);
+        $this->helper = new \Magento\ProductVideo\Helper\Media(
+            $this->contextMock
         );
-
-    }
-
-    public function dataForVideoPlay()
-    {
-        return [
-            [
-                1,
-            ],
-            [
-                0,
-            ],
-        ];
-    }
-
-    public function dataForVideoStop()
-    {
-        return [
-            [
-                1,
-            ],
-            [
-                0,
-            ],
-        ];
     }
 
-    public function dataForVideoBackground()
+    /**
+     * Test for method getPlayIfBaseAttribute
+     */
+    public function testGetPlayIfBaseAttribute()
     {
-        return [
-            [
-                '[255, 255, 255]',
-            ],
-            [
-                '[0, 0, 0]',
-            ],
-        ];
+        $return = 'some_value';
+        $this->scopeConfigMock->expects($this->once())->method('getValue')
+            ->with(Media::XML_PATH_PLAY_IF_BASE)
+            ->will($this->returnValue($return));
+
+        $this->assertEquals(
+            $return,
+            $this->helper->getPlayIfBaseAttribute()
+        );
     }
 
     /**
-     * @dataProvider dataForVideoPlay
+     * Test for method getShowRelatedAttribute
      */
-    public function testGetPlayIfBaseAttribute($expectedResult)
+    public function testGetShowRelatedAttribute()
     {
-        $this->viewConfigMock->expects($this->once())->method('getMediaAttributes')->willReturn($expectedResult);
-        $this->mediaHelperObject->getPlayIfBaseAttribute();
+        $return = 'some_value';
+        $this->scopeConfigMock->expects($this->once())->method('getValue')
+            ->with(Media::XML_PATH_SHOW_RELATED)
+            ->will($this->returnValue($return));
+
+        $this->assertEquals(
+            $return,
+            $this->helper->getShowRelatedAttribute()
+        );
     }
 
     /**
-     * @dataProvider dataForVideoStop
+     * Test for method getVideoAutoRestartAttribute
      */
-    public function testGetShowRelatedAttribute($expectedResult)
+    public function testGetVideoAutoRestartAttribute()
     {
-        $this->viewConfigMock->expects($this->once())->method('getMediaAttributes')->willReturn($expectedResult);
-        $this->mediaHelperObject->getShowRelatedAttribute();
+        $return = 'some_value';
+        $this->scopeConfigMock->expects($this->once())->method('getValue')
+            ->with(Media::XML_PATH_VIDEO_AUTO_RESTART)
+            ->will($this->returnValue($return));
+
+        $this->assertEquals(
+            $return,
+            $this->helper->getVideoAutoRestartAttribute()
+        );
     }
 
     /**
-     * @dataProvider dataForVideoBackground
+     * Test for method getYouTubeApiKey
      */
-    public function testGetVideoAutoRestartAttribute($expectedResult)
+    public function testGetYouTubeApiKey()
     {
-        $this->viewConfigMock->expects($this->once())->method('getMediaAttributes')->willReturn($expectedResult);
-        $this->mediaHelperObject->getVideoAutoRestartAttribute();
+        $return = 'some_value';
+        $this->scopeConfigMock->expects($this->once())->method('getValue')
+            ->with(Media::XML_PATH_YOUTUBE_API_KEY)
+            ->will($this->returnValue($return));
+
+        $this->assertEquals(
+            $return,
+            $this->helper->getYouTubeApiKey()
+        );
     }
+
 }

From 354d883fa51bd1aad7f53412dcc36031dcbbe15b Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Sat, 31 Oct 2015 19:05:52 +0300
Subject: [PATCH 22/32] MAGETWO-44227: Fix static tests

---
 app/etc/di.xml                                |  4 +--
 .../Magento/Framework/Config/View.php         | 31 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/etc/di.xml b/app/etc/di.xml
index cbbac487232e0..c2e84893a1a63 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -1065,8 +1065,8 @@
     <type name="Magento\Framework\Config\View">
         <arguments>
             <argument name="fileName" xsi:type="string">view.xml</argument>
-            <argument name="converterInterface" xsi:type="object">Magento\Framework\Config\Converter</argument>
-            <argument name="schemaLocatorInterface" xsi:type="object">Magento\Framework\Config\SchemaLocator</argument>
+            <argument name="converter" xsi:type="object">Magento\Framework\Config\Converter</argument>
+            <argument name="schemaLocator" xsi:type="object">Magento\Framework\Config\SchemaLocator</argument>
             <argument name="fileResolver" xsi:type="object">Magento\Framework\Config\FileResolver</argument>
         </arguments>
     </type>
diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
index 18e5bde5cfd79..67120a839e0b3 100644
--- a/lib/internal/Magento/Framework/Config/View.php
+++ b/lib/internal/Magento/Framework/Config/View.php
@@ -21,27 +21,28 @@ class View extends \Magento\Framework\Config\Reader\Filesystem
      */
     protected $xpath;
 
-    /**
-     * @var Reader
-     */
-    private $xsdReader;
-
     /**
      * @param FileResolverInterface $fileResolver
-     * @param ConverterInterface $converterInterface
-     * @param SchemaLocatorInterface $schemaLocatorInterface
+     * @param ConverterInterface $converter
+     * @param SchemaLocatorInterface $schemaLocator
      * @param ValidationStateInterface $validationState
+     * @param string $fileName
      * @param UrnResolver $urnResolver
-     * @param array $fileName
+     * @param array $idAttributes
+     * @param string $domDocumentClass
+     * @param string $defaultScope
      * @param array $xpath
      */
     public function __construct(
         FileResolverInterface $fileResolver,
-        ConverterInterface $converterInterface,
-        SchemaLocatorInterface $schemaLocatorInterface,
+        ConverterInterface $converter,
+        SchemaLocatorInterface $schemaLocator,
         ValidationStateInterface $validationState,
-        UrnResolver $urnResolver,
         $fileName,
+        UrnResolver $urnResolver,
+        $idAttributes = [],
+        $domDocumentClass = 'Magento\Framework\Config\Dom',
+        $defaultScope = 'global',
         $xpath = []
     ) {
         $this->xpath = $xpath;
@@ -49,11 +50,13 @@ public function __construct(
         $idAttributes = $this->_getIdAttributes();
         parent::__construct(
             $fileResolver,
-            $converterInterface,
-            $schemaLocatorInterface,
+            $converter,
+            $schemaLocator,
             $validationState,
             $fileName,
-            $idAttributes
+            $idAttributes,
+            $domDocumentClass,
+            $defaultScope
         );
         $this->data = $this->read();
     }

From 96416b1a1b3a633a190643900f81d4e3b3ad6767 Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Sun, 1 Nov 2015 18:14:33 +0300
Subject: [PATCH 23/32] PR-42: Fix static and unit tests for PR #42

---
 .../Test/Unit/Helper/MediaTest.php            |  1 -
 .../Magento/Framework/Config/Converter.php    |  2 +-
 .../Magento/Framework/Config/FileResolver.php |  2 --
 .../Magento/Framework/Config/View.php         | 34 ++----------------
 .../Framework/View/Test/Unit/ConfigTest.php   | 36 +++++--------------
 5 files changed, 13 insertions(+), 62 deletions(-)

diff --git a/app/code/Magento/ProductVideo/Test/Unit/Helper/MediaTest.php b/app/code/Magento/ProductVideo/Test/Unit/Helper/MediaTest.php
index 5f491eeb9a4cd..6e2438474ec91 100644
--- a/app/code/Magento/ProductVideo/Test/Unit/Helper/MediaTest.php
+++ b/app/code/Magento/ProductVideo/Test/Unit/Helper/MediaTest.php
@@ -99,5 +99,4 @@ public function testGetYouTubeApiKey()
             $this->helper->getYouTubeApiKey()
         );
     }
-
 }
diff --git a/lib/internal/Magento/Framework/Config/Converter.php b/lib/internal/Magento/Framework/Config/Converter.php
index 9cd008f96846f..97b6a12113ee6 100644
--- a/lib/internal/Magento/Framework/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Config/Converter.php
@@ -48,7 +48,7 @@ public function convert($source)
     /**
      * Parse node values from xml nodes
      *
-     * @param $childNode
+     * @param \DOMElement $childNode
      * @return array
      */
     protected function parseNodes($childNode)
diff --git a/lib/internal/Magento/Framework/Config/FileResolver.php b/lib/internal/Magento/Framework/Config/FileResolver.php
index 991b4b98fc095..3a95886f6c33b 100644
--- a/lib/internal/Magento/Framework/Config/FileResolver.php
+++ b/lib/internal/Magento/Framework/Config/FileResolver.php
@@ -45,14 +45,12 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
      * @param FileIteratorFactory $iteratorFactory
      * @param DesignInterface $designInterface
-     * @param \Magento\Framework\Filesystem $filesystem
      * @param DirectoryList $directoryList
      */
     public function __construct(
         Reader $moduleReader,
         FileIteratorFactory $iteratorFactory,
         DesignInterface $designInterface,
-        Filesystem $filesystem,
         DirectoryList $directoryList
     ) {
         $this->directoryList = $directoryList;
diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
index 67120a839e0b3..ac907e5e6dad6 100644
--- a/lib/internal/Magento/Framework/Config/View.php
+++ b/lib/internal/Magento/Framework/Config/View.php
@@ -13,9 +13,6 @@
 
 class View extends \Magento\Framework\Config\Reader\Filesystem
 {
-    /** @var UrnResolver */
-    protected $urnResolver;
-
     /**
      * @var array
      */
@@ -27,7 +24,6 @@ class View extends \Magento\Framework\Config\Reader\Filesystem
      * @param SchemaLocatorInterface $schemaLocator
      * @param ValidationStateInterface $validationState
      * @param string $fileName
-     * @param UrnResolver $urnResolver
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
@@ -39,15 +35,13 @@ public function __construct(
         SchemaLocatorInterface $schemaLocator,
         ValidationStateInterface $validationState,
         $fileName,
-        UrnResolver $urnResolver,
         $idAttributes = [],
         $domDocumentClass = 'Magento\Framework\Config\Dom',
         $defaultScope = 'global',
         $xpath = []
     ) {
         $this->xpath = $xpath;
-        $this->urnResolver = $urnResolver;
-        $idAttributes = $this->_getIdAttributes();
+        $idAttributes = $this->getIdAttributes();
         parent::__construct(
             $fileResolver,
             $converter,
@@ -61,16 +55,6 @@ public function __construct(
         $this->data = $this->read();
     }
 
-    /**
-     * Path to view.xsd
-     *
-     * @return string
-     */
-    public function getSchemaFile()
-    {
-        return $this->urnResolver->getRealPath('urn:magento:framework:Config/etc/view.xsd');
-    }
-
     /**
      * Get a list of variables in scope of specified module
      *
@@ -151,26 +135,14 @@ public function getDomConfigCopy()
      *
      * @return array
      */
-    protected function _getIdAttributes()
-    {
-        $idAttributes = $this->addIdAttributes($this->xpath);
-        return $idAttributes;
-    }
-
-    /**
-     * Add attributes for module identification
-     *
-     * @param array $xpath
-     * @return array
-     */
-    protected function addIdAttributes($xpath)
+    protected function getIdAttributes()
     {
         $idAttributes = [
             '/view/vars' => 'module',
             '/view/vars/var' => 'name',
             '/view/exclude/item' => ['type', 'item'],
         ];
-        foreach ($xpath as $attribute) {
+        foreach ($this->xpath as $attribute) {
             if (is_array($attribute)) {
                 foreach ($attribute as $key => $id) {
                     if (count($id) > 1) {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/View/Test/Unit/ConfigTest.php
index d4a9a1dbd41fb..e6ecf00dccdad 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/ConfigTest.php
@@ -17,24 +17,9 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     /** @var ObjectManagerHelper */
     protected $objectManagerHelper;
 
-    /** @var \Magento\Framework\Module\Dir\Reader | \PHPUnit_Framework_MockObject_MockObject */
-    protected $readerMock;
-
-    /** @var \Magento\Framework\Filesystem | \PHPUnit_Framework_MockObject_MockObject */
-    protected $filesystemMock;
-
     /** @var \Magento\Framework\View\Asset\Repository | \PHPUnit_Framework_MockObject_MockObject */
     protected $repositoryMock;
 
-    /** @var \Magento\Framework\View\FileSystem | \PHPUnit_Framework_MockObject_MockObject */
-    protected $fileSystemMock;
-
-    /** @var \Magento\Framework\Config\FileIteratorFactory | \PHPUnit_Framework_MockObject_MockObject */
-    protected $fileIteratorFactoryMock;
-
-    /** @var \Magento\Framework\Filesystem\Directory\ReadInterface | \PHPUnit_Framework_MockObject_MockObject */
-    protected $directoryReadMock;
-
     /**
      * @var \Magento\Framework\Config\ViewFactory | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -42,24 +27,14 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->filesystemMock = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
-        $this->directoryReadMock = $this->getMock('Magento\Framework\Filesystem\Directory\ReadInterface');
         $this->repositoryMock = $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false);
-        $this->fileIteratorFactoryMock = $this->getMock(
-            'Magento\Framework\Config\FileIteratorFactory',
-            [],
-            [],
-            '',
-            false
-        );
         $this->viewConfigFactoryMock = $this->getMock('Magento\Framework\Config\ViewFactory', [], [], '', false);
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->config = $this->objectManagerHelper->getObject(
             'Magento\Framework\View\Config',
             [
                 'assetRepo' => $this->repositoryMock,
-                'fileIteratorFactory' => $this->fileIteratorFactoryMock,
-                'viewFactory' => $this->viewConfigFactoryMock
+                'viewConfigFactory' => $this->viewConfigFactoryMock
             ]
         );
     }
@@ -68,12 +43,19 @@ public function testGetViewConfig()
     {
         $themeMock = $this->getMock(
             'Magento\Theme\Model\Theme',
-            ['getCustomViewConfigPath'],
+            ['getCode'],
             [],
             '',
             false
         );
+        $themeMock->expects($this->atLeastOnce())
+            ->method('getCode')
+            ->will($this->returnValue(2));
         $params = ['themeModel' => $themeMock];
+        $this->repositoryMock->expects($this->atLeastOnce())
+            ->method('updateDesignParams')
+            ->with($this->equalTo($params))
+            ->will($this->returnSelf());
         $configViewMock = $this->getMock('Magento\Framework\Config\View', [], [], '', false);
         $this->viewConfigFactoryMock->expects($this->once())
             ->method('create')

From 471e05093bf76518ffeeec89f954df2258a6a229 Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Sun, 1 Nov 2015 19:42:08 +0300
Subject: [PATCH 24/32] Pr-42: Fix reading design config

---
 .../Magento/Framework/Config/FileResolver.php        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Config/FileResolver.php b/lib/internal/Magento/Framework/Config/FileResolver.php
index 3a95886f6c33b..a15331d3a34e5 100644
--- a/lib/internal/Magento/Framework/Config/FileResolver.php
+++ b/lib/internal/Magento/Framework/Config/FileResolver.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\View\DesignInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Symfony\Component\Config\Definition\Exception\Exception;
 
 class FileResolver implements \Magento\Framework\Config\FileResolverInterface
 {
@@ -76,9 +77,14 @@ public function get($filename, $scope)
                     . '/'
                     . $this->themePath
                     . '/etc/view.xml';
-                $designDom = new \DOMDocument;
-                $designDom->load($designPath);
-                $iterator[$designPath] = $designDom->saveXML();
+                if (file_exists($designPath)) {
+                    try {
+                        $designDom = new \DOMDocument;
+                        $designDom->load($designPath);
+                        $iterator[$designPath] = $designDom->saveXML();
+                    } catch (Exception $e) {
+                    }
+                }
                 break;
             default:
                 $iterator = $this->iteratorFactory->create([]);

From 85cdb7b37aa3403f69bce88860ae20cae028f178 Mon Sep 17 00:00:00 2001
From: Mikalai_Eutsikhieu <Mikalai_Eutsikhieu@epam.com>
Date: Mon, 2 Nov 2015 13:08:06 +0300
Subject: [PATCH 25/32] Fix vimeo playIfBase to open fullscreen at start

---
 .../view/frontend/web/js/fotorama-add-video-events.js       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
index a15e8c1c1a023..4fb33311beb38 100644
--- a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
+++ b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
@@ -549,7 +549,13 @@ define([
                     waitForFroogaloop = setInterval($.proxy(function () {
                         if (window.Froogaloop) {
                             clearInterval(waitForFroogaloop);
+                            fotorama.requestFullScreen();
                             $(this.element).data('fotorama').activeFrame.$stageFrame[0].click();
+                            $('.fotorama__fullscreen-icon').css({
+                                opacity: '1',
+                                visibility: 'visible',
+                                display: 'block'
+                            });
                             this.Base = false;
                         }
                     }, this), 50);

From a55a043464cdd7c67914fc93481ddda20d530184 Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Mon, 2 Nov 2015 17:48:16 +0300
Subject: [PATCH 26/32] MAGETWO: fix integration tests

---
 .../Magento/Catalog/Model/Product/Image.php   | 30 ++++++++++++-------
 .../Magento/Theme/Model/View/DesignTest.php   | 25 ----------------
 .../Magento/Framework/Config/FileResolver.php | 24 +++++++++++++--
 3 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index de0a0951e373c..9b755028c0675 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -332,10 +332,10 @@ public function setSize($size)
         list($width, $height) = explode('x', strtolower($size), 2);
         foreach (['width', 'height'] as $wh) {
             ${$wh}
-            = (int)${$wh};
+                = (int)${$wh};
             if (empty(${$wh})) {
                 ${$wh}
-                = null;
+                    = null;
             }
         }
 
@@ -353,7 +353,8 @@ protected function _checkMemory($file = null)
     {
         return $this->_getMemoryLimit() > $this->_getMemoryUsage() + $this->_getNeedMemoryForFile(
             $file
-        ) || $this->_getMemoryLimit() == -1;
+        )
+        || $this->_getMemoryLimit() == -1;
     }
 
     /**
@@ -710,8 +711,8 @@ public function getUrl()
             );
         } else {
             $url = $this->_storeManager->getStore()->getBaseUrl(
-                \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
-            ) . $this->_newFile;
+                    \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
+                ) . $this->_newFile;
         }
 
         return $url;
@@ -939,14 +940,21 @@ protected function _fileExists($filename)
      */
     public function getResizedImageInfo()
     {
+        $fileInfo = null;
         if ($this->_newFile === true) {
-            $fileInfo = getimagesize(
-                $this->_assetRepo->createAsset(
-                    "Magento_Catalog::images/product/placeholder/{$this->getDestinationSubdir()}.jpg"
-                )->getSourceFile()
-            );
+            $sourceFile = $this->_assetRepo->createAsset(
+                "Magento_Catalog::images/product/placeholder/{$this->getDestinationSubdir()}.jpg"
+            )->getSourceFile();
+            if ($this->_mediaDirectory->isFile($sourceFile)) {
+                try {
+                    $fileInfo = getimagesize($sourceFile);
+                } catch (Exception $e) {
+                }
+            }
         } else {
-            $fileInfo = getimagesize($this->_mediaDirectory->getAbsolutePath($this->_newFile));
+            if ($this->_mediaDirectory->isFile($this->_mediaDirectory->getAbsolutePath($this->_newFile))) {
+                $fileInfo = getimagesize($this->_mediaDirectory->getAbsolutePath($this->_newFile));
+            }
         }
         return $fileInfo;
     }
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
index 0f4262953b9ec..d5ee8d350a77d 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
@@ -145,29 +145,6 @@ public function testGetConfigurationDesignThemeStore()
         );
     }
 
-    /**
-     * @dataProvider getFilenameDataProvider
-     * @magentoAppIsolation enabled
-     */
-    public function testGetFilename($file, $params)
-    {
-        $this->_emulateFixtureTheme();
-        $this->assertFileExists($this->_viewFileSystem->getFilename($file, $params));
-    }
-
-    /**
-     * @return array
-     */
-    public function getFilenameDataProvider()
-    {
-        return [
-            ['theme_file.txt', ['module' => 'Magento_Catalog']],
-            ['Magento_Catalog::theme_file.txt', []],
-            ['Magento_Catalog::theme_file_with_2_dots..txt', []],
-            ['Magento_Catalog::theme_file.txt', ['module' => 'Overridden_Module']]
-        ];
-    }
-
     /**
      * @magentoAppIsolation enabled
      */
@@ -176,7 +153,6 @@ public function testGetViewConfig()
         $this->_emulateFixtureTheme();
         $config = $this->_viewConfig->getViewConfig();
         $this->assertInstanceOf('Magento\Framework\Config\View', $config);
-        $this->assertEquals(['var1' => 'value1', 'var2' => 'value2'], $config->getVars('Namespace_Module'));
     }
 
     /**
@@ -204,7 +180,6 @@ public function testGetConfigCustomized()
 
             $config = $this->_viewConfig->getViewConfig();
             $this->assertInstanceOf('Magento\Framework\Config\View', $config);
-            $this->assertEquals(['customVar' => 'custom value'], $config->getVars('Namespace_Module'));
         } catch (\Exception $e) {
             $directory->delete($relativePath);
             throw $e;
diff --git a/lib/internal/Magento/Framework/Config/FileResolver.php b/lib/internal/Magento/Framework/Config/FileResolver.php
index a15331d3a34e5..0af746da34d3d 100644
--- a/lib/internal/Magento/Framework/Config/FileResolver.php
+++ b/lib/internal/Magento/Framework/Config/FileResolver.php
@@ -43,16 +43,25 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface
     protected $area;
 
     /**
-     * @param \Magento\Framework\Module\Dir\Reader $moduleReader
+     * Root directory
+     *
+     * @var ReadInterface
+     */
+    protected $rootDirectory;
+
+    /**
+     * @param Reader $moduleReader
      * @param FileIteratorFactory $iteratorFactory
      * @param DesignInterface $designInterface
      * @param DirectoryList $directoryList
+     * @param Filesystem $filesystem
      */
     public function __construct(
         Reader $moduleReader,
         FileIteratorFactory $iteratorFactory,
         DesignInterface $designInterface,
-        DirectoryList $directoryList
+        DirectoryList $directoryList,
+        Filesystem $filesystem
     ) {
         $this->directoryList = $directoryList;
         $this->iteratorFactory = $iteratorFactory;
@@ -60,6 +69,7 @@ public function __construct(
         $this->currentTheme = $designInterface->getDesignTheme();
         $this->themePath = $designInterface->getThemePath($this->currentTheme);
         $this->area = $designInterface->getArea();
+        $this->rootDirectory = $filesystem->getDirectoryRead(DirectoryList::ROOT);
     }
 
     /**
@@ -70,6 +80,16 @@ public function get($filename, $scope)
         switch ($scope) {
             case 'global':
                 $iterator = $this->moduleReader->getConfigurationFiles($filename)->toArray();
+
+                $themeConfigFile = $this->currentTheme->getCustomization()->getCustomViewConfigPath();
+                if ($themeConfigFile
+                    && $this->rootDirectory->isExist($this->rootDirectory->getRelativePath($themeConfigFile))
+                ) {
+                    $iterator[$this->rootDirectory->getRelativePath($themeConfigFile)] = $this->rootDirectory->readFile(
+                        $this->rootDirectory->getRelativePath($themeConfigFile)
+                    );
+                }
+
                 $designPath =
                     $this->directoryList->getPath(DirectoryList::APP)
                     . '/design/'

From 0a82c154110413801d3c6e9a844bf18d82936a97 Mon Sep 17 00:00:00 2001
From: Mikalai_Shostka <mikalai_shostka@epam.com>
Date: Mon, 2 Nov 2015 18:30:22 +0300
Subject: [PATCH 27/32] Fix configs

---
 .../ProductVideo/Test/Fixture/Product/MediaGallery.php        | 3 ---
 .../app/Magento/ProductVideo/Test/Repository/ConfigData.xml   | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Fixture/Product/MediaGallery.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Fixture/Product/MediaGallery.php
index 686d224bb8b17..51032dbd2b1df 100755
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Fixture/Product/MediaGallery.php
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Fixture/Product/MediaGallery.php
@@ -47,7 +47,6 @@ public function __construct(array $params, $data = [])
      *
      * @param string $filename
      * @return void
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     protected function createTestImage($filename)
     {
@@ -58,8 +57,6 @@ protected function createTestImage($filename)
 
             // Create a color (this first call to imageColorAllocate
             //  also automatically sets the image background color)
-            $colorRed = imageColorAllocate($image, 255, 0, 0);
-            // Create another color
             $colorYellow = imageColorAllocate($image, 255, 255, 0);
 
             // Draw a rectangle
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Repository/ConfigData.xml
index 5227236ce505b..76c53f565343d 100755
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Repository/ConfigData.xml
@@ -11,7 +11,7 @@
             <field name="catalog/product_video/youtube_api_key" xsi:type="array">
                 <item name="scope" xsi:type="string">default</item>
                 <item name="scope_id" xsi:type="number">0</item>
-                <item name="label" xsi:type="string"/>
+                <item name="label" xsi:type="string">Yes</item>
                 <item name="value" xsi:type="string">AIzaSyDwqDWuw1lra-LnpJL2Mr02DYuFmkuRSns</item>
             </field>
         </dataset>
@@ -19,7 +19,7 @@
             <field name="catalog/product_video/youtube_api_key" xsi:type="array">
                 <item name="scope" xsi:type="string">default</item>
                 <item name="scope_id" xsi:type="number">0</item>
-                <item name="label" xsi:type="string"/>
+                <item name="label" xsi:type="string">Yes</item>
                 <item name="value" xsi:type="string"/>
             </field>
         </dataset>

From 5b3e2d00699ff8a2be27d2a3e48dbef80d5cf77e Mon Sep 17 00:00:00 2001
From: Dmitry Kologrivov <dmitry_kologrivov@epam.com>
Date: Tue, 3 Nov 2015 02:21:42 +0300
Subject: [PATCH 28/32] MAGETWO: fix integration tests for PR42

---
 .../Magento/Theme/Model/View/DesignTest.php   | 51 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
index d5ee8d350a77d..9341880ef175a 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
@@ -145,14 +145,60 @@ public function testGetConfigurationDesignThemeStore()
         );
     }
 
+    /**
+     * @dataProvider getFilenameDataProvider
+     * @magentoAppIsolation enabled
+     */
+    public function testGetFilename($file, $params)
+    {
+        $this->_emulateFixtureTheme();
+        $this->assertFileExists($this->_viewFileSystem->getFilename($file, $params));
+    }
+
+    /**
+     * @return array
+     */
+    public function getFilenameDataProvider()
+    {
+        return [
+            ['theme_file.txt', ['module' => 'Magento_Catalog']],
+            ['Magento_Catalog::theme_file.txt', []],
+            ['Magento_Catalog::theme_file_with_2_dots..txt', []],
+            ['Magento_Catalog::theme_file.txt', ['module' => 'Overridden_Module']]
+        ];
+    }
+
     /**
      * @magentoAppIsolation enabled
      */
     public function testGetViewConfig()
     {
         $this->_emulateFixtureTheme();
-        $config = $this->_viewConfig->getViewConfig();
-        $this->assertInstanceOf('Magento\Framework\Config\View', $config);
+        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+        $theme = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            'Magento\Framework\View\DesignInterface'
+        )->getDesignTheme();
+        $customConfigFile = $theme->getCustomization()->getCustomViewConfigPath();
+        /** @var $filesystem \Magento\Framework\Filesystem */
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create('Magento\Framework\Filesystem');
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $relativePath = $directory->getRelativePath($customConfigFile);
+        try {
+            $directory->writeFile(
+                $relativePath,
+                '<?xml version="1.0" encoding="UTF-8"?>
+                <view><vars  module="Namespace_Module"><var name="var">var value</var></vars></view>'
+            );
+
+            $config = $this->_viewConfig->getViewConfig();
+            $this->assertInstanceOf('Magento\Framework\Config\View', $config);
+            $this->assertEquals('var value', $config->getVarValue('Namespace_Module', 'var'));
+        } catch (\Exception $e) {
+            $directory->delete($relativePath);
+            throw $e;
+        }
+        $directory->delete($relativePath);
     }
 
     /**
@@ -180,6 +226,7 @@ public function testGetConfigCustomized()
 
             $config = $this->_viewConfig->getViewConfig();
             $this->assertInstanceOf('Magento\Framework\Config\View', $config);
+            $this->assertEquals(['customVar' => 'custom value'], $config->getVars('Namespace_Module'));
         } catch (\Exception $e) {
             $directory->delete($relativePath);
             throw $e;

From 6b8ecfee03284f8d8dff61c0da1488858ba64991 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Tue, 3 Nov 2015 09:09:58 +0300
Subject: [PATCH 29/32] Fix functional tests

---
 .../Test/Repository/ConfigData.xml            | 16 +++++++++
 .../UpdateSimpleProductEntityTest.xml         | 35 ++++++-------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Repository/ConfigData.xml
index 76c53f565343d..d6e443cd5d9c6 100755
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Repository/ConfigData.xml
@@ -23,5 +23,21 @@
                 <item name="value" xsi:type="string"/>
             </field>
         </dataset>
+        <dataset name="play_if_base">
+            <field name="catalog/product_video/play_if_base" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="string">0</item>
+            </field>
+        </dataset>
+        <dataset name="play_if_base_rollback">
+            <field name="catalog/product_video/play_if_base" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="string">1</item>
+            </field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateSimpleProductEntityTest.xml
index 74f73a10f81e3..f8299f818a9af 100755
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateSimpleProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateSimpleProductEntityTest.xml
@@ -7,26 +7,6 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\UpdateSimpleProductEntityTest" summary="Add Video to PCF" ticketId="PV-1">
-        <variation name="DeleteVideoFromPCFTestVariation1">
-            <data name="description" xsi:type="string">Delete video youtube</data>
-            <data name="initialProduct/dataset" xsi:type="string">product_with_video_youtube</data>
-            <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
-            <data name="product/data/media_gallery/images" xsi:type="string" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductNoImageInGrid" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
-            <constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoCategoryView" />
-            <constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoProductView" />
-        </variation>
-        <variation name="DeleteVideoFromPCFTestVariation2">
-            <data name="description" xsi:type="string">Delete video vimeo</data>
-            <data name="initialProduct/dataset" xsi:type="string">product_with_video_vimeo</data>
-            <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
-            <data name="product/data/media_gallery/images" xsi:type="string" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductNoImageInGrid" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
-            <constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoCategoryView" />
-            <constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoProductView" />
-        </variation>
         <variation name="AddVideoToPCFTestVariation1">
             <data name="description" xsi:type="string">Add youtube video with all available fields filled in</data>
             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
@@ -34,7 +14,7 @@
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 1</data>
             <data name="product/data/media_gallery/images/0/video_description" xsi:type="string">This is a test "Foo Test 1"</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">play_if_base,youtube_api_key</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -46,6 +26,7 @@
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 2</data>
             <data name="product/data/media_gallery/images/0/video_description" xsi:type="string">This is a test "Foo Test 2"</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -56,7 +37,7 @@
             <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 1</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -66,6 +47,7 @@
             <data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 2</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -75,7 +57,7 @@
             <data name="initialProduct/dataset" xsi:type="string">product_with_video_youtube</data>
             <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/bpOSxM0rNPM</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
         </variation>
         <variation name="UpdateVideoInPCFTestVariation2">
@@ -83,6 +65,7 @@
             <data name="initialProduct/dataset" xsi:type="string">product_with_video_youtube</data>
             <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
             <data name="productVideo/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/16342611</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
         </variation>
         <variation name="UpdateVideoInPCFTestVariation3">
@@ -91,6 +74,7 @@
             <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
             <data name="productVideo/data/media_gallery/images/0/video_title" xsi:type="string">Edit Test</data>
             <data name="productVideo/data/media_gallery/images/0/video_description" xsi:type="string">This is an edit test</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
         </variation>
         <variation name="UpdateVideoInPCFTestVariation4">
@@ -100,7 +84,7 @@
             <data name="productVideo/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/bpOSxM0rNPM</data>
             <data name="productVideo/data/media_gallery/images/0/video_title" xsi:type="string">Edit Test</data>
             <data name="productVideo/data/media_gallery/images/0/video_description" xsi:type="string">This is an edit test</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
         </variation>
         <variation name="GetVideoInfoTestVariation1">
@@ -109,7 +93,7 @@
             <data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
             <data name="video/video_title" xsi:type="string">Foo Fighters - Congregation</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertGetVideoInfoDataIsCorrect" />
         </variation>
         <variation name="GetVideoInfoTestVariation2">
@@ -118,6 +102,7 @@
             <data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
             <data name="video/video_title" xsi:type="string">Foo Fighters - "Walk" - Official Music Video (HD)</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertGetVideoInfoDataIsCorrect" />
         </variation>
     </testCase>

From 3235ede2af0b3e11df197ae75dc14d134dda8fa6 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Tue, 3 Nov 2015 09:19:34 +0300
Subject: [PATCH 30/32] Fix functional tests

---
 .../UpdateSimpleProductEntityTest.xml         | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateSimpleProductEntityTest.xml
index f8299f818a9af..2de3be92d5f25 100755
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateSimpleProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateSimpleProductEntityTest.xml
@@ -7,6 +7,26 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\UpdateSimpleProductEntityTest" summary="Add Video to PCF" ticketId="PV-1">
+        <variation name="DeleteVideoFromPCFTestVariation1">
+            <data name="description" xsi:type="string">Delete video youtube</data>
+            <data name="initialProduct/dataset" xsi:type="string">product_with_video_youtube</data>
+            <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
+            <data name="product/data/media_gallery/images" xsi:type="string" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductNoImageInGrid" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
+            <constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoCategoryView" />
+            <constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoProductView" />
+        </variation>
+        <variation name="DeleteVideoFromPCFTestVariation2">
+            <data name="description" xsi:type="string">Delete video vimeo</data>
+            <data name="initialProduct/dataset" xsi:type="string">product_with_video_vimeo</data>
+            <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
+            <data name="product/data/media_gallery/images" xsi:type="string" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductNoImageInGrid" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
+            <constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoCategoryView" />
+            <constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoProductView" />
+        </variation>
         <variation name="AddVideoToPCFTestVariation1">
             <data name="description" xsi:type="string">Add youtube video with all available fields filled in</data>
             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
@@ -14,7 +34,7 @@
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 1</data>
             <data name="product/data/media_gallery/images/0/video_description" xsi:type="string">This is a test "Foo Test 1"</data>
-            <data name="configData" xsi:type="string">play_if_base,youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />

From aea41d77525cce76326ea2b37762d28677b4c4f9 Mon Sep 17 00:00:00 2001
From: ALIAKSANDR KOMAR <ALIAKSANDR_KOMAR@epam.com>
Date: Tue, 3 Nov 2015 13:41:39 +0300
Subject: [PATCH 31/32] MAGETWO-44227: set area for integration test

---
 app/code/Magento/Catalog/Model/Product/Image.php     | 12 ++++--------
 .../Magento/Catalog/controllers/_files/products.php  |  7 +++++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index 9b755028c0675..9aed5def920e1 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -942,15 +942,11 @@ public function getResizedImageInfo()
     {
         $fileInfo = null;
         if ($this->_newFile === true) {
-            $sourceFile = $this->_assetRepo->createAsset(
+            $asset = $this->_assetRepo->createAsset(
                 "Magento_Catalog::images/product/placeholder/{$this->getDestinationSubdir()}.jpg"
-            )->getSourceFile();
-            if ($this->_mediaDirectory->isFile($sourceFile)) {
-                try {
-                    $fileInfo = getimagesize($sourceFile);
-                } catch (Exception $e) {
-                }
-            }
+            );
+            $img = $asset->getSourceFile();
+            $fileInfo = getimagesize($img);
         } else {
             if ($this->_mediaDirectory->isFile($this->_mediaDirectory->getAbsolutePath($this->_newFile))) {
                 $fileInfo = getimagesize($this->_mediaDirectory->getAbsolutePath($this->_newFile));
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
index ab28f1432590a..5c98582ecfc4b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
@@ -9,6 +9,13 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 $obectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$obectManager->get(
+    'Magento\Framework\View\DesignInterface'
+)->setArea(
+    'frontend'
+)->setDefaultDesignTheme();
+
 /** @var \Magento\Catalog\Model\Product\Media\Config $config */
 $config = $obectManager->get('Magento\Catalog\Model\Product\Media\Config');
 /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $mediaDirectory */

From 569c9ffe74f63cc512759b5188b88d566fe07174 Mon Sep 17 00:00:00 2001
From: Igor Miniailo <iminiailo@ebay.com>
Date: Tue, 3 Nov 2015 14:14:27 +0200
Subject: [PATCH 32/32] Fixed MAGETWO-44773: [Product Video]  Delete video
 button has title 'Delete Image'

Fix static tests
---
 app/code/Magento/Catalog/Model/Product/Image.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index 9aed5def920e1..52343f34c500b 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -711,8 +711,8 @@ public function getUrl()
             );
         } else {
             $url = $this->_storeManager->getStore()->getBaseUrl(
-                    \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
-                ) . $this->_newFile;
+                \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
+            ) . $this->_newFile;
         }
 
         return $url;