ENGCOM-5441: Check if setting is disabled on default scope #22891

Author: sivaschenko

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

@@ -5,12 +5,11 @@
  */
 namespace Magento\Config\Model\Config\Reader\Source\Deployed;
 
-use Magento\Config\Model\Config\Reader;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\DeploymentConfig;
-use Magento\Config\Model\Placeholder\PlaceholderInterface;
 use Magento\Config\Model\Placeholder\PlaceholderFactory;
+use Magento\Config\Model\Placeholder\PlaceholderInterface;
 use Magento\Framework\App\Config\ScopeCodeResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Class for checking settings that defined in config file
@@ -68,6 +67,12 @@ public function isReadOnly($path, $scope, $scopeCode = null)
             $config = $this->config->get($this->resolvePath($scope, $scopeCode) . "/" . $path);
         }
 
+        if (null === $config) {
+            $config = $this->config->get(
+                $this->resolvePath(ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null) . "/" . $path
+            );
+        }
+
         return $config !== null;
     }
 
@@ -78,7 +83,6 @@ public function isReadOnly($path, $scope, $scopeCode = null)
      *
      * @param string $path
      * @param string $scope
-     * @param string $scopeCode
      * @param string|null $scopeCode
      * @return string|null
      * @since 100.1.2
@@ -97,9 +101,11 @@ public function getPlaceholderValue($path, $scope, $scopeCode = null)
      */
     public function getEnvValue($placeholder)
     {
+        // phpcs:disable Magento2.Security.Superglobal
         if ($this->placeholder->isApplicable($placeholder) && isset($_ENV[$placeholder])) {
             return $_ENV[$placeholder];
         }
+        // phpcs:enable
 
         return null;
     }

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

@@ -3,14 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\Test\Unit\Model\Config\Reader\Source\Deployed;
 
-use Magento\Config\Model\Config\Reader;
 use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
+use Magento\Config\Model\Placeholder\PlaceholderFactory;
+use Magento\Config\Model\Placeholder\PlaceholderInterface;
 use Magento\Framework\App\Config;
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Config\Model\Placeholder\PlaceholderInterface;
-use Magento\Config\Model\Placeholder\PlaceholderFactory;
 
 /**
  * Test class for checking settings that defined in config file
@@ -71,15 +71,23 @@ 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)
-    {
-        $this->placeholderMock->expects($this->once())
+    public function testIsReadonly(
+        $path,
+        $scope,
+        $scopeCode,
+        $confValue,
+        array $variables,
+        array $configMap,
+        $expectedResult
+    ) {
+        $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 +103,18 @@ public function testIsReadonly($path, $scope, $scopeCode, $confValue, array $var
 
         $this->configMock->expects($this->any())
             ->method('get')
-            ->willReturnMap([
-                [
-                    'system/' . $scope . "/" . ($scopeCode ? $scopeCode . '/' : '') . $path,
-                    null,
-                    $confValue
-                ],
-            ]);
+            ->willReturnMap(
+                array_merge(
+                    [
+                        [
+                            'system/' . $scope . "/" . ($scopeCode ? $scopeCode . '/' : '') . $path,
+                            null,
+                            $confValue
+                        ],
+                    ],
+                    $configMap
+                )
+            );
 
         $this->assertSame($expectedResult, $this->checker->isReadOnly($path, $scope, $scopeCode));
     }
@@ -118,6 +131,7 @@ public function isReadonlyDataProvider()
                 'scopeCode' => 'myWebsite',
                 'confValue' => 'value',
                 'variables' => [],
+                'configMap' => [],
                 'expectedResult' => true,
             ],
             [
@@ -126,6 +140,7 @@ public function isReadonlyDataProvider()
                 'scopeCode' => 'myWebsite',
                 'confValue' => null,
                 'variables' => ['SOME_PLACEHOLDER' => 'value'],
+                'configMap' => [],
                 'expectedResult' => true,
             ],
             [
@@ -134,7 +149,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,
             ]
         ];
     }