Merge pull request #7357 from magento-cia/2.4.4-develop-2.4-develop-s…

…ync-122021

Sync of 2.4.4-develop with 2.4-develop

app/code/Magento/AdminAnalytics/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-config": "*",

app/code/Magento/AdminNotification/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "lib-libxml": "*",
         "magento/framework": "*",
         "magento/module-backend": "*",

app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

@@ -69,7 +69,7 @@ define([
         }
     });
 
-    $(document).ready(function () {
+    $(function () {
         $('#system_messages .message-system-short .error').on('click', function () {
             $('#message-system-all').systemMessageDialog('openModal', 1);
         });

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-import-export": "*",

app/code/Magento/AdvancedSearch/composer.json

@@ -13,7 +13,7 @@
         "magento/module-customer": "*",
         "magento/module-search": "*",
         "magento/module-store": "*",
-        "php": "~7.4.0||~8.0.0"
+        "php": "~7.4.0||~8.0.0||~8.1.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js

@@ -44,7 +44,7 @@ define([
                 fieldToCheck = this.options.fieldToCheck || 'success';
 
             element.removeClass('success').addClass('fail');
-            $.each($.parseJSON(this.options.fieldMapping), function (key, el) {
+            $.each(JSON.parse(this.options.fieldMapping), function (key, el) {
                 params[key] = $('#' + el).val();
             });
             $.ajax({

app/code/Magento/Amqp/composer.json

@@ -8,7 +8,7 @@
         "magento/framework": "*",
         "magento/framework-amqp": "*",
         "magento/framework-message-queue": "*",
-        "php": "~7.4.0||~8.0.0"
+        "php": "~7.4.0||~8.0.0||~8.1.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/AmqpStore/composer.json

@@ -8,7 +8,7 @@
         "magento/framework": "*",
         "magento/framework-amqp": "*",
         "magento/module-store": "*",
-        "php": "~7.4.0||~8.0.0"
+        "php": "~7.4.0||~8.0.0||~8.1.0"
     },
     "suggest": {
         "magento/module-asynchronous-operations": "*",

app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php

@@ -34,6 +34,7 @@ public function __construct(
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $current = parent::current();

app/code/Magento/Analytics/ReportXml/Query.php

@@ -53,6 +53,8 @@ public function __construct(
     }
 
     /**
+     * Returns query select
+     *
      * @return Select
      */
     public function getSelect()
@@ -61,6 +63,8 @@ public function getSelect()
     }
 
     /**
+     * Returns Connection name
+     *
      * @return string
      */
     public function getConnectionName()
@@ -69,6 +73,8 @@ public function getConnectionName()
     }
 
     /**
+     * Returns configuration
+     *
      * @return array
      */
     public function getConfig()
@@ -77,11 +83,9 @@ public function getConfig()
     }
 
     /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
+     * @inheritDoc
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [

app/code/Magento/Analytics/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-analytics",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/module-backend": "*",
         "magento/module-config": "*",
         "magento/module-integration": "*",

app/code/Magento/AsynchronousOperations/composer.json

@@ -11,7 +11,7 @@
         "magento/module-authorization": "*",
         "magento/module-backend": "*",
         "magento/module-ui": "*",
-        "php": "~7.4.0||~8.0.0"
+        "php": "~7.4.0||~8.0.0||~8.1.0"
     },
     "suggest": {
         "magento/module-admin-notification": "*",

app/code/Magento/Authorization/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-backend": "*"
     },

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3MediaGalleryDeleteFolderTest.xml

@@ -89,7 +89,7 @@
             <argument name="name" value="{{AdminMediaGalleryFolder2Data.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectUploadedImage">
-            <argument name="imageName" value="{{ImageUpload.file}}"/>
+            <argument name="imageName" value="{{ImageUpload.filename}}"/>
         </actionGroup>
         <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelected"/>
         <actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="savePage"/>

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3MediaGalleryDeleteImageTest.xml

@@ -82,7 +82,7 @@
             <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectUploadedImage">
-            <argument name="imageName" value="{{ImageUpload.file}}"/>
+            <argument name="imageName" value="{{ImageUpload.filename}}"/>
         </actionGroup>
         <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelected"/>
         <actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="savePage"/>
@@ -117,7 +117,7 @@
             <argument name="imageName" value="{{ImageUpload.file}}"/>
         </actionGroup>
         <actionGroup ref="AdminMediaGalleryAssertImageNotExistsInTheGridActionGroup" stepKey="assertImageDeleted">
-            <argument name="title" value="ImageUpload.file"/>
+            <argument name="title" value="ImageUpload.filename"/>
         </actionGroup>
 
         <!-- Verify Images & Directories in S3 & Local File System -->

app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3AdminCreateDownloadableProductWithLinkTest.xml

@@ -161,14 +161,16 @@
         <comment userInput="BIC workaround" stepKey="waitForPaymentSectionLoaded"/>
         <comment userInput="BIC workaround" stepKey="clickPlaceOrderButton"/>
         <comment userInput="BIC workaround" stepKey="orderIsSuccessfullyPlaced"/>
-        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
+        <actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="clickOrderLink"/>
+        <comment userInput="BIC workaround" stepKey="grabOrderNumber"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="orderId"/>
 
         <!-- Open Create invoice -->
         <comment userInput="BIC workaround" stepKey="onOrdersPage"/>
         <comment userInput="BIC workaround" stepKey="searchOrder"/>
         <comment userInput="BIC workaround" stepKey="clickOrderRow"/>
-        <actionGroup ref="OpenOrderByIdActionGroup" stepKey="goToOrderInAdmin">
-            <argument name="orderId" value="{$grabOrderNumber}"/>
+        <actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="goToOrderInAdmin">
+            <argument name="entityId" value="{$orderId}"/>
         </actionGroup>
         <comment userInput="BIC workaround" stepKey="createCreditMemo"/>
         <actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startInvoice"/>

app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3StorefrontPrintOrderGuestTest.xml

@@ -15,9 +15,6 @@
             <description value="Print Order from Guest on Frontend"/>
             <severity value="BLOCKER"/>
             <testCaseId value="MC-38689"/>
-            <skip>
-                <issueId value="MQE-2834" />
-            </skip>
             <group value="remote_storage_aws_s3"/>
             <group value="pr_exclude"/>
         </annotations>

app/code/Magento/AwsS3/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-remote-storage": "*",
         "league/flysystem": "^2.0",

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php

@@ -97,7 +97,9 @@ protected function _getValue(DataObject $row)
             }
             return '';
         }
-        return $row->getData($this->getColumn()->getIndex());
+        return $this->getColumn()->getIndex() !== null
+            ? $row->getData($this->getColumn()->getIndex())
+            : null;
     }
 
     /**

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

@@ -102,7 +102,9 @@ protected function _getCurrencyCode($row)
         if ($code = $this->getColumn()->getCurrencyCode()) {
             return $code;
         }
-        if ($code = $row->getData($this->getColumn()->getCurrency())) {
+        $currency = $this->getColumn()->getCurrency();
+
+        if ($currency !== null && $code = $row->getData($currency)) {
             return $code;
         }
 
@@ -118,11 +120,14 @@ protected function _getCurrencyCode($row)
     protected function _getRate($row)
     {
         if ($rate = $this->getColumn()->getRate()) {
-            return (float)$rate;
+            return (float) $rate;
         }
-        if ($rate = $row->getData($this->getColumn()->getRateField())) {
-            return (float)$rate;
+        $rateField = $this->getColumn()->getRateField();
+
+        if ($rateField !== null && $rate = $row->getData($rateField)) {
+            return (float) $rate;
         }
+
         return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
     }
 

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php

@@ -60,7 +60,7 @@ public function render(\Magento\Framework\DataObject $row)
                 return $data;
             }
 
-            $data = (float)$data * $this->_getRate($row);
+            $data = (float) $data * $this->_getRate($row);
             $data = sprintf("%f", $data);
             $data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
             return $data;
@@ -79,7 +79,9 @@ protected function _getCurrencyCode($row)
         if ($code = $this->getColumn()->getCurrencyCode()) {
             return $code;
         }
-        if ($code = $row->getData($this->getColumn()->getCurrency())) {
+        $currency = $this->getColumn()->getCurrency();
+
+        if ($currency !== null && $code = $row->getData($currency)) {
             return $code;
         }
         return false;
@@ -94,10 +96,12 @@ protected function _getCurrencyCode($row)
     protected function _getRate($row)
     {
         if ($rate = $this->getColumn()->getRate()) {
-            return (float)$rate;
+            return (float) $rate;
         }
-        if ($rate = $row->getData($this->getColumn()->getRateField())) {
-            return (float)$rate;
+        $rateField = $this->getColumn()->getRateField();
+
+        if ($rateField !== null && $rate = $row->getData($rateField)) {
+            return (float) $rate;
         }
         return 1;
     }

app/code/Magento/Backend/Model/Menu.php

@@ -242,7 +242,7 @@ public function getParentItems($itemId)
      *
      * @param \Magento\Backend\Model\Menu $menu
      * @param string $itemId
-     * @param array &$parents
+     * @param array $parents
      * @return bool
      */
     protected function _findParentItems($menu, $itemId, &$parents)
@@ -267,6 +267,7 @@ protected function _findParentItems($menu, $itemId, &$parents)
      *
      * @return string
      */
+    #[\ReturnTypeWillChange]
     public function serialize()
     {
         return $this->serializer->serialize($this->toArray());
@@ -294,6 +295,7 @@ public function toArray()
      * @return void
      * @since 100.2.0
      */
+    #[\ReturnTypeWillChange]
     public function unserialize($serialized)
     {
         $data = $this->serializer->unserialize($serialized);

app/code/Magento/Backend/Model/Menu/Filter/Iterator.php

@@ -12,21 +12,12 @@
  */
 class Iterator extends \FilterIterator
 {
-    /**
-     * Constructor
-     *
-     * @param \Iterator $iterator
-     */
-    public function __construct(\Iterator $iterator)
-    {
-        parent::__construct($iterator);
-    }
-
     /**
      * Check whether the current element of the iterator is acceptable
      *
      * @return bool true if the current element is acceptable, otherwise false.
      */
+    #[\ReturnTypeWillChange]
     public function accept()
     {
         return !($this->current()->isDisabled() || !$this->current()->isAllowed());

app/code/Magento/Backend/Model/Menu/Iterator.php

@@ -17,6 +17,7 @@ class Iterator extends \ArrayIterator
      *
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->ksort();

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenDashboardPageActionGroup.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="AdminOpenDashboardPageActionGroup">
+        <annotations>
+            <description>Go to Admin Dashboard page.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminDashboardPage.url}}" stepKey="goToDashboardPage"/>
+    </actionGroup>
+</actionGroups>

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

@@ -29,6 +29,6 @@
         <!-- delete the rule -->
         <click stepKey="clickDelete" selector="{{AdminStoresMainActionsSection.deleteButton}}"/>
         <click stepKey="clickOk" selector="{{AdminConfirmationModalSection.ok}}"/>
-        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="deleted"/>
+        <see stepKey="seeSuccess" selector="{{AdminMessagesSection.success}}" userInput="deleted"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml

@@ -18,5 +18,6 @@
         <!-- Used for page not found error -->
         <element name="pageNotFoundTitle" type="text" selector=".page-title span"/>
         <element name="signOut" type="button" selector=".page-header .account-signout"/>
+        <element name="pageMainActions" type="block" selector=".page-main-actions"/>
     </section>
 </sections>

app/code/Magento/Backend/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-backup": "*",
         "magento/module-catalog": "*",

app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml

@@ -40,7 +40,7 @@ if ($isField) {
         data-role="<?=  $block->escapeHtmlAttr($id) ?>-wrapper">
         <div class="fieldset-wrapper-title admin__fieldset-wrapper-title">
             <strong <?= /* @noEscape */ $isCollapsable ?
-                'class="admin__collapsible-title" data-toggle="collapse" data-target="#' . $id . '-content"' :
+                'class="admin__collapsible-title" data-bs-toggle="collapse" data-bs-target="#' . $id . '-content"' :
                 'class="title"'; ?>>
                 <span><?= $block->escapeHtml($element->getLegend()) ?></span>
             </strong>