MAGETWO-43452: Ogre sprint 38 contribution to mainline

- avoid merging base XSD with itself

Author: Olga Kopylova

dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/ViewConfigFilesTest.php

@@ -13,6 +13,7 @@ class ViewConfigFilesTest extends \PHPUnit_Framework_TestCase
      */
     public function testViewConfigFile($file)
     {
+        /** @var \Magento\Framework\View\Xsd\Reader $reader */
         $reader = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             'Magento\Framework\View\Xsd\Reader'
         );

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

@@ -74,7 +74,10 @@ public function __construct(
     public function getListXsdFiles($filename)
     {
         return $this->iteratorFactory->create(
-            $this->componentDirSearch->collectFiles(ComponentRegistrar::MODULE, 'etc/' . $filename)
+            array_merge(
+                $this->componentDirSearch->collectFiles(ComponentRegistrar::MODULE, 'etc/' . $filename),
+                $this->componentDirSearch->collectFiles(ComponentRegistrar::LIBRARY, '*/etc/' . $filename)
+            )
         );
     }
 
@@ -108,9 +111,13 @@ public function read($scope = null)
     public function readXsdFiles($fileList, $baseXsd = null)
     {
         $baseXsd = new \DOMDocument();
-        $baseXsd->load($this->urnResolver->getRealPath($this->searchFilesPattern . $this->fileName));
+        $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) {