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

Author: shiftedreality

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

@@ -10,11 +10,7 @@
 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\ValueInterface;
-use Magento\Framework\App\Config\Value;
-use Magento\Framework\App\Config\ValueFactory;
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\App\ScopeResolverPool;
 use Magento\Framework\Exception\RuntimeException;
@@ -92,25 +88,15 @@ public function create($path, $value, $scope, $scopeCode = null)
             $structure = $this->structureFactory->create();
             /** @var Structure\ElementInterface $field */
             $field = $structure->getElement($path);
+            /** @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();
-        /** @var Structure $structure */
-        $structure = $this->structureFactory->create();
-        /** @var Structure\ElementInterface $field */
-        $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 = $this->valueFactory->create(
-            $backendModelName,
-            ['config' => $this->config]
-        );
+            $backendModel = $this->valueFactory->create(
+                $backendModelName,
+                ['config' => $this->config]
+            );
 
             if ($backendModel instanceof Value) {
                 $scopeId = 0;

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

@@ -8,12 +8,6 @@
 use Magento\Config\Model\Config\BackendFactory;
 use Magento\Config\Model\PreparedValueFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\DeploymentConfig;
-use Magento\Config\Model\Config\StructureFactory;
-use Magento\Framework\App\Config\Value;
-use Magento\Config\Model\Config\Structure;
-use Magento\Config\Model\Config\Structure\Element\Field;
-use Magento\Framework\App\Config\ValueFactory;
 use Magento\Config\Model\Config\StructureFactory;
 use Magento\Framework\App\Config\Value;
 use Magento\Config\Model\Config\Structure;
@@ -34,8 +28,7 @@ class PreparedValueFactoryTest extends \PHPUnit_Framework_TestCase
     private $structureFactoryMock;
 
     /**
-     * @var BackendFactory|\PHPUnit_Framework_MockObject_MockObject
-     * @var ValueFactory|Mock
+     * @var BackendFactory|Mock
      */
     private $valueFactoryMock;
 
@@ -55,7 +48,7 @@ class PreparedValueFactoryTest extends \PHPUnit_Framework_TestCase
     private $fieldMock;
 
     /**
-     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|Mock
      */
     private $configMock;
 
@@ -159,10 +152,7 @@ public function testCreate(
         $this->fieldMock->expects($this->once())
             ->method('hasBackendModel')
             ->willReturn(true);
-        $this->fieldMock->expects($this->once())
-            ->method('getBackendModel')
-            ->willReturn($this->valueMock);
-        $this->valueFactoryMock->expects($this->never())
+        $this->valueFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->valueMock);
         $this->valueMock->expects($this->once())
@@ -271,17 +261,6 @@ public function createNotInstanceOfValueDataProvider()
                 'someScope',
                 'someScopeCode',
                 1,
-            [
-                'deploymentConfigIsAvailable' => ['return' => true],
-                'structureGetElement' => ['expects' => $this->once()],
-                'field' => [
-                    'hasBackendModel' => [
-                        'expects' => $this->once(),
-                        'return' => true
-                    ],
-                    'getBackendModel' => ['expects' => $this->never()]
-                ],
-                'valueFactory' => ['expects' => $this->once()]
             ],
             'default scope flow' => [
                 '/some/path',