#22891: Static tests fix.

Author: engcom-Foxtrot

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
@@ -65,13 +64,13 @@ public function isReadOnly($path, $scope, $scopeCode = null)
         );
 
         if (null === $config) {
-            $config = $this->config->get(
-                $this->resolvePath(ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null) . "/" . $path
-            );
+            $config = $this->config->get($this->resolvePath($scope, $scopeCode) . "/" . $path);
         }
 
         if (null === $config) {
-            $config = $this->config->get($this->resolvePath($scope, $scopeCode) . "/" . $path);
+            $config = $this->config->get(
+                $this->resolvePath(ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null) . "/" . $path
+            );
         }
 
         return $config !== null;
@@ -84,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
@@ -103,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
@@ -75,8 +75,15 @@ public function setUp()
      * @param bool $expectedResult
      * @dataProvider isReadonlyDataProvider
      */
-    public function testIsReadonly($path, $scope, $scopeCode, $confValue, array $variables, array $configMap, $expectedResult)
-    {
+    public function testIsReadonly(
+        $path,
+        $scope,
+        $scopeCode,
+        $confValue,
+        array $variables,
+        array $configMap,
+        $expectedResult
+    ) {
         $this->placeholderMock->expects($this->any())
             ->method('isApplicable')
             ->willReturn(true);