MAGETWO-43452: Ogre sprint 38 contribution to mainline

- fixed XSD reader

Author: Olga Kopylova

app/etc/di.xml

@@ -1066,8 +1066,7 @@
         <arguments>
             <argument name="fileName" xsi:type="string">view.xsd</argument>
             <argument name="defaultScope" xsi:type="string">global</argument>
-            <argument name="searchPattern" xsi:type="string">/*/*/etc/</argument>
-            <argument name="searchFilesPattern" xsi:type="string">/../..//Config/etc/</argument>
+            <argument name="searchFilesPattern" xsi:type="string">urn:magento:framework:Config/etc/</argument>
         </arguments>
     </type>
 </config>

lib/internal/Magento/Framework/Config/View.php

@@ -9,12 +9,13 @@
  */
 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
 {
-    /** @var \Magento\Framework\Config\Dom\UrnResolver */
+    /** @var UrnResolver */
     protected $urnResolver;
 
     /**
@@ -27,21 +28,29 @@ class View extends \Magento\Framework\Config\AbstractXml
      */
     protected $xpath;
 
+    /**
+     * @var Reader
+     */
+    private $xsdReader;
+
     /**
      * @param array $configFiles
-     * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
-     * @param array $xpath
+     * @param Reader $xsdReader
+     * @param UrnResolver $urnResolver
      * @param TypeDataExtractorPool $extractorPool
+     * @param array $xpath
      */
     public function __construct(
         $configFiles,
-        \Magento\Framework\Config\Dom\UrnResolver $urnResolver,
+        Reader $xsdReader,
+        UrnResolver $urnResolver,
         TypeDataExtractorPool $extractorPool,
         $xpath = []
     ) {
         $this->xpath = $xpath;
         $this->extractorPool = $extractorPool;
         $this->urnResolver = $urnResolver;
+        $this->xsdReader = $xsdReader;
         parent::__construct($configFiles);
     }
 
@@ -52,7 +61,8 @@ public function __construct(
      */
     public function getSchemaFile()
     {
-        return $this->urnResolver->getRealPath('urn:magento:framework:Config/etc/view.xsd');
+        $configXsd = $this->xsdReader->read();
+        return $configXsd;
     }
 
     /**

lib/internal/Magento/Framework/Config/ViewFactory.php

@@ -29,10 +29,9 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      */
     public function create($configFiles)
     {
-        return new \Magento\Framework\Config\View(
-            $configFiles,
-            new \Magento\Framework\Config\Dom\UrnResolver(),
-            $this->objectManager->create('\Magento\Framework\View\Xsd\Media\TypeDataExtractorPool')
+        return $this->objectManager->create(
+            'Magento\Framework\Config\View',
+            ['configFiles' => $configFiles]
         );
     }
 }

lib/internal/Magento/Framework/View/Xsd/Reader.php

@@ -8,6 +8,7 @@
 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
@@ -36,14 +37,22 @@ class Reader implements \Magento\Framework\Config\ReaderInterface
     protected $urnResolver;
 
     /**
-     * @param DirSearch $dirSearch,
+     * @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
@@ -53,6 +62,7 @@ public function __construct(
         $this->fileName = $fileName;
         $this->defaultScope = $defaultScope;
         $this->searchFilesPattern = $searchFilesPattern;
+        $this->iteratorFactory = $iteratorFactory;
     }
 
     /**
@@ -63,7 +73,9 @@ public function __construct(
      */
     public function getListXsdFiles($filename)
     {
-        return  $this->componentDirSearch->collectFiles(ComponentRegistrar::MODULE, 'etc/' . $filename);
+        return $this->iteratorFactory->create(
+            $this->componentDirSearch->collectFiles(ComponentRegistrar::MODULE, 'etc/' . $filename)
+        );
     }
 
     /**