MAGETWO-97247: Impossible to enable shared catalog through cli command

Author: dhorytskyi

app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php

@@ -11,7 +11,6 @@
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\ScopeResolverPool;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Config\Model\PreparedValueFactory;
 
@@ -47,11 +46,6 @@ class DefaultProcessor implements ConfigSetProcessorInterface
      */
     private $preparedValueFactory;
 
-    /**
-     * @var ScopeResolverPool
-     */
-    private $scopeResolverPool;
-
     /**
      * @var ConfigFactory
      */
@@ -61,21 +55,18 @@ class DefaultProcessor implements ConfigSetProcessorInterface
      * @param PreparedValueFactory $preparedValueFactory The factory for prepared value
      * @param DeploymentConfig $deploymentConfig The deployment configuration reader
      * @param ConfigPathResolver $configPathResolver The resolver for configuration paths according to source type
-     * @param ScopeResolverPool|null $scopeResolverPool
      * @param ConfigFactory|null $configFactory
      */
     public function __construct(
         PreparedValueFactory $preparedValueFactory,
         DeploymentConfig $deploymentConfig,
         ConfigPathResolver $configPathResolver,
-        ScopeResolverPool $scopeResolverPool = null,
         ConfigFactory $configFactory = null
     ) {
         $this->preparedValueFactory = $preparedValueFactory;
         $this->deploymentConfig = $deploymentConfig;
         $this->configPathResolver = $configPathResolver;
 
-        $this->scopeResolverPool = $scopeResolverPool ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
         $this->configFactory = $configFactory ?? ObjectManager::getInstance()->get(ConfigFactory::class);
     }
 
@@ -99,12 +90,9 @@ public function process($path, $value, $scope, $scopeCode)
         }
 
         try {
-            $resolvedScope = $this->scopeResolverPool->get($scope)
-                ->getScope($scopeCode);
             $config = $this->configFactory->create([
-                'scope' => $resolvedScope->getScopeType(),
-                'scope_id' => $resolvedScope->getId(),
-                'scope_code' => $resolvedScope->getCode(),
+                'scope' => $scope,
+                'scope_code' => $scopeCode,
             ]);
             $config->setDataByPath($path, $value);
             $config->save();

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

@@ -119,6 +119,7 @@ class Config extends \Magento\Framework\DataObject
      * @param Config\Reader\Source\Deployed\SettingChecker|null $settingChecker
      * @param array $data
      * @param ScopeResolverPool|null $scopeResolverPool
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Config\ReinitableConfigInterface $config,
@@ -529,7 +530,7 @@ public function setDataByPath($path, $value)
     }
 
     /**
-     * Resolve scope data
+     * Set scope data
      *
      * @return void
      */
@@ -545,35 +546,48 @@ private function initScope()
             $this->setStore('');
         }
 
-        if ($this->getScope() && $this->getScopeId() && $this->getScopeCode()) {
+        if ($this->getScope()) {
             $scope = $this->scopeResolverPool->get($this->getScope())
-                ->getScope($this->getScopeId());
+                ->getScope($this->getScopeCode());
             if (StoreScopeInterface::SCOPE_WEBSITE === $scope->getScopeType()) {
                 $this->setWebsite($scope->getId());
             } elseif (StoreScopeInterface::SCOPE_STORE === $scope->getScopeType()) {
                 $this->setStore($scope->getId());
             }
+            $this->setScopeId($scope->getId());
         } else {
-            switch (true) {
-                case $this->getStore():
-                    $scope = $this->scopeResolverPool->get(StoreScopeInterface::SCOPE_STORE)
-                        ->getScope($this->getStore());
-                    break;
-                case $this->getWebsite():
-                    $scope = $this->scopeResolverPool->get(StoreScopeInterface::SCOPE_WEBSITE)
-                        ->getScope($this->getWebsite());
-                    break;
-                default:
-                    $scope = $this->scopeResolverPool->get(ScopeInterface::SCOPE_DEFAULT)
-                        ->getScope(0);
-                    break;
-            }
+            $scope = $this->resolveScope();
             $this->setScope($scope->getScopeType());
             $this->setScopeId($scope->getId());
             $this->setScopeCode($scope->getCode());
         }
     }
 
