Merge branch 'magento-commerce:2.4-develop' into MC-40556

Author: Rrego6

app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml

@@ -11,6 +11,12 @@
             <policy id="script-src">
                 <values>
                     <value id="adobedtm" type="host">assets.adobedtm.com</value>
+                    <value id="adobe" type="host">*.adobe.com</value>
+                </values>
+            </policy>
+            <policy id="style-src">
+                <values>
+                    <value id="adobe" type="host">*.adobe.com</value>
                 </values>
             </policy>
             <policy id="img-src">
@@ -19,6 +25,7 @@
                     <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
                     <value id="dpmdemdex" type="host">dpm.demdex.net</value>
                     <value id="everesttech" type="host">cm.everesttech.net</value>
+                    <value id="adobe" type="host">*.adobe.com</value>
                 </values>
             </policy>
             <policy id="connect-src">
@@ -27,9 +34,15 @@
                     <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
                 </values>
             </policy>
+            <policy id="media-src">
+                <values>
+                    <value id="adobe" type="host">*.adobe.com</value>
+                </values>
+            </policy>
             <policy id="frame-src">
                 <values>
                     <value id="amcdemdex" type="host">fast.amc.demdex.net</value>
+                    <value id="adobe" type="host">*.adobe.com</value>
                 </values>
             </policy>
         </policies>

app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml

@@ -100,6 +100,7 @@
         <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedSee2"/>
         <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedRelatedProduct}}" userInput="$$simpleProduct6.name$$" stepKey="seeSixthRelatedProduct"/>
         <selectOption selector=".admin__collapsible-block-wrapper[data-index='related'] .admin__control-select" userInput="5" stepKey="selectFivePerPage"/>
+        <waitForPageLoad stepKey="waitForLoadingAfterSelectFivePerPage"/>
         <dontSee selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedRelatedProduct}}" userInput="$$simpleProduct6.name$$" stepKey="dontSeeSixthRelatedProduct"/>
 
         <!--See related product in storefront-->

app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-item-level.html

@@ -33,17 +33,17 @@
                     <!-- ko text: getObservable('message') --><!-- /ko -->
                 </div>
             <!-- /ko -->
-            
+
             <div class="actions-toolbar">
                 <div class="secondary">
                     <button type="submit" class="action action-edit" data-bind="
                             click: $data.editOptions.bind($data),
-                            attr: {title: $t('Edit')">
+                            attr: {title: $t('Edit')}">
                         <span data-bind="i18n: 'Edit'"></span>
                     </button>
                     <button class="action action-delete" data-bind="
                             click: $data.deleteOptions.bind($data),
-                            attr: {title: $t('Delete')">
+                            attr: {title: $t('Delete')}">
                         <span data-bind="i18n: 'Delete'"></span>
                     </button>
                 </div>

app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js

@@ -13,8 +13,9 @@ define([
     'uiLayout',
     'uiCollection',
     'uiRegistry',
-    'mage/translate'
-], function (ko, utils, _, layout, uiCollection, registry, $t) {
+    'mage/translate',
+    'jquery'
+], function (ko, utils, _, layout, uiCollection, registry, $t, $) {
     'use strict';
 
     /**
@@ -975,6 +976,18 @@ define([
             this._reducePages();
         },
 
+        /**
+         * Update page size based on select change event.
+         * The value needs to be retrieved from select as ko value handler is executed after the event handler.
+         *
+         * @param {Object} component
+         * @param {jQuery.Event} event
+         */
+        updatePageSize: function (component, event) {
+            this.pageSize = $(event.target).val();
+            this.reload();
+        },
+
         /**
          * Destroy all dynamic-rows elems
          *

app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/optgroup.js

@@ -19,7 +19,6 @@ define([
     ko.bindingHandlers.optgroup = {
         /**
          * @param {*} element
-         * @returns {Object}
          */
         init: function (element) {
             if (ko.utils.tagNameLower(element) !== 'select') {
@@ -30,11 +29,6 @@ define([
             while (element.length > 0) {
                 element.remove(0);
             }
-
-            // Ensures that the binding processor doesn't try to bind the options
-            return {
-                'controlsDescendantBindings': true
-            };
         },
 
         /**
@@ -333,5 +327,4 @@ define([
             }
         }
     };
-    ko.bindingHandlers.selectedOptions.after.push('optgroup');
 });

app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/scope.js

@@ -29,7 +29,7 @@ define([
             $t: $t
         });
 
-        ko.utils.arrayForEach(el.childNodes, ko.cleanNode);
+        ko.utils.arrayForEach(ko.virtualElements.childNodes(el), ko.cleanNode);
 
         ko.applyBindingsToDescendants(component, el);
     }

app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html

@@ -17,7 +17,7 @@
     <div class="admin__field-control" data-role="grid-wrapper">
         <div class="admin__control-table-pagination" visible="!!$data.getRecordCount()">
             <div class="admin__data-grid-pager-wrap">
-                <select class="admin__control-select" data-bind="value:pageSize, event:{change: reload}">
+                <select class="admin__control-select" data-bind="value:pageSize, event:{change: updatePageSize}">
                     <option value="5">5</option>
                     <option value="20" selected="selected">20</option>
                     <option value="30">30</option>

app/code/Magento/Ui/view/frontend/web/templates/form/field.html

@@ -50,4 +50,3 @@
         <!-- /ko -->
     </div>
 </div>
-<!-- /ko -->

composer.json

@@ -93,8 +93,9 @@
         "phpmd/phpmd": "^2.8.0",
         "phpstan/phpstan": "^0.12.77",
         "phpunit/phpunit": "^9",
-        "sebastian/phpcpd": "~5.0.0",
-        "squizlabs/php_codesniffer": "~3.5.4"
+        "sebastian/phpcpd": "^6.0.3",
+        "squizlabs/php_codesniffer": "~3.5.4",
+        "symfony/finder": "^5.2"
     },
     "suggest": {
         "ext-pcntl": "Need for run processes in parallel mode"