Merge remote-tracking branch 'upstream/2.4-develop' into payment-list/model-not-provided-in-config

Author: fredden

.github/stale.yml

@@ -0,0 +1,68 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+ daysUntilStale: 76
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 14
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - "Priority: P0"
+  - "Priority: P1"
+  - "Priority: P2"
+  - "Progress: dev in progress"
+  - "Progress: PR in progress"
+  - "Progress: done"
+  - "B2B: GraphQL"   
+  - "Progress: PR Created"
+  - "PAP"
+  - "Project: Login as Customer"
+  - "Project: GraphQL"
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: "stale issue"
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed after 14 days if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -158,6 +158,8 @@ public function __construct(
     protected function initTypeModels()
     {
         $productTypes = $this->_exportConfig->getEntityTypes(CatalogProduct::ENTITY);
+        $disabledAttrs = [];
+        $indexValueAttributes = [];
         foreach ($productTypes as $productTypeName => $productTypeConfig) {
             if (!($model = $this->_typeFactory->create($productTypeConfig['model']))) {
                 throw new \Magento\Framework\Exception\LocalizedException(
@@ -174,21 +176,19 @@ protected function initTypeModels()
             }
             if ($model->isSuitable()) {
                 $this->_productTypeModels[$productTypeName] = $model;
-                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
-                $this->_disabledAttrs = array_merge($this->_disabledAttrs, $model->getDisabledAttrs());
-                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
-                $this->_indexValueAttributes = array_merge(
-                    $this->_indexValueAttributes,
-                    $model->getIndexValueAttributes()
-                );
+                $disabledAttrs[] = $model->getDisabledAttrs();
+                $indexValueAttributes[] = $model->getIndexValueAttributes();
             }
         }
         if (!$this->_productTypeModels) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('There are no product types available for export')
             );
         }
-        $this->_disabledAttrs = array_unique($this->_disabledAttrs);
+        $this->_disabledAttrs = array_unique(array_merge([], $this->_disabledAttrs, ...$disabledAttrs));
+        $this->_indexValueAttributes = array_unique(
+            array_merge([], $this->_indexValueAttributes, ...$indexValueAttributes)
+        );
         return $this;
     }
 
@@ -518,6 +518,8 @@ protected function getTierPrices(array $listSku, $table)
         if (isset($this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP])) {
             $exportFilter = $this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP];
         }
+        $selectFields = [];
+        $exportData = false;
         if ($table == ImportAdvancedPricing::TABLE_TIER_PRICE) {
             $selectFields = [
                 ImportAdvancedPricing::COL_SKU => 'cpe.sku',

app/code/Magento/AsynchronousOperations/Model/OperationProcessor.php

@@ -117,6 +117,7 @@ public function process(string $encodedMessage)
         $status = OperationInterface::STATUS_TYPE_COMPLETE;
         $errorCode = null;
         $messages = [];
+        $entityParams = [];
         $topicName = $operation->getTopicName();
         $handlers = $this->configuration->getHandlers($topicName);
         try {
@@ -127,7 +128,7 @@ public function process(string $encodedMessage)
             $this->logger->error($e->getMessage());
             $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
             $errorCode = $e->getCode();
-            $messages[] = $e->getMessage();
+            $messages[] = [$e->getMessage()];
         }
 
         $outputData = null;
@@ -136,9 +137,7 @@ public function process(string $encodedMessage)
                 $result = $this->executeHandler($callback, $entityParams);
                 $status = $result['status'];
                 $errorCode = $result['error_code'];
-                // phpcs:disable Magento2.Performance.ForeachArrayMerge
-                $messages = array_merge($messages, $result['messages']);
-                // phpcs:enable Magento2.Performance.ForeachArrayMerge
+                $messages[] = $result['messages'];
                 $outputData = $result['output_data'];
             }
         }
@@ -157,7 +156,7 @@ public function process(string $encodedMessage)
                 );
                 $outputData = $this->jsonHelper->serialize($outputData);
             } catch (\Exception $e) {
-                $messages[] = $e->getMessage();
+                $messages[] = [$e->getMessage()];
             }
         }
 
