🔃 [Magento Community Engineering] Community Contributions - 2.3-develop latest changes

Accepted Community Pull Requests:
 - #24226: Remove redundant file (by @dshevtsov)
 - #24205: Resolve Some Fields in "Currency Setup" must have validate number issue24204 (by @edenduong)
 - #24195: fix lost the table prefix in setup (by @duhon)
 - #24174: "Admin Session Lifetime" should use JS validate (to optimize UI/UX) (by @edenduong)
 - #24163: Resolve Comment "Warning!" in "Allow Symlinks" should have red color like other notices (issue 24162) (by @edenduong)
 - #24176: Update AdvancedSearch ReadMe (by @diazwatson)
 - #24182: Resolve undefine variable in _createUserRole function (by @edenduong)
 - #24016: No alert when user "Apply empty Coupon Code" in create new order form (issue 24015) (by @edenduong)
 - #20577: #19230: [Forwardport] Can't Cancel Order (by @p-bystritsky)
 - #23621: Media gallery loaded twice (by @sidolov)


Fixed GitHub Issues:
 - #24204: Some Fields in "Currency Setup" must have validate number (reported by @edenduong) has been fixed in #24205 by @edenduong in 2.3-develop branch
   Related commits:
     1. b9646ce

 - #24162: Comment "Warning!" in "Allow Symlinks" should have red color like other notices (reported by @edenduong) has been fixed in #24163 by @edenduong in 2.3-develop branch
   Related commits:
     1. 95b877c
     2. e8e8882
     3. 3d1b0c1

 - #24015: No alert when user "Apply empty Coupon Code" in create new order form (reported by @edenduong) has been fixed in #24016 by @edenduong in 2.3-develop branch
   Related commits:
     1. 866a154
     2. 7c40321

 - #19230: Can't Cancel Order (reported by @friendscottn) has been fixed in #20577 by @p-bystritsky in 2.3-develop branch
   Related commits:
     1. 5a24c41
     2. 44760ff
     3. ae76c57
     4. d8add8a
     5. 2fd017a
     6. 565d0b1

Author: magento-engcom-team

app/code/Magento/AdvancedSearch/README.md

