ACP2E-3324: allow cli config set with and w/o lock for design theme configs and bypass saving design config that is locked

Author: alzota

app/code/Magento/Theme/Plugin/DesignPathValidatorPlugin.php renamed to app/code/Magento/Theme/Model/Config/PathValidator.php

@@ -5,15 +5,13 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Theme\Plugin;
+namespace Magento\Theme\Model\Config;
 
-use Magento\Config\Model\Config\PathValidator;
 use Magento\Config\Model\Config\Structure;
-use Magento\Config\Model\Config\Structure\Element\Field;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Theme\Model\DesignConfigRepository;
 
-class DesignPathValidatorPlugin
+class PathValidator extends \Magento\Config\Model\Config\PathValidator
 {
     /**
      * @param Structure $structure
@@ -23,35 +21,19 @@ public function __construct(
         private readonly Structure $structure,
         private readonly DesignConfigRepository $designConfigRepository
     ) {
+        parent::__construct($structure);
     }
 
     /**
-     * Allow setting design configuration from cli
-     *
-     * @param PathValidator $subject
-     * @param callable $proceed
-     * @param string $path
-     * @return true
-     * @throws ValidatorException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @inheritdoc
      */
-    public function aroundValidate(PathValidator $subject, callable $proceed, $path): bool
+    public function validate($path)
     {
         if (stripos($path, 'design/') !== 0) {
-            return $proceed($path);
-        }
-
-        $element = $this->structure->getElementByConfigPath($path);
-        if ($element instanceof Field && $element->getConfigPath()) {
-            $path = $element->getConfigPath();
+            return parent::validate($path);
         }
 
-        $allPaths = array_merge($this->structure->getFieldPaths(), $this->getDesignFieldPaths());
-
-        if (!array_key_exists($path, $allPaths)) {
-            throw new ValidatorException(__('The "%1" path doesn\'t exist. Verify and try again.', $path));
-        }
-        return true;
+        return $this->validateDesignPath($path);
     }
 
     /**
@@ -69,4 +51,26 @@ private function getDesignFieldPaths(): array
         }
         return $data;
     }
+
+    /**
+     * Validate design path configurations
+     *
+     * @param string $path
+     * @return bool
+     * @throws ValidatorException
+     */
+    private function validateDesignPath(string $path): bool
+    {
+        $element = $this->structure->getElementByConfigPath($path);
+        if ($element instanceof Structure\Element\Field && $element->getConfigPath()) {
+            $path = $element->getConfigPath();
+        }
+
+        $allPaths = array_merge($this->structure->getFieldPaths(), $this->getDesignFieldPaths());
+
+        if (!array_key_exists($path, $allPaths)) {
+            throw new ValidatorException(__('The "%1" path doesn\'t exist. Verify and try again.', $path));
+        }
+        return true;
+    }
 }

app/code/Magento/Theme/Test/Unit/Plugin/DesignPathValidatorPluginTest.php

@@ -41,7 +41,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Config\Model\Config\PathValidator">
-        <plugin name="validate_design_paths_plugin" type="Magento\Theme\Plugin\DesignPathValidatorPlugin"/>
-    </type>
 </config>

app/code/Magento/Theme/etc/adminhtml/di.xml

@@ -334,5 +334,9 @@
     <type name="Magento\Config\Console\Command\LocaleEmulator">
         <plugin name="themeForLocaleEmulator" type="Magento\Theme\Plugin\LocaleEmulator"/>
     </type>
-
+    <type name="Magento\Config\Console\Command\ConfigSet\ProcessorFacade">
+        <arguments>
+            <argument name="pathValidator" xsi:type="object">Magento\Theme\Model\Config\PathValidator</argument>
+        </arguments>
+    </type>
 </config>