ACPT-826

Author: aa-kashk

app/code/Magento/AsyncConfig/Plugin/Controller/System/Config/SaveAsyncConfigPlugin.php

@@ -11,7 +11,6 @@
 use Magento\AsyncConfig\Setup\ConfigOptionsList;
 use Magento\Config\Controller\Adminhtml\System\Config\Save;
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\Result\RedirectFactory;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
@@ -42,21 +41,19 @@ class SaveAsyncConfigPlugin
 
     /**
      *
-     * @param DeploymentConfig|null $deploymentConfig
-     * @param AsyncConfigPublisherInterface|null $asyncConfigPublisher
+     * @param DeploymentConfig $deploymentConfig
+     * @param AsyncConfigPublisherInterface $asyncConfigPublisher
      * @param RedirectFactory $resultRedirectFactory
      * @param ManagerInterface $messageManager
      */
     public function __construct(
-        DeploymentConfig $deploymentConfig = null,
-        AsyncConfigPublisherInterface $asyncConfigPublisher = null,
+        DeploymentConfig $deploymentConfig,
+        AsyncConfigPublisherInterface $asyncConfigPublisher,
         RedirectFactory $resultRedirectFactory,
         ManagerInterface $messageManager
     ) {
-        $this->deploymentConfig = $deploymentConfig
-            ?? ObjectManager::getInstance()->get(DeploymentConfig::class);
-        $this->asyncConfigPublisher = $asyncConfigPublisher
-            ?? ObjectManager::getInstance()->get(AsyncConfigPublisherInterface::class);
+        $this->deploymentConfig = $deploymentConfig;
+        $this->asyncConfigPublisher = $asyncConfigPublisher;
         $this->resultRedirectFactory = $resultRedirectFactory;
         $this->messageManager = $messageManager;
     }

app/code/Magento/AsyncConfig/Setup/ConfigOptionsList.php

@@ -8,7 +8,8 @@
 namespace Magento\AsyncConfig\Setup;
 
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Config\Data\ConfigDataFactory;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Setup\ConfigOptionsListInterface;
 use Magento\Framework\Setup\Option\SelectConfigOption;
@@ -40,6 +41,20 @@ class ConfigOptionsList implements ConfigOptionsListInterface
      */
     private $selectOptions = [0, 1];
 
+    /**
+     * @var ConfigDataFactory
+     */
+    private $configDataFactory;
+
+    /**
+     * @param ConfigDataFactory $configDataFactory
+     */
+    public function __construct(
+        ConfigDataFactory $configDataFactory
+    ) {
+        $this->configDataFactory = $configDataFactory;
+    }
+
     /**
      * @inheritdoc
      */
@@ -62,7 +77,7 @@ public function getOptions()
      */
     public function createConfig(array $data, DeploymentConfig $deploymentConfig)
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
 
         if (!$this->isDataEmpty($data, self::INPUT_KEY_ASYNC_CONFIG_SAVE)) {
             $configData->set(