ENGCOM-1673: Fixes in config module #15511

magento-engcom-team · magento-engcom-team · commit c7d6259cd84b · 2018-05-25T03:51:14.000-05:00
- Merge Pull Request #15511 from mhauri/magento2:fixes-in-config-module - Merged commits: 1. 5e993f6 2. 8c68d6b
diff --git a/app/code/Magento/Config/Model/Config/Importer.php b/app/code/Magento/Config/Model/Config/Importer.php
@@ -124,7 +124,7 @@ public function import(array $data)
                 $this->scopeConfig->clean();
             }
 
-            $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData, $data) {
+            $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData) {
                 $this->scope->setCurrentScope(Area::AREA_ADMINHTML);
 
                 // Invoke saving of new values.
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
@@ -74,7 +74,7 @@ public function testGetElementHtmlWithValue()
                 'showInWebsite' => '1',
                 'showInStore' => '1',
                 'label' => null,
-                'backend_model' => \Magento\BackendModelConfig\Backend\Image::class,
+                'backend_model' => \Magento\Config\Model\Config\Backend\Image::class,
                 'upload_dir' => [
                     'config' => 'system/filesystem/media',
                     'scope_info' => '1',

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public function import(array $data)`
`124`	`124`	`$this->scopeConfig->clean();`
`125`	`125`	`}`
`126`	`126`
`127`		`- $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData, $data) {`
	`127`	`+ $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData) {`
`128`	`128`	`$this->scope->setCurrentScope(Area::AREA_ADMINHTML);`
`129`	`129`
`130`	`130`	`// Invoke saving of new values.`