Check if setting is disabled on default scope

Author: kassner

app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php

@@ -64,6 +64,12 @@ public function isReadOnly($path, $scope, $scopeCode = null)
             $this->placeholder->generate($path, $scope, $scopeCode)
         );
 
+        if (null === $config) {
+            $config = $this->config->get(
+                $this->resolvePath(ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null) . "/" . $path
+            );
+        }
+
         if (null === $config) {
             $config = $this->config->get($this->resolvePath($scope, $scopeCode) . "/" . $path);
         }

app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/SettingCheckerTest.php

@@ -71,15 +71,16 @@ public function setUp()
      * @param string $scopeCode
      * @param string|null $confValue
      * @param array $variables
+     * @param array $configMap
      * @param bool $expectedResult
      * @dataProvider isReadonlyDataProvider
      */
-    public function testIsReadonly($path, $scope, $scopeCode, $confValue, array $variables, $expectedResult)
+    public function testIsReadonly($path, $scope, $scopeCode, $confValue, array $variables, array $configMap, $expectedResult)
     {
-        $this->placeholderMock->expects($this->once())
+        $this->placeholderMock->expects($this->any())
             ->method('isApplicable')
             ->willReturn(true);
-        $this->placeholderMock->expects($this->once())
+        $this->placeholderMock->expects($this->any())
             ->method('generate')
             ->with($path, $scope, $scopeCode)
             ->willReturn('SOME_PLACEHOLDER');
@@ -95,13 +96,13 @@ public function testIsReadonly($path, $scope, $scopeCode, $confValue, array $var
 
         $this->configMock->expects($this->any())
             ->method('get')
-            ->willReturnMap([
+            ->willReturnMap(array_merge([
                 [
                     'system/' . $scope . "/" . ($scopeCode ? $scopeCode . '/' : '') . $path,
                     null,
                     $confValue
                 ],
-            ]);
+            ], $configMap));
 
         $this->assertSame($expectedResult, $this->checker->isReadOnly($path, $scope, $scopeCode));
     }
@@ -118,6 +119,7 @@ public function isReadonlyDataProvider()
                 'scopeCode' => 'myWebsite',
                 'confValue' => 'value',
                 'variables' => [],
+                'configMap' => [],
                 'expectedResult' => true,
             ],
             [
@@ -126,6 +128,7 @@ public function isReadonlyDataProvider()
                 'scopeCode' => 'myWebsite',
                 'confValue' => null,
                 'variables' => ['SOME_PLACEHOLDER' => 'value'],
+                'configMap' => [],
                 'expectedResult' => true,
             ],
             [
@@ -134,7 +137,58 @@ public function isReadonlyDataProvider()
                 'scopeCode' => 'myWebsite',
                 'confValue' => null,
                 'variables' => [],
+                'configMap' => [],
                 'expectedResult' => false,
+            ],
+            [
+                'path' => 'general/web/locale',
+                'scope' => 'website',
+                'scopeCode' => 'myWebsite',
+                'confValue' => null,
+                'variables' => [],
+                'configMap' => [
+                    [
+                        'system/default/general/web/locale',
+                        null,
+                        'default_value',
+                    ],
+                ],
+                'expectedResult' => true,
+            ],
+            [
+                'path' => 'general/web/locale',
+                'scope' => 'website',
+                'scopeCode' => 'myWebsite',
+                'confValue' => null,
+                'variables' => [],
+                'configMap' => [
+                    [
+                        'system/default/general/web/locale',
+                        null,
+                        'default_value',
+                    ],
+                ],
+                'expectedResult' => true,
+            ],
+            [
+                'path' => 'general/web/locale',
+                'scope' => 'store',
+                'scopeCode' => 'myStore',
+                'confValue' => null,
+                'variables' => [],
+                'configMap' => [
+                    [
+                        'system/default/general/web/locale',
+                        null,
+                        'default_value',
+                    ],
+                    [
+                        'system/website/myWebsite/general/web/locale',
+                        null,
+                        null,
+                    ],
+                ],
+                'expectedResult' => true,
             ]
         ];
     }