diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php index bdc9f88f6c70fdc62fa93683f8872abf15bf7798..0bf591ee5033bfe477ec8fa3e7dcb285370b1605 100644 --- a/app/code/Magento/Config/App/Config/Type/System.php +++ b/app/code/Magento/Config/App/Config/Type/System.php @@ -96,7 +96,9 @@ class System implements ConfigTypeInterface $data = $this->cache->load(self::CONFIG_TYPE); if (!$data) { $data = $this->preProcessor->process($this->source->get()); + $this->data = new DataObject($data); $data = $this->fallback->process($data); + $this->data = new DataObject($data); //Placeholder processing need system config - so we need to save intermediate result $data = $this->postProcessor->process($data); $this->data = new DataObject($data); diff --git a/app/code/Magento/Config/Model/Config/Export/Comment.php b/app/code/Magento/Config/Model/Config/Export/Comment.php index 7f5aef70c0b80f67415d5b4dacb2d31a658ea2cc..ae0431c82daa031523f464ea1539209ca324996c 100644 --- a/app/code/Magento/Config/Model/Config/Export/Comment.php +++ b/app/code/Magento/Config/Model/Config/Export/Comment.php @@ -26,7 +26,6 @@ class Comment implements CommentInterface private $source; /** - * Comment constructor. * @param PlaceholderFactory $placeholderFactory * @param DumpConfigSourceInterface $source */