merge magento-commerce/2.4-develop into magento-performance/MCP-996

Author: magento-mts-svc

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,72 @@
+name: Bug report
+description: Technical issue with the Magento 2 core components
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please read [our guidelines](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report-an-issue) before submitting the issue.
+  - type: textarea
+    attributes:
+      label: Preconditions and environment
+      description: |
+        Describe your environment.
+        Provide all the details that will help us to reproduce the bug.
+      value: |
+        - Magento version
+        - Anything else that would help a developer reproduce the bug
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Provide a set of clear steps to reproduce this bug.
+      placeholder: |
+        Example:
+          1. Navigate to storefront as a guest.
+          2. Open Test Category.
+          3. Click “Add to Cart” on the Virtual Product.
+          4. Open mini shopping cart and click “Proceed to Checkout”.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected result
+      description: |
+        Tell us what you expected to happen.
+      placeholder: |
+        Example:
+          Order is placed successfully, customer is redirected to the success page.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual result
+      description: |
+        Tell us what happened. Include error messages and issues.
+      placeholder: |
+        Example:
+          “Place order” button is not visible, order cannot be placed.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: |
+        Additional information is often requested when the bug report is processed. You can save time by providing both Magento and browser logs, screenshots, repository branch and HEAD commit you checked out to install Magento and any other artifacts related to the issue.
+        Also, links to the comments with important information, Root Cause analysis, additional video recordings; and anything else that is important for the issue and at some reason cannot be added to other sections.
+  - type: textarea
+    attributes:
+      label: Release note
+      description: |
+        Help us to provide meaningful release notes to the community.
+  - type: checkboxes
+    attributes:
+      label: Triage and priority
+      description: |
+        Provide [Severity](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#community-backlog-priority) assessment for the Issue as a Reporter.
+        This information helps us during the Confirmation and Issue triage processes.
+      options:
+        - label: 'Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._'
+        - label: 'Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._'
+        - label: 'Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._'
+        - label: 'Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._'
+        - label: 'Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._'

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -4,7 +4,7 @@ Magento values the contributions of the security research community, and we look
 
 ## Where should I report security issues?
 
-We strongly encourage you to report all security issues privately via our [bug bounty program](https://hackerone.com/magento).  Please provide us with relevant technical details and repro steps to expedite our investigation.  If you prefer not to use HackerOne, email us directly at `psirt@adobe.com` with details and repro steps.  
+We strongly encourage you to report all security issues privately via our [bug bounty program](https://hackerone.com/adobe).  Please provide us with relevant technical details and repro steps to expedite our investigation.  If you prefer not to use HackerOne, email us directly at `psirt@adobe.com` with details and repro steps.  
 
 ## Learning More About Security
 To learn more about securing a Magento store, please visit the [Security Center](https://magento.com/security).

SECURITY.md

@@ -34,8 +34,8 @@ public function execute()
                 /** @var $export \Magento\ImportExport\Model\Export */
                 $export = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
                 $export->setData($data);
-                $export->filterAttributeCollection(
-                    $attrFilterBlock->prepareCollection($export->getEntityAttributeCollection())
+                $attrFilterBlock->prepareCollection(
+                    $export->filterAttributeCollection($export->getEntityAttributeCollection())
                 );
                 return $resultLayout;
             } catch (\Exception $e) {

app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

@@ -6,20 +6,23 @@
 
 /**
  * @var \Magento\AdvancedSearch\Block\SearchData $block
+ * @var \Magento\Framework\Locale\LocaleFormatter $localeFormatter
  */
 ?>
 <?php
 /** @var \Magento\Search\Model\QueryResult[] $data */
 $data = $block->getItems();
-if (count($data)) : ?>
+if (count($data)): ?>
     <dl class="block">
         <dt class="title"><?= $block->escapeHtml(__($block->getTitle())) ?></dt>
-        <?php foreach ($data as $additionalInfo) : ?>
+        <?php foreach ($data as $additionalInfo): ?>
             <dd class="item">
                 <a href="<?= $block->escapeUrl($block->getLink($additionalInfo->getQueryText())) ?>"
                     ><?= $block->escapeHtml($additionalInfo->getQueryText()) ?></a>
-                <?php if ($block->isShowResultsCount()) : ?>
-                    <span class="count"><?= /* @noEscape */ (int)$additionalInfo->getResultsCount() ?></span>
+                <?php if ($block->isShowResultsCount()): ?>
+                    <span class="count">
+                        <?= /* @noEscape */ $localeFormatter->formatNumber((int)$additionalInfo->getResultsCount()) ?>
+                    </span>
                 <?php endif; ?>
             </dd>
         <?php endforeach; ?>

app/code/Magento/AdvancedSearch/view/frontend/templates/search_data.phtml

@@ -6,9 +6,10 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Ajax;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
 
-class Translate extends \Magento\Backend\App\Action
+class Translate extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Translate\Inline\ParserInterface
@@ -23,7 +24,7 @@ class Translate extends \Magento\Backend\App\Action
     /**
      * Authorization level of a basic admin session
      */
-    const ADMIN_RESOURCE = 'Magento_Backend::content_translation';
+    public const ADMIN_RESOURCE = 'Magento_Backend::content_translation';
 
     /**
      * @param Action\Context $context
@@ -52,8 +53,7 @@ public function execute()
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultJsonFactory->create();
         try {
-            $this->inlineParser->processAjaxPost($translate);
-            $response = ['success' => 'true'];
+            $response = $this->inlineParser->processAjaxPost($translate);
         } catch (\Exception $e) {
             $response = ['error' => 'true', 'message' => $e->getMessage()];
         }

app/code/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Plugin\Framework\Data\Form\Element;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Fieldset;
+
+/**
+ * Plugin that fixes mapping of value and label for bundle dynamic attributes
+ */
+class FieldsetPlugin
+{
+    /**
+     * @var string[]
+     */
+    private $dynamicAttributeNames = ['sku_type', 'weight_type', 'price_type'];
+
+    /**
+     * Normalise bundle dynamic attributes values
+     *
+     * Normalise attribute values for bundle dynamic attributes generated by form element
+     * to make it consistent across the system (dynamic => 1, fixed => 0)
+     *
+     * @param Fieldset $subject
+     * @param AbstractElement $result
+     * @return AbstractElement
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterAddField(Fieldset $subject, AbstractElement $result)
+    {
+        if (!in_array($result->getAttributeCode(), $this->dynamicAttributeNames)) {
+            return $result;
+        }
+
+        $new = [];
+        foreach ($result->getValues() as $option) {
+            $option['value'] = (int)!$option['value'];
+            $new[] = $option;
+        }
+
+        $result->setValues($new);
+        return $result;
+    }
+}

app/code/Magento/Bundle/Plugin/Framework/Data/Form/Element/FieldsetPlugin.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Test\Fixture;
+
+use Magento\Framework\DataObject;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\TestFramework\Fixture\Api\DataMerger;
+use Magento\TestFramework\Fixture\Api\ServiceFactory;
+use Magento\TestFramework\Fixture\Data\ProcessorInterface;
+use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
+
+class OrderItem implements RevertibleDataFixtureInterface
+{
+    private const DEFAULT_DATA = [
+        'items' => [
+                ['sku' => '%uniqid%']
+        ],
+        'payment'=> [ 'method' => 'checkmo']
+    ];
+
+    /**
+     * @var ServiceFactory
+     */
+    private ServiceFactory $serviceFactory;
+
+    /**
+     * @var ProcessorInterface
+     */
+    private ProcessorInterface $dataProcessor;
+
+    /**
+     * @var DataMerger
+     */
+    private DataMerger $dataMerger;
+
+    /**
+     * @param ServiceFactory $serviceFactory
+     * @param ProcessorInterface $dataProcessor
+     * @param DataMerger $dataMerger
+     */
+    public function __construct(
+        ServiceFactory $serviceFactory,
+        ProcessorInterface $dataProcessor,
+        DataMerger $dataMerger
+    ) {
+        $this->serviceFactory = $serviceFactory;
+        $this->dataProcessor = $dataProcessor;
+        $this->dataMerger = $dataMerger;
+    }
+
+    /**
+     * @param array $data
+     * @return DataObject|null
+     */
+    public function apply(array $data = []): ?DataObject
+    {
+        $service = $this->serviceFactory->create(OrderRepositoryInterface::class, 'save');
+
+        return $service->execute(['entity' => $this->prepareData($data)]);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function revert(DataObject $data): void
+    {
+        $service = $this->serviceFactory->create(OrderRepositoryInterface::class, 'delete');
+
+        $service->execute(['entity' => $data]);
+    }
+
+    /**
+     * Prepare product data
+     *
+     * @param array $data
+     * @return array
+     */
+    private function prepareData(array $data): array
+    {
+        $data = $this->dataMerger->merge(self::DEFAULT_DATA, $data, false);
+
+        return $this->dataProcessor->process($this, $data);
+    }
+}

app/code/Magento/Bundle/Test/Fixture/OrderItem.php

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminAssertBundleDynamicAttributesOnProductEditPageActionGroup">
+        <annotations>
+            <description>Verifies bundle dynamic attributes on the Product Edit page in admin.</description>
+        </annotations>
+        <arguments>
+            <argument name="dynamicSku" defaultValue="true" type="string"/>
+            <argument name="dynamicPrice" defaultValue="true" type="string"/>
+            <argument name="dynamicWeight" defaultValue="true" type="string"/>
+        </arguments>
+        <executeJS function="return document.querySelector(&quot;{{AdminProductFormBundleSection.dynamicSkuInput}}&quot;).checked.toString()" stepKey="dynamicSkuCheckedValue"/>
+        <assertEquals stepKey="assertDynamicSku">
+            <actualResult type="variable">dynamicSkuCheckedValue</actualResult>
+            <expectedResult type="string">{{dynamicSku}}</expectedResult>
+        </assertEquals>
+        <executeJS function="return document.querySelector(&quot;{{AdminProductFormBundleSection.dynamicPriceInput}}&quot;).checked.toString()" stepKey="dynamicPriceCheckedValue"/>
+        <assertEquals stepKey="assertDynamicPrice">
+            <actualResult type="variable">dynamicPriceCheckedValue</actualResult>
+            <expectedResult type="string">{{dynamicPrice}}</expectedResult>
+        </assertEquals>
+        <executeJS function="return document.querySelector(&quot;{{AdminProductFormBundleSection.dynamicWeightInput}}&quot;).checked.toString()" stepKey="dynamicWeightCheckedValue"/>
+        <assertEquals stepKey="assertDynamicWeight">
+            <actualResult type="variable">dynamicWeightCheckedValue</actualResult>
+            <expectedResult type="string">{{dynamicWeight}}</expectedResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>