MAGETWO-69854: Can't set allowed or default currencies using config:set command

Author: NadiyaS

app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php

@@ -22,7 +22,7 @@ abstract class AbstractCurrency extends \Magento\Framework\App\Config\Value
      */
     protected function _getAllowedCurrencies()
     {
-        if ($this->getData('groups/options/fields/allow/inherit')) {
+        if (!$this->isFormData() || $this->getData('groups/options/fields/allow/inherit')) {
             return explode(
                 ',',
                 (string)$this->_config->getValue(
@@ -59,7 +59,8 @@ protected function _getInstalledCurrencies()
      */
     protected function _getCurrencyBase()
     {
-        if (!($value = $this->getData('groups/options/fields/base/value'))) {
+        $value = $this->getData('groups/options/fields/base/value');
+        if (!$this->isFormData() || !$value) {
             $value = $this->_config->getValue(
                 \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
                 $this->getScope(),
@@ -76,7 +77,7 @@ protected function _getCurrencyBase()
      */
     protected function _getCurrencyDefault()
     {
-        if (!($value = $this->getData('groups/options/fields/default/value'))) {
+        if (!$this->isFormData() || !($value = $this->getData('groups/options/fields/default/value'))) {
             $value = $this->_config->getValue(
                 \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT,
                 $this->getScope(),
@@ -85,4 +86,14 @@ protected function _getCurrencyDefault()
         }
         return strval($value);
     }
+
+    /**
+     * Check whether field saved from Admin form with other currency data or as single field, e.g. from CLI command
+     *
+     * @return bool True in case when field was saved from Admin form
+     */
+    private function isFormData()
+    {
+        return $this->getData('groups/options/fields') !== null;
+    }
 }

app/code/Magento/Config/Model/Config/Backend/Currency/Allow.php

@@ -73,4 +73,22 @@ public function afterSave()
 
         return parent::afterSave();
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _getAllowedCurrencies()
+    {
+        $value = $this->getValue();
+        $isFormData = $this->getData('groups/options/fields') !== null;
+        if ($isFormData && $this->getData('groups/options/fields/allow/inherit')) {
+            $value = (string)$this->_config->getValue(
+                \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
+                $this->getScope(),
+                $this->getScopeId()
+            );
+        }
+
+        return explode(',', $value);
+    }
 }

app/code/Magento/Config/Model/Config/PreparedValue/AdditionalData.php

@@ -6,7 +6,6 @@
 namespace Magento\Config\Model;
 
 use Magento\Config\Model\Config\BackendFactory;
-use Magento\Config\Model\Config\PreparedValue\AdditionalData;
 use Magento\Config\Model\Config\Structure;
 use Magento\Config\Model\Config\StructureFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -52,32 +51,22 @@ class PreparedValueFactory
      */
     private $config;
 
-    /**
-     * Additional data applier for backend model.
-     *
-     * @var Config\PreparedValue\AdditionalData
-     */
-    private $additionalData;
-
     /**
      * @param ScopeResolverPool $scopeResolverPool The scope resolver pool
      * @param StructureFactory $structureFactory The manager for system configuration structure
      * @param BackendFactory $valueFactory The factory for configuration value objects
      * @param ScopeConfigInterface $config The scope configuration
-     * @param AdditionalData $additionalData The additional data applier for backend model
      */
     public function __construct(
         ScopeResolverPool $scopeResolverPool,
         StructureFactory $structureFactory,
         BackendFactory $valueFactory,
-        ScopeConfigInterface $config,
-        AdditionalData $additionalData
+        ScopeConfigInterface $config
     ) {
         $this->scopeResolverPool = $scopeResolverPool;
         $this->structureFactory = $structureFactory;
         $this->valueFactory = $valueFactory;
         $this->config = $config;
-        $this->additionalData = $additionalData;
     }
 
     /**
@@ -131,7 +120,6 @@ public function create($path, $value, $scope, $scopeCode = null)
                 $backendModel->setScope($scope);
                 $backendModel->setScopeId($scopeId);
                 $backendModel->setValue($value);
-                $this->additionalData->apply($backendModel);
             }
 
             return $backendModel;

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

@@ -6,7 +6,6 @@
 namespace Magento\Config\Test\Unit\Model;
 
 use Magento\Config\Model\Config\BackendFactory;
-use Magento\Config\Model\Config\PreparedValue\AdditionalData;
 use Magento\Config\Model\PreparedValueFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Config\Model\Config\StructureFactory;
@@ -70,11 +69,6 @@ class PreparedValueFactoryTest extends \PHPUnit_Framework_TestCase
      */
     private $scopeMock;
 
-    /**
-     * @var AdditionalData|Mock
-     */
-    private $additionalDataMock;
-
     /**
      * @var PreparedValueFactory
      */
@@ -113,16 +107,12 @@ protected function setUp()
             ->getMock();
         $this->scopeMock = $this->getMockBuilder(ScopeInterface::class)
             ->getMockForAbstractClass();
-        $this->additionalDataMock = $this->getMockBuilder(AdditionalData::class)
-            ->disableOriginalConstructor()
-            ->getMock();
 
         $this->preparedValueFactory = new PreparedValueFactory(
             $this->scopeResolverPoolMock,
             $this->structureFactoryMock,
             $this->valueFactoryMock,
-            $this->configMock,
-            $this->additionalDataMock
+            $this->configMock
         );
     }
 
@@ -188,9 +178,6 @@ public function testCreate(
             ->method('setValue')
             ->with($value)
             ->willReturnSelf();
-        $this->additionalDataMock->expects($this->once())
-            ->method('apply')
-            ->with($this->valueMock);
 
         $this->assertInstanceOf(
             Value::class,
@@ -307,8 +294,6 @@ public function testCreateNotInstanceOfValue(
             ->method('setScopeId');
         $this->valueMock->expects($this->never())
             ->method('setValue');
-        $this->additionalDataMock->expects($this->never())
-            ->method('apply');
 
         $this->assertSame(
             $value,