MAGETWO-91934: Unlock Locales Editing when SCD on Demand Mode is Enabled

 - changes after review

Author: NadiyaS

app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php

@@ -9,69 +9,30 @@
 
 use Magento\Config\Model\Config\Structure\ElementVisibilityInterface;
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\App\State;
 use Magento\Framework\Config\ConfigOptionsListConstants as Constants;
 
 /**
  * Defines status of visibility of form elements on Stores > Settings > Configuration page
- * when Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION is enabled.
+ * when Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION is enabled
+ * otherwise rule from Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction is used
+ * @see \Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction
+ *
  * @api
  */
 class ConcealInProductionWithoutScdOnDemand implements ElementVisibilityInterface
 {
     /**
-     * The list of form element paths with concrete visibility status.
-     *
-     * E.g.
-     *
-     * ```php
-     * [
-     *      'general/locale/code' => ElementVisibilityInterface::DISABLED,
-     *      'general/country' => ElementVisibilityInterface::HIDDEN,
-     * ];
-     * ```
-     *
-     * It means that:
-     *  - field Locale (in group Locale Options in section General) will be disabled
-     *  - group Country Options (in section General) will be hidden
-     *
-     * @var array
-     */
-    private $configs = [];
-
-    /**
-     *
-     * The list of form element paths which ignore visibility status.
-     *
-     * E.g.
-     *
-     * ```php
-     * [
-     *      'general/country/default' => '',
-     * ];
-     * ```
-     *
-     * It means that:
-     *  - field 'default' in group Country Options (in section General) will be showed, even if all group(section)
-     *    will be hidden.
-     *
-     * @var array
-     */
-    private $exemptions = [];
-
-    /**
-     * @var ConcealInProduction
+     * @var ConcealInProduction Element visibility rules in the Production mode
      */
     private $concealInProduction;
 
     /**
-     * @var DeploymentConfig
+     * @var DeploymentConfig The application deployment configuration
      */
     private $deploymentConfig;
 
     /**
      * @param ConcealInProductionFactory $concealInProductionFactory
-     * @param State $state The object that has information about the state of the system
      * @param DeploymentConfig $deploymentConfig Deployment configuration reader
      * @param array $configs The list of form element paths with concrete visibility status.
      * @param array $exemptions The list of form element paths which ignore visibility status.
@@ -85,8 +46,6 @@ public function __construct(
         $this->concealInProduction = $concealInProductionFactory
             ->create(['configs' => $configs, 'exemptions' => $exemptions]);
         $this->deploymentConfig = $deploymentConfig;
-        $this->configs = $configs;
-        $this->exemptions = $exemptions;
     }
 
     /**

app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemandTest.php

@@ -100,7 +100,7 @@ public function testIsDisabledScdOnDemandEnabled(): void
      *
      * @dataProvider visibilityDataProvider
      */
-    public function testIsHiddenScdOnDemandDisabled($isHidden): void
+    public function testIsHiddenScdOnDemandDisabled(bool $isHidden): void
     {
         $path = 'section1/group1/field1';
         $this->deploymentConfigMock->expects($this->once())
@@ -120,7 +120,7 @@ public function testIsHiddenScdOnDemandDisabled($isHidden): void
      *
      * @dataProvider visibilityDataProvider
      */
-    public function testIsDisabledScdOnDemandDisabled($isDisabled): void
+    public function testIsDisabledScdOnDemandDisabled(bool $isDisabled): void
     {
         $path = 'section1/group1/field1';
         $this->deploymentConfigMock->expects($this->once())