MAGETWO-60381: Disable fields functionality doesn't work for theme configuration

Author: oshmyheliuk

app/code/Magento/Theme/Model/Design/Config/DataProvider.php

@@ -5,8 +5,8 @@
  */
 namespace Magento\Theme\Model\Design\Config;
 
+use Magento\Framework\App\Config\ScopeCodeResolver;
 use Magento\Framework\App\ObjectManager;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Theme\Model\ResourceModel\Design\Config\Collection;
 use Magento\Theme\Model\ResourceModel\Design\Config\CollectionFactory;
 use Magento\Ui\DataProvider\AbstractDataProvider;
@@ -46,9 +46,9 @@ class DataProvider extends AbstractDataProvider
     private $request;
 
     /**
-     * @var StoreManagerInterface
+     * @var ScopeCodeResolver
      */
-    private $storeManager;
+    private $scopeCodeResolver;
 
     /**
      * @param string $name
@@ -114,7 +114,7 @@ public function getMeta()
         }
 
         $scope = $request['scope'];
-        $scopeCode = $this->getStringScopeCode(
+        $scopeCode = $this->getScopeCodeResolver()->resolve(
             $scope,
             isset($request['scope_id']) ? $request['scope_id'] : null
         );
@@ -143,23 +143,15 @@ public function getMeta()
     }
 
     /**
-     * Retrieve Scope string code
-     *
-     * @param string $scope
-     * @param integer $scopeId
-     * @return string
+     * @deprecated
+     * @return ScopeCodeResolver
      */
-    private function getStringScopeCode($scope, $scopeId = null)
+    private function getScopeCodeResolver()
     {
-        $scopeCode = '';
-
-        if ($scope == 'stores') {
-            $scopeCode = $this->getStoreManager()->getStore($scopeId)->getCode();
-        } elseif ($scope == 'websites') {
-            $scopeCode = $this->getStoreManager()->getWebsite($scopeId)->getCode();
+        if ($this->scopeCodeResolver === null) {
+            $this->scopeCodeResolver = ObjectManager::getInstance()->get(ScopeCodeResolver::class);
         }
-
-        return $scopeCode;
+        return $this->scopeCodeResolver;
     }
 
     /**
@@ -185,16 +177,4 @@ private function getRequest()
         }
         return $this->request;
     }
-
-    /**
-     * @deprecated
-     * @return StoreManagerInterface
-     */
-    private function getStoreManager()
-    {
-        if ($this->storeManager === null) {
-            $this->storeManager = ObjectManager::getInstance()->get(StoreManagerInterface::class);
-        }
-        return $this->storeManager;
-    }
 }

app/code/Magento/Theme/Test/Unit/Model/Design/Config/DataProviderTest.php

@@ -6,10 +6,9 @@
 namespace Magento\Theme\Test\Unit\Model\Design\Config;
 
 use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
+use Magento\Framework\App\Config\ScopeCodeResolver;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Store\Api\Data\StoreInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Theme\Model\Design\Config\DataLoader;
 use Magento\Theme\Model\Design\Config\DataProvider;
 use Magento\Theme\Model\Design\Config\MetadataLoader;
@@ -48,9 +47,9 @@ class DataProviderTest extends \PHPUnit_Framework_TestCase
     private $requestMock;
 
     /**
-     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeCodeResolver|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $storeManagerMock;
+    private $scopeCodeResolverMock;
 
     /**
      * @var SettingChecker|\PHPUnit_Framework_MockObject_MockObject
@@ -86,7 +85,7 @@ protected function setUp()
         $this->requestMock = $this->getMockBuilder(RequestInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+        $this->scopeCodeResolverMock = $this->getMockBuilder(ScopeCodeResolver::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->settingCheckerMock = $this->getMockBuilder(SettingChecker::class)
@@ -108,8 +107,8 @@ protected function setUp()
         );
         $this->objectManager->setBackwardCompatibleProperty(
             $this->model,
-            'storeManager',
-            $this->storeManagerMock
+            'scopeCodeResolver',
+            $this->scopeCodeResolverMock
         );
         $this->objectManager->setBackwardCompatibleProperty(
             $this->model,
@@ -139,24 +138,18 @@ public function testGetData()
      */
     public function testGetMeta(array $inputMeta, array $expectedMeta, array $request)
     {
-        $store = $this->getMockBuilder(StoreInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $store->expects($this->any())
-            ->method('getCode')
-            ->willReturn('store1');
         $this->requestMock->expects($this->any())
             ->method('getParams')
             ->willReturn($request);
-        $this->storeManagerMock->expects($this->any())
-            ->method('getStore')
-            ->with(1)
-            ->willReturn($store);
+        $this->scopeCodeResolverMock->expects($this->any())
+            ->method('resolve')
+            ->with('stores', 1)
+            ->willReturn('default');
         $this->settingCheckerMock->expects($this->any())
             ->method('isReadOnly')
             ->withConsecutive(
-                ['design/head/welcome', 'stores', 'store1'],
-                ['design/head/logo', 'stores', 'store1']
+                ['design/head/welcome', 'stores', 'default'],
+                ['design/head/logo', 'stores', 'default']
             )
             ->willReturnOnConsecutiveCalls(
                 true,