Merge branch 'MAGETWO-44227-FIX-CONFIG-DATA' into 'master4'

MAGETWO-44227: fix config data

See merge request !173

Author: Dmitry Kologrivov

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

@@ -11,7 +11,7 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\View\DesignInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Symfony\Component\Config\Definition\Exception\Exception;
+use Magento\Framework\Component\ComponentRegistrar;
 
 class FileResolver implements \Magento\Framework\Config\FileResolverInterface
 {
@@ -43,25 +43,30 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface
     protected $area;
 
     /**
-     * Root directory
-     *
-     * @var ReadInterface
+     * @var Filesystem\Directory\ReadInterface
      */
     protected $rootDirectory;
 
+    /**
+     * @var \Magento\Framework\Component\ComponentRegistrar
+     */
+    protected $componentRegistrar;
+
     /**
      * @param Reader $moduleReader
      * @param FileIteratorFactory $iteratorFactory
      * @param DesignInterface $designInterface
      * @param DirectoryList $directoryList
      * @param Filesystem $filesystem
+     * @param ComponentRegistrar $componentRegistrar
      */
     public function __construct(
         Reader $moduleReader,
         FileIteratorFactory $iteratorFactory,
         DesignInterface $designInterface,
         DirectoryList $directoryList,
-        Filesystem $filesystem
+        Filesystem $filesystem,
+        ComponentRegistrar $componentRegistrar
     ) {
         $this->directoryList = $directoryList;
         $this->iteratorFactory = $iteratorFactory;
@@ -70,6 +75,7 @@ public function __construct(
         $this->themePath = $designInterface->getThemePath($this->currentTheme);
         $this->area = $designInterface->getArea();
         $this->rootDirectory = $filesystem->getDirectoryRead(DirectoryList::ROOT);
+        $this->componentRegistrar = $componentRegistrar;
     }
 
     /**
@@ -80,7 +86,6 @@ 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))
@@ -89,20 +94,18 @@ public function get($filename, $scope)
                         $this->rootDirectory->getRelativePath($themeConfigFile)
                     );
                 }
-
                 $designPath =
-                    $this->directoryList->getPath(DirectoryList::APP)
-                    . '/design/'
-                    . $this->area
-                    . '/'
-                    . $this->themePath
+                    $this->componentRegistrar->getPath(ComponentRegistrar::THEME, $this->area . '/' . $this->themePath)
                     . '/etc/view.xml';
                 if (file_exists($designPath)) {
                     try {
                         $designDom = new \DOMDocument;
                         $designDom->load($designPath);
                         $iterator[$designPath] = $designDom->saveXML();
-                    } catch (Exception $e) {
+                    } catch (\Exception $e) {
+                        throw new \Magento\Framework\Exception\LocalizedException(
+                            __('Could not read config file')
+                        );
                     }
                 }
                 break;

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

@@ -18,6 +18,13 @@ class View extends \Magento\Framework\Config\Reader\Filesystem
      */
     protected $xpath;
 
+    /**
+     * View config data
+     *
+     * @var array
+     */
+    protected $data;
+
     /**
      * @param FileResolverInterface $fileResolver
      * @param ConverterInterface $converter
@@ -52,7 +59,6 @@ public function __construct(
             $domDocumentClass,
             $defaultScope
         );
-        $this->data = $this->read();
     }
 
     /**
@@ -65,6 +71,7 @@ public function __construct(
      */
     public function getVars($module)
     {
+        $this->setData();
         return isset($this->data['vars'][$module]) ? $this->data['vars'][$module] : [];
     }
 
@@ -77,6 +84,7 @@ public function getVars($module)
      */
     public function getVarValue($module, $var)
     {
+        $this->setData();
         if (!isset($this->data['vars'][$module])) {
             return false;
         }
@@ -102,6 +110,7 @@ public function getVarValue($module, $var)
      */
     public function getMediaEntities($module, $mediaType)
     {
+        $this->setData();
         return isset($this->data['media'][$module][$mediaType]) ? $this->data['media'][$module][$mediaType] : [];
     }
 
@@ -115,6 +124,7 @@ public function getMediaEntities($module, $mediaType)
      */
     public function getMediaAttributes($module, $mediaType, $mediaId)
     {
+        $this->setData();
         return isset($this->data['media'][$module][$mediaType][$mediaId])
             ? $this->data['media'][$module][$mediaType][$mediaId]
             : [];
@@ -185,6 +195,14 @@ public function getExcludedDir()
      */
     protected function getItems()
     {
+        $this->setData();
         return isset($this->data['exclude']) ? $this->data['exclude'] : [];
     }
+
+    protected function setData()
+    {
+        if ($this->data === null) {
+            $this->data = $this->read();
+        }
+    }
 }