Merge branch '2.4-develop' into patch-2

Author: engcom-Lima

app/code/Magento/AsyncConfig/Api/AsyncConfigPublisherInterface.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AsyncConfig\Api;
+
+use Magento\Framework\Exception\FileSystemException;
+
+interface AsyncConfigPublisherInterface
+{
+    /**
+     * Save Configuration Data
+     *
+     * @param array $configData
+     * @return void
+     * @throws FileSystemException
+     */
+    public function saveConfigData(array $configData);
+}

app/code/Magento/AsyncConfig/Api/Data/AsyncConfigMessageInterface.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AsyncConfig\Api\Data;
+
+interface AsyncConfigMessageInterface
+{
+    /**
+     * Get Configuration data
+     *
+     * @return string
+     */
+    public function getConfigData();
+
+    /**
+     * Set Configuration data
+     *
+     * @param string $data
+     * @return void
+     */
+    public function setConfigData(string $data);
+}

app/code/Magento/Elasticsearch8/LICENSE.txt renamed to app/code/Magento/AsyncConfig/LICENSE.txt

@@ -15,7 +15,7 @@ Licensed under the Open Software License version 3.0
 
          4. to perform the Original Work publicly; and
 
-         5. to display the Original Work publicly. 
+         5. to display the Original Work publicly.
 
    2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
 
@@ -45,4 +45,4 @@ Licensed under the Open Software License version 3.0
 
   15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
 
-  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.

app/code/Magento/Elasticsearch8/LICENSE_AFL.txt renamed to app/code/Magento/AsyncConfig/LICENSE_AFL.txt

