MAGETWO-66656: Fix retrieval of old value in config import

Author: shiftedreality

app/code/Magento/Config/Model/Config/BackendFactory.php

@@ -26,12 +26,13 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectman
      * Create backend model by name
      *
      * @param string $modelName
+     * @param array $arguments The object arguments
      * @return \Magento\Framework\App\Config\ValueInterface
      * @throws \InvalidArgumentException
      */
-    public function create($modelName)
+    public function create($modelName, array $arguments = [])
     {
-        $model = $this->_objectManager->create($modelName);
+        $model = $this->_objectManager->create($modelName, $arguments);
         if (!$model instanceof \Magento\Framework\App\Config\ValueInterface) {
             throw new \InvalidArgumentException('Invalid config field backend model: ' . $modelName);
         }

app/code/Magento/Config/Model/PreparedValueFactory.php

@@ -5,12 +5,13 @@
  */
 namespace Magento\Config\Model;
 
+use Magento\Config\Model\Config\BackendFactory;
 use Magento\Config\Model\Config\Structure;
 use Magento\Config\Model\Config\StructureFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Config\ValueInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Config\Value;
-use Magento\Framework\App\Config\ValueFactory;
 
 /**
  * Creates a prepared instance of Value.
@@ -37,23 +38,33 @@ class PreparedValueFactory
      * The factory for configuration value objects.
      *
      * @see ValueInterface
-     * @var ValueFactory
+     * @var BackendFactory
      */
     private $valueFactory;
 
+    /**
+     * The scope configuration.
+     *
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
     /**
      * @param DeploymentConfig $deploymentConfig The deployment configuration reader
      * @param StructureFactory $structureFactory The manager for system configuration structure
-     * @param ValueFactory $valueFactory The factory for configuration value objects
+     * @param BackendFactory $valueFactory The factory for configuration value objects
+     * @param ScopeConfigInterface $config The scope configuration
      */
     public function __construct(
         DeploymentConfig $deploymentConfig,
         StructureFactory $structureFactory,
-        ValueFactory $valueFactory
+        BackendFactory $valueFactory,
+        ScopeConfigInterface $config
     ) {
         $this->deploymentConfig = $deploymentConfig;
         $this->structureFactory = $structureFactory;
         $this->valueFactory = $valueFactory;
+        $this->config = $config;
     }
 
     /**
@@ -75,10 +86,15 @@ public function create($path, $value, $scope, $scopeCode)
         $field = $this->deploymentConfig->isAvailable()
             ? $structure->getElement($path)
             : null;
+        /** @var string $backendModelName */
+        $backendModelName = $field instanceof Structure\Element\Field && $field->hasBackendModel()
+            ? $field->getData()['backend_model']
+            : ValueInterface::class;
         /** @var ValueInterface $backendModel */
-        $backendModel = $field instanceof Structure\Element\Field && $field->hasBackendModel()
-            ? $field->getBackendModel()
-            : $this->valueFactory->create();
+        $backendModel = $this->valueFactory->create(
+            $backendModelName,
+            ['config' => $this->config]
+        );
 
         if ($backendModel instanceof Value) {
             $backendModel->setPath($path);

app/code/Magento/Config/Test/Unit/Model/PreparedValueFactoryTest.php

@@ -5,9 +5,10 @@
  */
 namespace Magento\Config\Test\Unit\Model;
 
+use Magento\Config\Model\Config\BackendFactory;
 use Magento\Config\Model\PreparedValueFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\App\Config\ValueFactory;
 use Magento\Config\Model\Config\StructureFactory;
 use Magento\Framework\App\Config\Value;
 use Magento\Config\Model\Config\Structure;
@@ -29,7 +30,7 @@ class PreparedValueFactoryTest extends \PHPUnit_Framework_TestCase
     private $structureFactoryMock;
 
     /**
-     * @var ValueFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var BackendFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     private $valueFactoryMock;
 
@@ -48,6 +49,11 @@ class PreparedValueFactoryTest extends \PHPUnit_Framework_TestCase
      */
     private $fieldMock;
 
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
     /**
      * @var PreparedValueFactory
      */
@@ -65,7 +71,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->valueFactoryMock = $this->getMockBuilder(ValueFactory::class)
+        $this->valueFactoryMock = $this->getMockBuilder(BackendFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -79,11 +85,14 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['setPath', 'setScope', 'setScopeId', 'setValue'])
             ->getMock();
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->getMockForAbstractClass();
 
         $this->valueBuilder = new PreparedValueFactory(
             $this->deploymentConfigMock,
             $this->structureFactoryMock,
-            $this->valueFactoryMock
+            $this->valueFactoryMock,
+            $this->configMock
         );
     }
 

app/code/Magento/Config/etc/di.xml

@@ -99,6 +99,16 @@
             </argument>
         </arguments>
     </virtualType>
+    <virtualType name="snapshotValueFactory" type="Magento\Config\Model\PreparedValueFactory">
+        <arguments>
+            <argument name="config" xsi:type="object">configSnapshot</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Config\Model\Config\Importer">
+        <arguments>
+            <argument name="valueBuilder" xsi:type="object">snapshotValueFactory</argument>
+        </arguments>
+    </type>
     <virtualType name="modulesDataProviderProxy" type="Magento\Framework\App\Config\InitialConfigSource\Proxy">
         <arguments>
             <argument name="instanceName" xsi:type="string">modulesDataProvider</argument>