+    /**
+     * Resolve scope
+     *
+     * @return ScopeInterface
+     */
+    private function resolveScope(): ScopeInterface
+    {
+        switch (true) {
+            case $this->getStore():
+                $scope = $this->scopeResolverPool->get(StoreScopeInterface::SCOPE_STORE)
+                    ->getScope($this->getStore());
+                break;
+            case $this->getWebsite():
+                $scope = $this->scopeResolverPool->get(StoreScopeInterface::SCOPE_WEBSITE)
+                    ->getScope($this->getWebsite());
+                break;
+            default:
+                $scope = $this->scopeResolverPool->get(ScopeInterface::SCOPE_DEFAULT)
+                    ->getScope(0);
+                break;
+        }
+
+        return $scope;
+    }
+
     /**
      * Return formatted config data for current section
      *

app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php

@@ -7,13 +7,14 @@
 
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSet\DefaultProcessor;
+use Magento\Config\Model\Config;
+use Magento\Config\Model\Config\Factory as ConfigFactory;
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Config\Model\PreparedValueFactory;
 use Magento\Framework\App\Config\Value;
-use Magento\Framework\App\Config\ValueInterface;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
@@ -55,17 +56,18 @@ class DefaultProcessorTest extends \PHPUnit\Framework\TestCase
      */
     private $resourceModelMock;
 
+    /**
+     * @var ConfigFactory|Mock
+     */
+    private $configFactory;
+
     /**
      * @inheritdoc
      */
     protected function setUp()
     {
-        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->configPathResolverMock = $this->getMockBuilder(ConfigPathResolver::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->configPathResolverMock = $this->createMock(ConfigPathResolver::class);
         $this->resourceModelMock = $this->getMockBuilder(AbstractDb::class)
             ->disableOriginalConstructor()
             ->setMethods(['save'])
@@ -74,14 +76,14 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getResource'])
             ->getMock();
-        $this->preparedValueFactoryMock = $this->getMockBuilder(PreparedValueFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->preparedValueFactoryMock = $this->createMock(PreparedValueFactory::class);
+        $this->configFactory = $this->createMock(ConfigFactory::class);
 
         $this->model = new DefaultProcessor(
             $this->preparedValueFactoryMock,
             $this->deploymentConfigMock,
-            $this->configPathResolverMock
+            $this->configPathResolverMock,
+            $this->configFactory
         );
     }
 
@@ -98,15 +100,16 @@ public function testProcess($path, $value, $scope, $scopeCode)
     {
         $this->configMockForProcessTest($path, $scope, $scopeCode);
 
-        $this->preparedValueFactoryMock->expects($this->once())
+        $config = $this->createMock(Config::class);
+        $this->configFactory->expects($this->once())
             ->method('create')
-            ->willReturn($this->valueMock);
-        $this->valueMock->expects($this->once())
-            ->method('getResource')
-            ->willReturn($this->resourceModelMock);
-        $this->resourceModelMock->expects($this->once())
+            ->with(['scope' => $scope, 'scope_code' => $scopeCode])
+            ->willReturn($config);
+        $config->expects($this->once())
+            ->method('setDataByPath')
+            ->with($path, $value);
+        $config->expects($this->once())
             ->method('save')
-            ->with($this->valueMock)
             ->willReturnSelf();
 
         $this->model->process($path, $value, $scope, $scopeCode);
@@ -124,28 +127,6 @@ public function processDataProvider()
         ];
     }
 
-    public function testProcessWithWrongValueInstance()
-    {
-        $path = 'test/test/test';
-        $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
-        $scopeCode = null;
-        $value = 'value';
-        $valueInterfaceMock = $this->getMockBuilder(ValueInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->configMockForProcessTest($path, $scope, $scopeCode);
-
-        $this->preparedValueFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($valueInterfaceMock);
-        $this->valueMock->expects($this->never())
-            ->method('getResource');
-        $this->resourceModelMock->expects($this->never())
-            ->method('save');
-
-        $this->model->process($path, $value, $scope, $scopeCode);
-    }
-
     /**
      * @param string $path
      * @param string $scope
@@ -185,6 +166,9 @@ public function testProcessLockedValue()
             ->method('resolve')
             ->willReturn('system/default/test/test/test');
 
+        $this->configFactory->expects($this->never())
+            ->method('create');
+
         $this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
     }
 }