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

Author: dhorytskyi

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

@@ -552,27 +552,11 @@ private function initScope()
             $this->setSection('');
         }
 
-        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;
-            }
-        }
-        $scope = $this->scopeResolverPool->get($this->getScope())
-            ->getScope($this->getScopeCode());
+        $scope = $this->retrieveScope();
         $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() : '');
         }
@@ -581,6 +565,54 @@ private function initScope()
         }
     }
 
+    /**
+     * Retrieve scope from initial data
+     *
+     * @return ScopeInterface
+     */
+    private function retrieveScope(): ScopeInterface
+    {
+        $scopeType = $this->getScope();
+        if (!$scopeType) {
+            switch (true) {
+                case $this->getStore():
+                    $scopeType = StoreScopeInterface::SCOPE_STORES;
+                    $scopeIdentifier = $this->getStore();
+                    break;
+                case $this->getWebsite():
+                    $scopeType = StoreScopeInterface::SCOPE_WEBSITES;
+                    $scopeIdentifier = $this->getWebsite();
+                    break;
+                default:
+                    $scopeType = ScopeInterface::SCOPE_DEFAULT;
+                    $scopeIdentifier = null;
+                    break;
+            }
+        } else {
+            switch (true) {
+                case $this->getScopeId() !== null:
+                    $scopeIdentifier = $this->getScopeId();
+                    break;
+                case $this->getScopeCode() !== null:
+                    $scopeIdentifier = $this->getScopeCode();
+                    break;
+                case $this->getStore() !== null:
+                    $scopeIdentifier = $this->getStore();
+                    break;
+                case $this->getWebsite() !== null:
+                    $scopeIdentifier = $this->getWebsite();
+                    break;
+                default:
+                    $scopeIdentifier = null;
+                    break;
+            }
+        }
+        $scope = $this->scopeResolverPool->get($scopeType)
+            ->getScope($scopeIdentifier);
+
+        return $scope;
+    }
+
     /**
      * Return formatted config data for current section
      *

app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php

@@ -36,7 +36,7 @@ public function __construct(RequestInterface $request)
      */
     public function afterGetConfigPath(FieldConfigStructure $subject, $result)
     {
-        if (!$result && $this->request->getParam('section') == 'payment') {
+        if (!$result && strpos($subject->getPath(), 'payment_') === 0) {
             $result = preg_replace(
                 '@^(' . implode('|', ConfigStructurePlugin::getPaypalConfigCountries(true)) . ')/@',
                 'payment/',