@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AsyncConfig\Model;
+
+use Magento\AsyncConfig\Api\Data\AsyncConfigMessageInterfaceFactory;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Filesystem\Io\File;
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+
+class AsyncConfigPublisher implements \Magento\AsyncConfig\Api\AsyncConfigPublisherInterface
+{
+    /**
+     * @var PublisherInterface
+     */
+    private $messagePublisher;
+
+    /**
+     * @var AsyncConfigMessageInterfaceFactory
+     */
+    private $asyncConfigFactory;
+
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * @var \Magento\Framework\Filesystem\DirectoryList
+     */
+    private $dir;
+
+    /**
+     * @var File
+     */
+    private $file;
+
+    /**
+     *
+     * @param AsyncConfigMessageInterfaceFactory $asyncConfigFactory
+     * @param PublisherInterface $publisher
+     * @param Json $json
+     * @param \Magento\Framework\Filesystem\DirectoryList $dir
+     * @param File $file
+     */
+    public function __construct(
+        AsyncConfigMessageInterfaceFactory $asyncConfigFactory,
+        PublisherInterface $publisher,
+        Json $json,
+        \Magento\Framework\Filesystem\DirectoryList $dir,
+        File $file
+    ) {
+        $this->asyncConfigFactory = $asyncConfigFactory;
+        $this->messagePublisher = $publisher;
+        $this->serializer = $json;
+        $this->dir = $dir;
+        $this->file = $file;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function saveConfigData(array $configData)
+    {
+        $asyncConfig = $this->asyncConfigFactory->create();
+        $this->saveImages($configData);
+        $asyncConfig->setConfigData($this->serializer->serialize($configData));
+        $this->messagePublisher->publish('async_config.saveConfig', $asyncConfig);
+    }
+
+    /**
+     * Save Images to temporary Path
+     *
+     * @param array $configData
+     * @return void
+     * @throws FileSystemException
+     */
+    private function saveImages(array &$configData)
+    {
+        if (isset($configData['groups']['placeholder'])) {
+            $this->changeImagePath($configData['groups']['placeholder']['fields']);
+        } elseif (isset($configData['groups']['identity'])) {
+            $this->changeImagePath($configData['groups']['identity']['fields']);
+        }
+    }
+
+    /**
+     * Change Placeholder Data path if exists
+     *
+     * @param array $fields
+     * @return void
+     * @throws FileSystemException
+     */
+    private function changeImagePath(array &$fields)
+    {
+        foreach ($fields as &$data) {
+            if (!empty($data['value']['tmp_name'])) {
+                $newPath =
+                    $this->dir->getPath(DirectoryList::MEDIA) . '/' .
+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                    pathinfo($data['value']['tmp_name'])['filename'];
+                $this->file->mv(
+                    $data['value']['tmp_name'],
+                    $newPath
+                );
+                $data['value']['tmp_name'] = $newPath;
+            }
+        }
+    }
+}

app/code/Magento/AsyncConfig/Model/AsyncConfigPublisher.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AsyncConfig\Model;
+
+use Magento\AsyncConfig\Api\Data\AsyncConfigMessageInterface;
+use Magento\Config\Controller\Adminhtml\System\Config\Save;
+use Magento\Config\Model\Config\Factory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Config\ScopeInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Serialize\Serializer\Json;
+use Symfony\Component\Console\Output\ConsoleOutput;
+
+class Consumer
+{
+    /**
+     * Backend Config Model Factory
+     *
+     * @var Factory
+     */
+    private $configFactory;
+
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * @var ScopeInterface
+     */
+    private $scope;
+
+    /**
+     * @var Save
+     */
+    private $save;
+
+    /**
+     * @var ConsoleOutput
+     */
+    private $output;
+
+    /**
+     * @param Factory $configFactory
+     * @param Json $json
+     * @param ScopeInterface $scope
+     * @param ConsoleOutput $output
+     */
+    public function __construct(
+        Factory $configFactory,
+        Json $json,
+        ScopeInterface $scope,
+        ConsoleOutput $output
+    ) {
+        $this->configFactory = $configFactory;
+        $this->serializer = $json;
+        $this->scope = $scope;
+        $this->output = $output;
+        $this->scope->setCurrentScope('adminhtml');
+        $this->save = ObjectManager::getInstance()->get(Save::class);
+        $this->scope->setCurrentScope('global');
+    }
+    /**
+     * Process Consumer
+     *
+     * @param AsyncConfigMessageInterface $asyncConfigMessage
+     * @return void
+     * @throws \Exception
+     */
+    public function process(AsyncConfigMessageInterface $asyncConfigMessage): void
+    {
+        $configData = $asyncConfigMessage->getConfigData();
+        $data = $this->serializer->unserialize($configData);
+        $data = $this->save->filterNodes($data);
+        /** @var \Magento\Config\Model\Config $configModel */
+        $configModel = $this->configFactory->create(['data' => $data]);
+        try {
+            $configModel->save();
+        } catch (LocalizedException $exception) {
+            $message = $exception->getMessage();
+            $this->output->writeln(' Config couldn\'t be saved: ' . $message);
+        }
+    }
+}

app/code/Magento/AsyncConfig/Model/Consumer.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AsyncConfig\Model\Entity;
+
+use Magento\AsyncConfig\Api\Data\AsyncConfigMessageInterface;
+
+class AsyncConfigMessage implements AsyncConfigMessageInterface
+{
+    /**
+     * @var string
+     */
+    private $data;
+
+    /**
+     * @inheritDoc
+     */
+    public function getConfigData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setConfigData($data)
+    {
+        $this->data = $data;
+    }
+}

app/code/Magento/AsyncConfig/Model/Entity/AsyncConfigMessage.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AsyncConfig\Plugin\Controller\System\Config;
+
+use Magento\AsyncConfig\Api\AsyncConfigPublisherInterface;
+use Magento\AsyncConfig\Setup\ConfigOptionsList;
+use Magento\Config\Controller\Adminhtml\System\Config\Save;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Message\ManagerInterface;
+
+class SaveAsyncConfigPlugin
+{
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var AsyncConfigPublisherInterface
+     */
+    private $asyncConfigPublisher;
+
+    /**
+     * @var RedirectFactory
+     */
+    private $resultRedirectFactory;
+
+    /**
+     * @var ManagerInterface
+     */
+    private $messageManager;
+
+    /**
+     *
+     * @param DeploymentConfig $deploymentConfig
+     * @param AsyncConfigPublisherInterface $asyncConfigPublisher
+     * @param RedirectFactory $resultRedirectFactory
+     * @param ManagerInterface $messageManager
+     */
+    public function __construct(
+        DeploymentConfig $deploymentConfig,
+        AsyncConfigPublisherInterface $asyncConfigPublisher,
+        RedirectFactory $resultRedirectFactory,
+        ManagerInterface $messageManager
+    ) {
+        $this->deploymentConfig = $deploymentConfig;
+        $this->asyncConfigPublisher = $asyncConfigPublisher;
+        $this->resultRedirectFactory = $resultRedirectFactory;
+        $this->messageManager = $messageManager;
+    }
+
+    /**
+     * Around Config save controller
+     *
+     * @param Save $subject
+     * @param callable $proceed
+     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws FileSystemException
+     * @throws LocalizedException
+     * @throws RuntimeException
+     */
+    public function aroundExecute(Save $subject, callable $proceed)
+    {
+        if (!$this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_ASYNC_CONFIG_SAVE)) {
+            return $proceed();
+        } else {
+            $configData = $subject->getConfigData();
+            $this->asyncConfigPublisher->saveConfigData($configData);
+            $this->messageManager->addSuccessMessage(__('Configuration changes will be applied by consumer soon.'));
+            $subject->_saveState($subject->getRequest()->getPost('config_state'));
+            /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+            $resultRedirect = $this->resultRedirectFactory->create();
+            return $resultRedirect->setPath(
+                'adminhtml/system_config/edit',
+                [
+                    '_current' => ['section', 'website', 'store'],
+                    '_nosid' => true
+                ]
+            );
+        }
+    }
+}