@@ -1 +1,38 @@
-AdvancedSearch module introduces advanced search functionality and provides interfaces that allow to implement this functionality by 3rd party search engines
+# Magento_AdvancedSearch module
+The Magento_AdvancedSearch module introduces advanced search functionality and provides interfaces that allow third-party search engines to implement this functionality.
+
+## Installation details
+
+Before disabling or uninstalling this module, note that the following modules depends on this module:
+- Magento_Elasticsearch
+- Magento_Elasticsearch6
+
+For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
+
+## Extensibility
+
+Extension developers can interact with the Magento_AdvancedSearch module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AdvancedSearch module.
+
+### Events
+
+This module observes the following event:
+
+ - `catalogsearch_query_save_after` in the `Magento\AdvancedSearch\Model\Recommendations\SaveSearchQueryRelationsObserver` file. 
+
+For information about an event in Magento 2, see [Events and observers](http://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).
+
+### Layouts
+
+The module interacts with the following layout handles in the `view/adminhtml/layout` directory:
+
+- `catalog_search_block`
+- `catalog_search_edit`
+- `catalog_search_relatedgrid`
+
+The module interacts with the following layout handles in the `view/frontend/layout` directory:
+
+- `catalogsearch_result_index`
+
+For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -145,7 +145,9 @@
                 <field id="allow_symlink" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Allow Symlinks</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.</comment>
+                    <comment>
+                        <![CDATA[<strong style="color:red">Warning!</strong> Enabling this feature is not recommended on production environments because it represents a potential security risk.]]>
+                    </comment>
                 </field>
                 <field id="minify_html" translate="label comment" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Minify Html</label>
@@ -435,7 +437,7 @@
                     <label>Admin Session Lifetime (seconds)</label>
                     <comment>Please enter at least 60 and at most 31536000 (one year).</comment>
                     <backend_model>Magento\Backend\Model\Config\SessionLifetime\BackendModel</backend_model>
-                    <validate>validate-digits</validate>
+                    <validate>validate-digits validate-digits-range digits-range-60-31536000</validate>
                 </field>
             </group>
             <group id="dashboard" translate="label" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">

app/code/Magento/Backend/i18n/en_US.csv

@@ -333,7 +333,7 @@ Debug,Debug
 "Add Block Names to Hints","Add Block Names to Hints"
 "Template Settings","Template Settings"
 "Allow Symlinks","Allow Symlinks"
-"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk."
+"<strong style=""color:red"">Warning!</strong> Enabling this feature is not recommended on production environments because it represents a potential security risk.","<strong style=""color:red"">Warning!</strong> Enabling this feature is not recommended on production environments because it represents a potential security risk."
 "Minify Html","Minify Html"
 "Minification is not applied in developer mode.","Minification is not applied in developer mode."
 "Translate Inline","Translate Inline"

app/code/Magento/Directory/etc/adminhtml/system.xml

@@ -43,6 +43,7 @@
                 </field>
                 <field id="timeout" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Connection Timeout in Seconds</label>
+                    <validate>validate-zero-or-greater validate-number</validate>
                 </field>
             </group>
             <group id="currencyconverterapi" translate="label" sortOrder="45" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -54,6 +55,7 @@
                 </field>
                 <field id="timeout" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Connection Timeout in Seconds</label>
+                    <validate>validate-zero-or-greater validate-number</validate>
                 </field>
             </group>
             <group id="import" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="0" showInStore="0">

app/code/Magento/Sales/Model/Order/CustomerAssignment.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
+/**
+ * Assign customer to order.
+ */
+class CustomerAssignment
+{
+    /**
+     * @var ManagerInterface
+     */
+    private $eventManager;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * CustomerAssignment constructor.
+     *
+     * @param ManagerInterface $eventManager
+     * @param OrderRepositoryInterface $orderRepository
+     */
+    public function __construct(
+        ManagerInterface $eventManager,
+        OrderRepositoryInterface $orderRepository
+    ) {
+        $this->eventManager = $eventManager;
+        $this->orderRepository = $orderRepository;
+    }
+
+    /**
+     * Assign customer to order.
+     *
+     * @param OrderInterface $order
+     * @param CustomerInterface $customer
+     */
+    public function execute(OrderInterface $order, CustomerInterface $customer): void
+    {
+        $order->setCustomerId($customer->getId())
+            ->setCustomerIsGuest(false)
+            ->setCustomerEmail($customer->getEmail())
+            ->setCustomerFirstname($customer->getFirstname())
+            ->setCustomerLastname($customer->getLastname())
+            ->setCustomerMiddlename($customer->getMiddlename())
+            ->setCustomerPrefix($customer->getPrefix())
+            ->setCustomerSuffix($customer->getSuffix())
+            ->setCustomerGroupId($customer->getGroupId());
+
+        $this->orderRepository->save($order);
+
+        $this->eventManager->dispatch(
+            'sales_order_customer_assign_after',
+            [
+                'order'     => $order,
+                'customer'  => $customer
+            ]
+        );
+    }
+}

app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\CustomerAssignment;
 
 /**
  * Assign order to customer created after issuing guest order.
@@ -23,11 +24,22 @@ class AssignOrderToCustomerObserver implements ObserverInterface
     private $orderRepository;
 
     /**
+     * @var CustomerAssignment
+     */
+    private $assignmentService;
+
+    /**
+     * AssignOrderToCustomerObserver constructor.
+     *
      * @param OrderRepositoryInterface $orderRepository
+     * @param CustomerAssignment $assignmentService
      */
-    public function __construct(OrderRepositoryInterface $orderRepository)
-    {
+    public function __construct(
+        OrderRepositoryInterface $orderRepository,
+        CustomerAssignment $assignmentService
+    ) {
         $this->orderRepository = $orderRepository;
+        $this->assignmentService = $assignmentService;
     }
 
     /**
@@ -43,18 +55,8 @@ public function execute(Observer $observer)
         if (array_key_exists('__sales_assign_order_id', $delegateData)) {
             $orderId = $delegateData['__sales_assign_order_id'];
             $order = $this->orderRepository->get($orderId);
-            if (!$order->getCustomerId()) {
-                //assign customer info to order after customer creation.
-                $order->setCustomerId($customer->getId())
-                    ->setCustomerIsGuest(0)
-                    ->setCustomerEmail($customer->getEmail())
-                    ->setCustomerFirstname($customer->getFirstname())
-                    ->setCustomerLastname($customer->getLastname())
-                    ->setCustomerMiddlename($customer->getMiddlename())
-                    ->setCustomerPrefix($customer->getPrefix())
-                    ->setCustomerSuffix($customer->getSuffix())
-                    ->setCustomerGroupId($customer->getGroupId());
-                $this->orderRepository->save($order);
+            if (!$order->getCustomerId() && $customer->getId()) {
+                $this->assignmentService->execute($order, $customer);
             }
         }
     }

app/code/Magento/Sales/Test/Unit/Model/Order/CustomerAssigmentTest.php

@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model\Order;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\CustomerAssignment;
+
+/**
+ * Test for Magento\Sales\Model\Order\CustomerAssignment class.
+ */
+class CustomerAssigmentTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CustomerAssignment
+     */
+    private $customerAssignment;
+
+    /**
+     * @var OrderInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $orderMock;
+
+    /**
+     * @var CustomerInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $customerMock;
+
+    /**
+     * @var OrderRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $orderRepositoryMock;
+
+    /**
+     * @var ManagerInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $eventManagerMock;
+
+    /**
+     * Tests 'execute' method.
+     *
+     * @dataProvider executeDataProvider
+     * @param array $data
+     */
+    public function testExecute(array $data): void
+    {
+        $this->configureOrderMock($data);
+        $this->configureCustomerMock($data);
+        $this->orderRepositoryMock->expects($this->once())->method('save')->with($this->orderMock);
+        $this->eventManagerMock->expects($this->once())->method('dispatch')->with(
+            'sales_order_customer_assign_after',
+            [
+                'order' => $this->orderMock,
+                'customer' => $this->customerMock
+            ]
+        );
+
+        $this->customerAssignment->execute($this->orderMock, $this->customerMock);
+    }
+
+    /**
+     *
+     * Data provider for testExecute.
+     * @return array
+     */
+    public function executeDataProvider(): array
+    {
+        return [
+            [
+                [
+                    'customerId' => 1,
+                    'customerIsGuest' => false,
+                    'customerEmail' => 'customerEmail',
+                    'customerFirstname' => 'customerFirstname',
+                    'customerLastname' => 'customerLastname',
+                    'customerMiddlename' => 'customerMiddlename',
+                    'customerPrefix' => 'customerPrefix',
+                    'customerSuffix' => 'customerSuffix',
+                    'customerGroupId' => 'customerGroupId',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->orderMock = $this->createMock(OrderInterface::class);
+        $this->customerMock = $this->createMock(CustomerInterface::class);
+        $this->orderRepositoryMock = $this->createMock(OrderRepositoryInterface::class);
+        $this->eventManagerMock = $this->createMock(ManagerInterface::class);
+        $this->customerAssignment = $objectManager->getObject(
+            CustomerAssignment::class,
+            [
+                'eventManager' => $this->eventManagerMock,
+                'orderRepository' => $this->orderRepositoryMock
+            ]
+        );
+    }
+
+    /**
+     *  Set up order mock.
+     *
+     * @param array $data
+     */
+    private function configureOrderMock(array $data): void
+    {
+        $this->orderMock->expects($this->once())->method('setCustomerId')->with($data['customerId'])
+            ->willReturn($this->orderMock);
+        $this->orderMock->expects($this->once())->method('setCustomerIsGuest')->with($data['customerIsGuest'])
+            ->willReturn($this->orderMock);
+        $this->orderMock->expects($this->once())->method('setCustomerEmail')->with($data['customerEmail'])
+            ->willReturn($this->orderMock);
+        $this->orderMock->expects($this->once())->method('setCustomerFirstname')->with($data['customerFirstname'])
+            ->willReturn($this->orderMock);
+        $this->orderMock->expects($this->once())->method('setCustomerLastname')->with($data['customerLastname'])
+            ->willReturn($this->orderMock);
+        $this->orderMock->expects($this->once())->method('setCustomerMiddlename')->with($data['customerMiddlename'])
+            ->willReturn($this->orderMock);
+        $this->orderMock->expects($this->once())->method('setCustomerPrefix')->with($data['customerPrefix'])
+            ->willReturn($this->orderMock);
+        $this->orderMock->expects($this->once())->method('setCustomerSuffix')->with($data['customerSuffix'])
+            ->willReturn($this->orderMock);
+        $this->orderMock->expects($this->once())->method('setCustomerGroupId')->with($data['customerGroupId'])
+            ->willReturn($this->orderMock);
+    }
+
+    /**
+     * Set up customer mock.
+     *
+     * @param array $data
+     */
+    private function configureCustomerMock(array $data): void
+    {
+        $this->customerMock->expects($this->once())->method('getId')->willReturn($data['customerId']);
+        $this->customerMock->expects($this->once())->method('getEmail')->willReturn($data['customerEmail']);
+        $this->customerMock->expects($this->once())->method('getFirstname')->willReturn($data['customerFirstname']);
+        $this->customerMock->expects($this->once())->method('getLastname')->willReturn($data['customerLastname']);
+        $this->customerMock->expects($this->once())->method('getMiddlename')->willReturn($data['customerMiddlename']);
+        $this->customerMock->expects($this->once())->method('getPrefix')->willReturn($data['customerPrefix']);
+        $this->customerMock->expects($this->once())->method('getSuffix')->willReturn($data['customerSuffix']);
+        $this->customerMock->expects($this->once())->method('getGroupId')->willReturn($data['customerGroupId']);
+    }
+}