Merge branch 'MAGETWO-15371' of https://github.corp.magento.com/magento-tango/magento2ce into MAGETWO-52010

Author: shiftedreality

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

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Config;
+
+/**
+ * Interface DesignResolverInterface
+ * @api
+ */
+interface DesignResolverInterface extends FileResolverInterface
+{
+    /**
+     * Retrieve parent configs
+     *
+     * @param string $filename
+     * @param string $scope
+     * @return array
+     */
+    public function getParents($filename, $scope);
+}

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

@@ -9,12 +9,17 @@
 
 use Magento\Framework\Module\Dir\Reader;
 use Magento\Framework\Filesystem;
+use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\DesignInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface;
 use Magento\Framework\View\Design\Fallback\RulePool;
 
-class FileResolver implements \Magento\Framework\Config\FileResolverInterface
+/**
+ * Class FileResolver
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class FileResolver implements \Magento\Framework\Config\FileResolverInterface, DesignResolverInterface
 {
     /**
      * Module configuration file reader
@@ -117,4 +122,66 @@ public function get($filename, $scope)
         }
         return $iterator;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParents($filename, $scope)
+    {
+        switch ($scope) {
+            case 'global':
+                $iterator = $this->moduleReader->getConfigurationFiles($filename)->toArray();
+                $designPath = $this->resolver->resolve(
+                    RulePool::TYPE_FILE,
+                    'etc/view.xml',
+                    $this->area,
+                    $this->currentTheme
+                );
+
+                if (file_exists($designPath)) {
+                    try {
+                        $iterator = $this->getParentConfigs($this->currentTheme, []);
+                    } catch (\Exception $e) {
+                        throw new \Magento\Framework\Exception\LocalizedException(
+                            new \Magento\Framework\Phrase('Could not read config file')
+                        );
+                    }
+                }
+                break;
+            default:
+                $iterator = $this->iteratorFactory->create([]);
+                break;
+        }
+
+        return $iterator;
+    }
+
+    /**
+     * Recursively add parent theme configs
+     *
+     * @param ThemeInterface $theme
+     * @param array $iterator
+     * @param int $index
+     * @return array
+     */
+    private function getParentConfigs(ThemeInterface $theme, array $iterator, $index = 0)
+    {
+        if ($theme->getParentTheme() && $theme->isPhysical()) {
+            $parentDesignPath = $this->resolver->resolve(
+                RulePool::TYPE_FILE,
+                'etc/view.xml',
+                $this->area,
+                $theme->getParentTheme()
+            );
+
+            $parentDom = new \DOMDocument;
+            $parentDom->load($parentDesignPath);
+
+            $iterator[$index] = $parentDom->saveXML();
+
+            $iterator = $this->getParentConfigs($theme->getParentTheme(), $iterator, ++$index);
+        }
+
+        return $iterator;
+    }
 }

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

@@ -9,8 +9,11 @@
  */
 namespace Magento\Framework\Config;
 
-use Magento\Framework\Config\Dom\UrnResolver;
-
+/**
+ * Class View
+ *
+ * @property DesignResolverInterface $_fileResolver
+ */
 class View extends \Magento\Framework\Config\Reader\Filesystem
 {
     /**
@@ -210,4 +213,23 @@ protected function initData()
             $this->data = $this->read();
         }
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($scope = null)
+    {
+        $scope = $scope ?: $this->_defaultScope;
+        $result = [];
+
+        $parents = (array)$this->_fileResolver->getParents($this->_fileName, $scope);
+        // Sort parents desc
+        krsort($parents);
+
+        foreach ($parents as $parent) {
+            $result = array_replace_recursive($result, $this->_readFiles([$parent]));
+        }
+
+        return array_replace_recursive($result, parent::read($scope));
+    }
 }