@@ -167,7 +166,7 @@ public function process(string $encodedMessage)
             $operation->getId(),
             $status,
             $errorCode,
-            implode('; ', $messages),
+            implode('; ', array_merge([], ...$messages)),
             $serializedData,
             $outputData
         );

app/code/Magento/AsynchronousOperations/etc/db_schema.xml

@@ -34,7 +34,7 @@
     <table name="magento_operation" resource="default" engine="innodb" comment="Operation entity">
         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Operation ID"/>
-        <column xsi:type="int" name="operation_key" padding="10" unsigned="true" nullable="false"
+        <column xsi:type="int" name="operation_key" padding="10" unsigned="true" nullable="true"
                 comment="Operation Key"/>
         <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
         <column xsi:type="varchar" name="topic_name" nullable="true" length="255"

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenConfigurationStoresPageActionGroup.xml

@@ -0,0 +1,18 @@
+<?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="AdminOpenConfigurationStoresPageActionGroup">
+        <annotations>
+            <description>Open configuration stores page.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminConfigurationStoresPage.url}}" stepKey="goToConfigurationStoresPage"/>
+        <waitForPageLoad stepKey="waitPageLoad"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
+        <section name="WYSIWYGOptionsSection"/>
+    </page>
+</pages>

app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage/ConfigurationStoresPage.xml

@@ -7,6 +7,7 @@
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <!--  @deprecated New Page was introduced. Please use "AdminConfigurationStoresPage"  -->
     <page name="ConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
         <section name="WYSIWYGOptionsSection"/>
     </page>

app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml

@@ -34,7 +34,6 @@
             <!-- Reset admin order filter -->
             <comment userInput="Reset admin order filter" stepKey="resetAdminOrderFilter"/>
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingOrderGrid"/>
             <magentoCLI command="config:set admin/dashboard/enable_charts 0" stepKey="setDisableChartsAsDefault"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
@@ -84,8 +83,7 @@
         <comment userInput="Create invoice" stepKey="createInvoice"/>
 
         <actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
-        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
-        <waitForPageLoad stepKey="waitForInvoicePageToLoad"/>
+        <actionGroup ref="AdminClickInvoiceButtonOrderViewActionGroup" stepKey="clickInvoiceButton"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
         <see selector="{{AdminInvoiceTotalSection.total('Subtotal')}}" userInput="$150.00" stepKey="seeCorrectGrandTotal"/>
         <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml

@@ -35,18 +35,21 @@
 
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption1"/>
         <waitForLoadingMaskToDisappear stepKey="waitForStoresMenu1" />
+        <waitForElementVisible selector="{{AdminMenuSection.configuration}}" stepKey="waitForConfigurationVisible1"/>
         <click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption1"/>
         <waitForPageLoad stepKey="waitForConfigurationPageLoad1"/>
         <seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath1"/>
 
         <click selector="{{AdminMenuSection.catalog}}" stepKey="clickCatalogMenuOption"/>
         <waitForLoadingMaskToDisappear stepKey="waitForCatalogMenu1" />
+        <waitForElementVisible selector="{{AdminMenuSection.catalogProducts}}" stepKey="waitForCatalogProductsVisible"/>
         <click selector="{{AdminMenuSection.catalogProducts}}" stepKey="clickCatalogProductsMenuOption"/>
         <waitForPageLoad stepKey="waitForProductsPageLoad"/>
         <seeCurrentUrlMatches regex="~\/catalog\/product\/~" stepKey="seeCurrentUrlMatchesProductsPath"/>
 
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption2"/>
         <waitForLoadingMaskToDisappear stepKey="waitForStoresMenu2" />
+        <waitForElementVisible selector="{{AdminMenuSection.configuration}}" stepKey="waitForConfigurationVisible2"/>
         <click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption2"/>
         <waitForPageLoad stepKey="waitForConfigurationPageLoad2"/>
         <seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath2"/>

