Merge branch '2.4-develop' into B2B-2459

Author: dhaecker

.github/CODE_OF_CONDUCT.md

@@ -1,46 +1,80 @@
-# Contributor Covenant Code of Conduct
+# Magento Code of Conduct
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our project and community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contribute to a positive environment for our project and community include:
+
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best, not just for us as individuals but for the overall community
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery and sexual attention or advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Publishing others’ private information, such as a physical or email address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a professional setting
 
+
 ## Our Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Project maintainers are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any instances of unacceptable behavior.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for behaviors that they deem inappropriate, threatening, offensive, or harmful.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies when an individual is representing the project or its community both within project spaces and in public spaces. Examples of representing a project or community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at engcom@magento.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by first contacting the project team at engcom@adobe.com. Oversight of Adobe projects is handled by the Adobe Open Source Office, which has final say in any violations and enforcement of this Code of Conduct and can be reached at Grp-opensourceoffice@adobe.com. All complaints will be reviewed and investigated promptly and fairly.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+The project team must respect the privacy and security of the reporter of any incident. 
 
-## Attribution
+Project maintainers who do not follow or enforce the Code of Conduct may face temporary or permanent repercussions as determined by other members of the project's leadership or the Adobe Open Source Office.
+
+
+## Enforcement Guidelines
+
+Project maintainers will follow these Community Impact Guidelines in determining the consequences for any action they deem to be in violation of this Code of Conduct:
+
+### 1. Correction
+
+Community Impact: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+Consequence: A private, written warning from project maintainers describing the violation and why the behavior was unacceptable. A public apology may be requested from the violator before any further involvement in the project by violator.
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+### 2. Warning
+
+Community Impact: A relatively minor violation through a single incident or series of actions.
+
+Consequence: A written warning from project maintainers that includes stated consequences for continued unacceptable behavior. Violator must refrain from interacting with the people involved for a specified period of time as determined by the project maintainers, including, but not limited to, unsolicited interaction with those enforcing the Code of Conduct through channels such as community spaces and social media. Continued violations may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+Community Impact: A more serious violation of community standards, including sustained unacceptable behavior.
+
+Consequence: A temporary ban from any interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Failure to comply with the temporary ban may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+Community Impact: Demonstrating a consistent pattern of violation of community standards or an egregious violation of community standards, including, but not limited to, sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+Consequence: A permanent ban from any interaction with the community.
+
+
+## Attribution
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+This Code of Conduct is adapted from the Contributor Covenant, version 2.1, available at https://www.contributor-covenant.org/version/2/1/code_of_conduct.html.

