Merge branch '2.4-develop' into fix-tracking-typo-currier

Author: Den4ik

.github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Contributions to the Magento 2 codebase are done using the fork & pull model.
 This contribution model has contributors maintaining their own fork of the Magento 2 repository.
-The forked repository is then used to submit a request to the base repository to “pull” a set of changes.
+The forked repository is then used to submit a request to the base repository to "pull" a set of changes.
 For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
 
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes or optimizations.
@@ -15,15 +15,15 @@ For more detailed information on contribution please read our [beginners guide](
 
 ## Contribution requirements
 
-1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.4/coding-standards/bk-coding-standards.html).
+1. Contributions must adhere to the [Magento coding standards](https://developer.adobe.com/commerce/php/coding-standards/).
 2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
 3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/HEAD/.github/PULL_REQUEST_TEMPLATE.md) for more information.
 4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
-3. PRs which include new logic or new features must be submitted along with:
-* Unit/integration test coverage
-* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
-4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
-5. All automated tests must pass.
+5. PRs which include new logic or new features must be submitted along with:
+   * Unit/integration test coverage
+   * Proposed [documentation](https://developer.adobe.com/commerce) updates. Use feedback buttons __Edit in GitHub__ and __Log an issue__ at the top of a relevant topic.
+6. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
+7. All automated tests must pass.
 
 ## Contribution process
 

README.md

@@ -26,7 +26,7 @@ However, for those who need a full-featured eCommerce solution, we recommend [Ad
 
 ## Contribute
 
-Our [Community](https://opensource.magento.com/) is large and diverse, and our project is enormous. As a contributor, you have countless opportunities to impact product development and delivery by introducing new features or improving existing ones, enhancing test coverage, updating documentation for [developers](https://devdocs.magento.com/) and [end-users](https://docs.magento.com/user-guide/), catching and fixing code bugs, suggesting points for optimization, and sharing your great ideas.
+Our [Community](https://opensource.magento.com/) is large and diverse, and our project is enormous. As a contributor, you have countless opportunities to impact product development and delivery by introducing new features or improving existing ones, enhancing test coverage, updating documentation for [developers](https://developer.adobe.com/commerce/docs/) and [end-users](https://experienceleague.adobe.com/docs/commerce-admin/user-guides/home.html), catching and fixing code bugs, suggesting points for optimization, and sharing your great ideas.
 
 - [Contribute to the code](https://developer.adobe.com/commerce/contributor/guides/code-contributions/)
 - [Report an issue](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report)
@@ -36,7 +36,7 @@ Our [Community](https://opensource.magento.com/) is large and diverse, and our p
 
 ### Maintainers
 
-We encourage experts from the Community to help us with GitHub routines such as accepting, merging, or rejecting pull requests and reviewing issues. Adobe has granted the Community Maintainers permission to accept, merge, and reject pull requests, as well as review issues. Thanks to invaluable input from the Community Maintainers team, we can significantly improve contribution quality and accelerate the time to deliver your updates to production. 
+We encourage experts from the Community to help us with GitHub routines such as accepting, merging, or rejecting pull requests and reviewing issues. Adobe has granted the Community Maintainers permission to accept, merge, and reject pull requests, as well as review issues. Thanks to invaluable input from the Community Maintainers team, we can significantly improve contribution quality and accelerate the time to deliver your updates to production.
 
 - [Learn more about the Maintainer role](https://developer.adobe.com/commerce/contributor/guides/maintainers/)
 - [Maintainer's Handbook](https://developer.adobe.com/commerce/contributor/guides/maintainers/handbook/)
@@ -64,9 +64,9 @@ Stay up-to-date on the latest security news and patches by signing up for [Secur
 ## Licensing
 
 Each Magento source file included in this distribution is licensed under OSL 3.0 or the terms and conditions of the applicable ordering document between Licensee/Customer and Adobe (or Magento).
- 
+
 [Open Software License (OSL 3.0)](https://opensource.org/licenses/osl-3.0.php) – Please see [LICENSE.txt](LICENSE.txt) for the full text of the OSL 3.0 license.
- 
+
 Subject to Licensee's/Customer's payment of fees and compliance with the terms and conditions of the applicable ordering document between Licensee/Customer and Adobe (or Magento), the terms and conditions of the applicable ordering between Licensee/Customer and Adobe (or Magento) supersede the OSL 3.0 license for each source file.
 
 ## Communications

app/bootstrap.php

@@ -17,12 +17,12 @@
 if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 80100) {
     if (PHP_SAPI == 'cli') {
         echo 'Magento supports PHP 8.1.0 or later. ' .
-            'Please read https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html';
+            'Please read https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/system-requirements.html';
     } else {
         echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
     <p>Magento supports PHP 8.1.0 or later. Please read
-    <a target="_blank" href="https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html">
+    <a target="_blank" href="https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/system-requirements.html">
     Magento System Requirements</a>.
 </div>
 HTML;

app/code/Magento/AdminAnalytics/README.md

@@ -1 +1 @@
-The Magento\AdminAnalytics module gathers information about the features Magento administrators use. This information will be used to help improve the user experience on the Magento Admin.
+The Magento\AdminAnalytics module gathers information about the features Magento administrators use. This information will be used to help improve the user experience on the Magento Admin.

app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml

@@ -19,6 +19,7 @@
             <group value="menu"/>
             <group value="mtf_migrated"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml

@@ -17,6 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-36011"/>
             <group value="menu"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/AdvancedSearch/Model/DataProvider/AutocompleteSuggestions.php

@@ -0,0 +1,104 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ***********************************************************************
+ */
+declare(strict_types=1);
+
+namespace Magento\AdvancedSearch\Model\DataProvider;
+
+use Magento\Search\Model\Autocomplete\DataProviderInterface;
+use Magento\Search\Model\Autocomplete\ItemFactory;
+use Magento\Search\Model\QueryFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfig;
+use Magento\AdvancedSearch\Model\SuggestedQueries;
+use Magento\CatalogSearch\Model\Autocomplete\DataProvider;
+use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
+use Magento\Store\Model\ScopeInterface;
+
+class AutocompleteSuggestions implements DataProviderInterface
+{
+    /**
+     * @var QueryFactory
+     */
+    private $queryFactory;
+
+    /**
+     * @var ItemFactory
+     */
+    private $itemFactory;
+
+    /**
+     * @var SuggestedQueries
+     */
+    private $suggestedQueries;
+
+    /**
+     * @var DataProvider
+     */
+    private $dataProvider;
+
+    /**
+     * @var ScopeConfig
+     */
+    private $scopeConfig;
+
+    /**
+     * @param QueryFactory $queryFactory
+     * @param ItemFactory $itemFactory
+     * @param ScopeConfig $scopeConfig
+     * @param SuggestedQueries $suggestedQueries
+     * @param DataProvider $dataProvider
+     */
+    public function __construct(
+        QueryFactory $queryFactory,
+        ItemFactory $itemFactory,
+        ScopeConfig $scopeConfig,
+        SuggestedQueries $suggestedQueries,
+        DataProvider $dataProvider
+    ) {
+        $this->queryFactory = $queryFactory;
+        $this->itemFactory = $itemFactory;
+        $this->suggestedQueries = $suggestedQueries;
+        $this->dataProvider = $dataProvider;
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getItems()
+    {
+        $result = [];
+        if ($this->scopeConfig->isSetFlag(
+            SuggestedQueriesInterface::SEARCH_SUGGESTION_ENABLED,
+            ScopeInterface::SCOPE_STORE
+        )) {
+            // populate with search suggestions
+            $query = $this->queryFactory->get();
+            $suggestions = $this->suggestedQueries->getItems($query);
+            foreach ($suggestions as $suggestion) {
+                $resultItem = $this->itemFactory->create([
+                    'title' => $suggestion->getQueryText(),
+                    'num_results' => $suggestion->getResultsCount(),
+                ]);
+                $result[] = $resultItem;
+            }
+        } else {
+            // populate with autocomplete
+            $result = $this->dataProvider->getItems();
+        }
+        return $result;
+    }
+}

app/code/Magento/AdvancedSearch/Test/Mftf/Test/AdminAddSearchTermTest.xml

@@ -17,6 +17,7 @@
             <severity value="CRITICAL"/>
             <group value="AdvancedSearch"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/AdvancedSearch/Test/Unit/Model/DataProvider/AutocompleteSuggestionsTest.php

@@ -0,0 +1,130 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ***********************************************************************
+ */
+declare(strict_types=1);
+
+namespace Magento\AdvancedSearch\Test\Unit\Model\DataProvider;
+
+use Magento\AdvancedSearch\Model\DataProvider\AutocompleteSuggestions;
+use Magento\Search\Model\Autocomplete\ItemFactory;
+use Magento\Search\Model\QueryFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfig;
+use Magento\AdvancedSearch\Model\SuggestedQueries;
+use Magento\CatalogSearch\Model\Autocomplete\DataProvider;
+use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Search\Model\Query;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class AutocompleteSuggestionsTest extends TestCase
+{
+    /**
+     * @var AutocompleteSuggestions
+     */
+    private $model;
+
+    /**
+     * @var QueryFactory|MockObject
+     */
+    private $queryFactory;
+
+    /**
+     * @var ItemFactory|MockObject
+     */
+    private $itemFactory;
+
+    /**
+     * @var SuggestedQueries|MockObject
+     */
+    private $suggestedQueries;
+
+    /**
+     * @var DataProvider|MockObject
+     */
+    private $dataProvider;
+
+    /**
+     * @var ScopeConfig|MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @var Query|MockObject
+     */
+    private $query;
+
+    protected function setUp(): void
+    {
+        $this->queryFactory = $this->getMockBuilder(QueryFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->itemFactory = $this->getMockBuilder(ItemFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->suggestedQueries = $this->getMockBuilder(SuggestedQueries::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dataProvider = $this->getMockBuilder(DataProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfig::class)
+            ->getMockForAbstractClass();
+        $this->query = $this->getMockBuilder(Query::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->queryFactory->expects($this->any())
+            ->method('get')
+            ->willReturn($this->query);
+
+        $this->model = new AutocompleteSuggestions(
+            $this->queryFactory,
+            $this->itemFactory,
+            $this->scopeConfig,
+            $this->suggestedQueries,
+            $this->dataProvider
+        );
+    }
+
+    public function testGetItemsWithEnabledSuggestions(): void
+    {
+        $this->scopeConfig->expects($this->once())
+            ->method('isSetFlag')
+            ->with(SuggestedQueriesInterface::SEARCH_SUGGESTION_ENABLED, ScopeInterface::SCOPE_STORE)
+            ->willReturn(true);
+        $this->suggestedQueries->expects($this->once())
+            ->method('getItems')
+            ->with($this->query)
+            ->willReturn([]);
+        $this->dataProvider->expects($this->never())
+            ->method('getItems');
+        $this->assertEquals([], $this->model->getItems());
+    }
+
+    public function testGetItemsWithDisabledSuggestions(): void
+    {
+        $this->scopeConfig->expects($this->once())
+            ->method('isSetFlag')
+            ->with(SuggestedQueriesInterface::SEARCH_SUGGESTION_ENABLED, ScopeInterface::SCOPE_STORE)
+            ->willReturn(false);
+        $this->suggestedQueries->expects($this->never())
+            ->method('getItems');
+        $this->dataProvider->expects($this->once())
+            ->method('getItems')
+            ->willReturn([]);
+        $this->assertEquals([], $this->model->getItems());
+    }
+}

app/code/Magento/AdvancedSearch/etc/di.xml

@@ -40,4 +40,11 @@
         </arguments>
     </type>
     <preference for="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface" type="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProvider" />
+    <type name="Magento\Search\Model\Autocomplete">
+        <arguments>
+            <argument name="dataProviders" xsi:type="array">
+                <item name="10" xsi:type="object">Magento\AdvancedSearch\Model\DataProvider\AutocompleteSuggestions</item>
+            </argument>
+        </arguments>
+    </type>
 </config>