app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml

@@ -4,45 +4,52 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
+/**
+ * @var SecureHtmlRenderer $secureRenderer
+ * @var Escaper $escaper
+ */
 ?>
-<!-- <?php if ($block->getTitle()): ?>
-    <h3><?= $block->escapeHtml($block->getTitle()) ?></h3>
-<?php endif ?> -->
 <?php if (!empty($tabs)): ?>
-<div id="<?=  $block->escapeHtmlAttr($block->getId()) ?>">
+    <?php $blockId = $block->getId() ?>
+<div id="<?= $escaper->escapeHtmlAttr($blockId) ?>" class="hidden">
 <ul  class="tabs-horiz">
     <?php foreach ($tabs as $_tab): ?>
+        <?php $tabId = $block->getTabId($_tab) ?>
         <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' .
             (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
         <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
         <?php $_tabHref = $block->getTabUrl($_tab) == '#' ?
-            '#' . $block->getTabId($_tab) . '_content' :
+            '#' . $tabId . '_content' :
             $block->getTabUrl($_tab) ?>
     <li>
-        <a href="<?= $block->escapeUrl($_tabHref) ?>"
-           id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
-           title="<?= $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>"
-           class="<?= $block->escapeHtmlAttr($_tabClass) ?>"
-           data-tab-type="<?= $block->escapeHtmlAttr($_tabType) ?>">
+        <a href="<?= $escaper->escapeUrl($_tabHref) ?>"
+           id="<?= $escaper->escapeHtmlAttr($tabId) ?>"
+           title="<?= $escaper->escapeHtmlAttr($block->getTabTitle($_tab)) ?>"
+           class="<?= $escaper->escapeHtmlAttr($_tabClass) ?>"
+           data-tab-type="<?= $escaper->escapeHtmlAttr($_tabType) ?>">
             <span>
                 <span class="changed"
-                      title="<?= $block->escapeHtmlAttr(__('The information in this tab has been changed.')) ?>"></span>
+                      title="<?= $escaper->escapeHtmlAttr(__(
+                          'The information in this tab has been changed.'
+                      )) ?>"></span>
                 <span class="error"
-                      title="<?= $block->escapeHtmlAttr(__(
+                      title="<?= $escaper->escapeHtmlAttr(__(
                           'This tab contains invalid data. Please resolve this before saving.'
                       )) ?>"></span>
                 <span class="loader"
-                      title="<?= $block->escapeHtmlAttr(__('Loading...')) ?>"></span>
-                <?= $block->escapeHtml($block->getTabLabel($_tab)) ?>
+                      title="<?= $escaper->escapeHtmlAttr(__('Loading...')) ?>"></span>
+                <?= $escaper->escapeHtml($block->getTabLabel($_tab)) ?>
             </span>
         </a>
-        <div id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>_content">
+        <div id="<?= $escaper->escapeHtmlAttr($tabId) ?>_content">
             <?= /* @noEscape */ $block->getTabContent($_tab) ?>
         </div>
         <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
             'display:none',
-            '#' . $block->escapeJs($block->getTabId($_tab)) . '_content'
+            '#' . $escaper->escapeJs($tabId) . '_content'
         ); ?>
     </li>
     <?php endforeach; ?>
@@ -51,11 +58,12 @@
     <?php $scriptString = <<<script
 require(["jquery","mage/backend/tabs"], function($){
     $(function() {
-        $('#{$block->getId()}').tabs({
-            active: '{$block->getActiveTabId()}',
-            destination: '#{$block->getDestElementId()}',
+        $('#{$escaper->escapeJs($blockId)}').tabs({
+            active: '{$escaper->escapeJs($block->getActiveTabId())}',
+            destination: '#{$escaper->escapeJs($block->getDestElementId())}',
             shadowTabs: {$block->getAllShadowTabs()}
         });
+        $('#{$escaper->escapeJs($blockId)}').removeClass('hidden');
     });
 });
 script;