app/code/Magento/AdvancedSearch/Helper/Data.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdvancedSearch\Helper;
+
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Framework\App\Helper\AbstractHelper;
+use OpenSearch\Client;
+
+class Data extends AbstractHelper
+{
+
+    public const OPENSEARCH = 'opensearch';
+    public const MAJOR_VERSION = '2';
+
+    /**
+     * @var EngineResolverInterface
+     */
+    public $engineResolver;
+
+    /**
+     * @param Context $context
+     * @param EngineResolverInterface $engineResolver
+     */
+    public function __construct(
+        Context $context,
+        EngineResolverInterface $engineResolver
+    ) {
+        parent::__construct($context);
+        $this->engineResolver = $engineResolver;
+    }
+
+    /**
+     * Check if opensearch v2.x
+     *
+     * @return bool
+     */
+    public function isClientOpenSearchV2(): bool
+    {
+        $searchEngine =  $this->engineResolver->getCurrentSearchEngine();
+        if (stripos($searchEngine, self::OPENSEARCH) !== false) {
+            if (substr(Client::VERSION, 0, 1) == self::MAJOR_VERSION) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

app/code/Magento/AdvancedSearch/Model/Client/ClientFactory.php

@@ -6,11 +6,12 @@
 namespace Magento\AdvancedSearch\Model\Client;
 
 use Magento\Framework\ObjectManagerInterface;
+use Magento\AdvancedSearch\Helper\Data;
 
 class ClientFactory implements ClientFactoryInterface
 {
     /**
-     * Object manager
+     * Object var
      *
      * @var ObjectManagerInterface
      */
@@ -21,14 +22,32 @@ class ClientFactory implements ClientFactoryInterface
      */
     private $clientClass;
 
+    /**
+     * @var string
+     */
+    private $openSearch;
+
+    /**
+     * @var Data
+     */
+    protected $helper;
+
     /**
      * @param ObjectManagerInterface $objectManager
      * @param string $clientClass
+     * @param Data $helper
+     * @param string|null $openSearch
      */
-    public function __construct(ObjectManagerInterface $objectManager, $clientClass)
-    {
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $clientClass,
+        Data $helper,
+        $openSearch = null
+    ) {
         $this->objectManager = $objectManager;
         $this->clientClass = $clientClass;
+        $this->openSearch = $openSearch;
+        $this->helper = $helper;
     }
 
     /**
@@ -39,8 +58,13 @@ public function __construct(ObjectManagerInterface $objectManager, $clientClass)
      */
     public function create(array $options = [])
     {
+        $class = $this->clientClass;
+        if ($this->helper->isClientOpenSearchV2()) {
+            $class = $this->openSearch;
+        }
+
         return $this->objectManager->create(
-            $this->clientClass,
+            $class,
             ['options' => $options]
         );
     }

app/code/Magento/AdvancedSearch/Test/Unit/Helper/DataTest.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdvancedSearch\Test\Unit\Helper;
+
+use Magento\AdvancedSearch\Helper\Data;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\Search\EngineResolverInterface;
+
+/**
+ * @covers \Magento\AdvancedSearch\Helper\Data
+ */
+class DataTest extends TestCase
+{
+
+    /**
+     * @var Data
+     */
+    private $helper;
+
+    /**
+     * @var Context|MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var EngineResolverInterface|MockObject
+     */
+    private $engineResolverMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManager;
+
+    /**
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->engineResolverMock = $this->getMockForAbstractClass(EngineResolverInterface::class);
+
+        $this->engineResolverMock->expects($this->any())
+            ->method('getCurrentSearchEngine')
+            ->willReturn('');
+
+        $this->objectManager = new ObjectManagerHelper($this);
+        $this->helper = $this->objectManager->getObject(
+            Data::class,
+            [
+                'context' => $this->contextMock,
+                'engineResolver' => $this->engineResolverMock
+            ]
+        );
+    }
+
+    public function testIsClientOpenSearchV2()
+    {
+        $this->assertIsBool($this->helper->isClientOpenSearchV2());
+    }
+}

app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Notification/Dismiss.php

@@ -8,12 +8,13 @@
 use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
 use Magento\Backend\App\Action\Context;
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Class Bulk Notification Dismiss Controller
  */
-class Dismiss extends Action
+class Dismiss extends Action implements HttpGetActionInterface
 {
     /**
      * @var BulkNotificationManagement
@@ -43,7 +44,7 @@ protected function _isAllowed()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function execute()
     {
@@ -55,7 +56,7 @@ public function execute()
         $isAcknowledged = $this->notificationManagement->acknowledgeBulks($bulkUuids);
 
         /** @var \Magento\Framework\Controller\Result\Json $result */
-        $result = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $result = $this->resultFactory->create(ResultFactory::TYPE_RAW);
         if (!$isAcknowledged) {
             $result->setHttpResponseCode(400);
         }

app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Notification/DismissTest.php

@@ -11,6 +11,7 @@
 use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\Raw;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -43,6 +44,11 @@ class DismissTest extends TestCase
      */
     private $jsonResultMock;
 
+    /**
+     * @var MockObject
+     */
+    private $rawResultMock;
+
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
@@ -78,10 +84,10 @@ public function testExecute()
 
         $this->resultFactoryMock->expects($this->once())
             ->method('create')
-            ->with(ResultFactory::TYPE_JSON, [])
-            ->willReturn($this->jsonResultMock);
+            ->with(ResultFactory::TYPE_RAW, [])
+            ->willReturn($this->rawResultMock);
 
-        $this->assertEquals($this->jsonResultMock, $this->model->execute());
+        $this->assertEquals($this->rawResultMock, $this->model->execute());
     }
 
     public function testExecuteSetsBadRequestResponseStatusIfBulkWasNotAcknowledgedCorrectly()
@@ -95,7 +101,7 @@ public function testExecuteSetsBadRequestResponseStatusIfBulkWasNotAcknowledgedC
 
         $this->resultFactoryMock->expects($this->once())
             ->method('create')
-            ->with(ResultFactory::TYPE_JSON, [])
+            ->with(ResultFactory::TYPE_RAW, [])
             ->willReturn($this->jsonResultMock);
 
         $this->notificationManagementMock->expects($this->once())