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

Author: dhorytskyi

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

@@ -12,6 +12,7 @@
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\App\ScopeResolverPool;
 use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+use Magento\Store\Model\ScopeTypeNormalizer;
 
 /**
  * Backend config model
@@ -108,6 +109,11 @@ class Config extends \Magento\Framework\DataObject
      */
     private $scopeResolverPool;
 
+    /**
+     * @var ScopeTypeNormalizer
+     */
+    private $scopeTypeNormalizer;
+
     /**
      * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -119,6 +125,7 @@ class Config extends \Magento\Framework\DataObject
      * @param Config\Reader\Source\Deployed\SettingChecker|null $settingChecker
      * @param array $data
      * @param ScopeResolverPool|null $scopeResolverPool
+     * @param ScopeTypeNormalizer|null $scopeTypeNormalizer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -131,7 +138,8 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         SettingChecker $settingChecker = null,
         array $data = [],
-        ScopeResolverPool $scopeResolverPool = null
+        ScopeResolverPool $scopeResolverPool = null,
+        ScopeTypeNormalizer $scopeTypeNormalizer = null
     ) {
         parent::__construct($data);
         $this->_eventManager = $eventManager;
@@ -141,8 +149,12 @@ public function __construct(
         $this->_configLoader = $configLoader;
         $this->_configValueFactory = $configValueFactory;
         $this->_storeManager = $storeManager;
-        $this->settingChecker = $settingChecker ?? ObjectManager::getInstance()->get(SettingChecker::class);
-        $this->scopeResolverPool = $scopeResolverPool ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
+        $this->settingChecker = $settingChecker
+            ?? ObjectManager::getInstance()->get(SettingChecker::class);
+        $this->scopeResolverPool = $scopeResolverPool
+            ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
+        $this->scopeTypeNormalizer = $scopeTypeNormalizer
+            ?? ObjectManager::getInstance()->get(ScopeTypeNormalizer::class);
     }
 
     /**
@@ -539,53 +551,34 @@ private function initScope()
         if ($this->getSection() === null) {
             $this->setSection('');
         }
-        if ($this->getWebsite() === null) {
-            $this->setWebsite('');
-        }
-        if ($this->getStore() === null) {
-            $this->setStore('');
-        }
 
-        if ($this->getScope()) {
-            $scope = $this->scopeResolverPool->get($this->getScope())
-                ->getScope($this->getScopeCode());
-            if (StoreScopeInterface::SCOPE_WEBSITE === $scope->getScopeType()) {
-                $this->setWebsite($scope->getId());
-            } elseif (StoreScopeInterface::SCOPE_STORE === $scope->getScopeType()) {
-                $this->setStore($scope->getId());
+        if (!$this->getScope()) {
+            switch (true) {
+                case $this->getStore():
+                    $this->setScope(StoreScopeInterface::SCOPE_STORES);
+                    $this->setScopeCode($this->getStore());
+                    break;
+                case $this->getWebsite():
+                    $this->setScope(StoreScopeInterface::SCOPE_WEBSITES);
+                    $this->setScopeCode($this->getWebsite());
+                    break;
+                default:
+                    $this->setScope(ScopeInterface::SCOPE_DEFAULT);
+                    $this->setScopeCode('');
+                    break;
             }
-            $this->setScopeId($scope->getId());
-        } else {
-            $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;
+        $scope = $this->scopeResolverPool->get($this->getScope())
+            ->getScope($this->getScopeCode());
+        $this->setScope($this->scopeTypeNormalizer->normalize($scope->getScopeType()));
+        $this->setScopeCode($scope->getCode());
+        $this->setScopeId($scope->getId());
+        if ($this->getWebsite() === null) {
+            $this->setWebsite(StoreScopeInterface::SCOPE_WEBSITES === $this->getScope() ? $scope->getId() : '');
+        }
+        if ($this->getStore() === null) {
+            $this->setStore(StoreScopeInterface::SCOPE_STORES === $this->getScope() ? $scope->getId() : '');
         }
-
-        return $scope;
     }
 
     /**

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

@@ -77,6 +77,11 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $scope;
 
+    /**
+     * @var \Magento\Store\Model\ScopeTypeNormalizer|MockObject
+     */
+    private $scopeTypeNormalizer;
+
     protected function setUp()
     {
         $this->eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
@@ -118,6 +123,8 @@ protected function setUp()
         $this->scopeResolver->method('getScope')
             ->willReturn($this->scope);
 
+        $this->scopeTypeNormalizer = $this->createMock(\Magento\Store\Model\ScopeTypeNormalizer::class);
+
         $this->model = new \Magento\Config\Model\Config(
             $this->appConfigMock,
             $this->eventManagerMock,
@@ -128,7 +135,8 @@ protected function setUp()
             $this->storeManager,
             $this->settingsChecker,
             [],
-            $this->scopeResolverPool
+            $this->scopeResolverPool,
+            $this->scopeTypeNormalizer
         );
     }
 
@@ -284,6 +292,10 @@ public function testSaveToCheckScopeDataSet()
         $this->scope->expects($this->atLeastOnce())
             ->method('getCode')
             ->willReturn('website_code');
+        $this->scopeTypeNormalizer->expects($this->atLeastOnce())
+            ->method('normalize')
+            ->with('website')
+            ->willReturn('websites');
         $website = $this->createMock(\Magento\Store\Model\Website::class);
         $this->storeManager->expects($this->any())->method('getWebsites')->will($this->returnValue([$website]));
         $this->storeManager->expects($this->any())->method('isSingleStoreMode')->will($this->returnValue(true));
@@ -302,7 +314,7 @@ public function testSaveToCheckScopeDataSet()
                 'field' => 'key',
                 'groups' => [1 => ['fields' => ['key' => ['data']]]],
                 'group_id' => null,
-                'scope' => 'website',
+                'scope' => 'websites',
                 'scope_id' => 1,
                 'scope_code' => 'website_code',
                 'field_config' => null,