Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-3813

Author: dhorytskyi

app/code/Magento/AsyncConfig/Test/Mftf/Test/AsyncConfigurationTest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -59,8 +59,10 @@
         <see selector="{{CatalogSection.successMessage}}" userInput="Configuration changes will be applied by consumer soon." stepKey="seeCustomSuccessMessage"/>
 
         <!--Trigger the Consumer-->
-        <magentoCLI stepKey="EnableAsyncConfig" command="queue:consumers:start saveConfigProcessor --max-messages=1"/>
-
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="EnableAsyncConfig">
+            <argument name="consumerName" value="saveConfigProcessor"/>
+            <argument name="maxMessages" value="1"/>
+        </actionGroup>
         <!--Open Configuration Page Again-->
         <amOnPage url="{{CatalogConfigPage.url}}" stepKey="navigateToConfigurationPageAgain" />
         <waitForPageLoad stepKey="waitForPageLoadAgain"/>

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/StorefrontAssertSeveralTermsAndConditionsOnPayPalPayFlowProCheckoutReviewPageTest.xml

@@ -18,7 +18,7 @@
             <testCaseId value="AC-4428"/>
             <group value="paypalPayflowProWithOutValut"/>
             <group value="3rd_party_integration"/>
-<!--            <group value="pr_exclude" />-->
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>

app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab;
 
@@ -14,7 +14,6 @@
 /**
  * Adminhtml catalog product downloadable items tab and form
  *
- * @author      Magento Core Team <[email protected]>
  * @deprecated 100.3.1
  * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
  */
@@ -45,8 +44,6 @@ class Downloadable extends Widget implements TabInterface
     protected $blockId = 'downloadableInfo';
 
     /**
-     * Core registry
-     *
      * @var Registry
      */
     protected $_coreRegistry = null;

app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php

@@ -1,14 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
 /**
  * Adminhtml catalog product downloadable items tab links section
  *
- * @author      Magento Core Team <[email protected]>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @deprecated 100.3.1 in favor of new class which adds grid links
@@ -36,8 +35,6 @@ class Links extends \Magento\Backend\Block\Template
     protected $_template = 'Magento_Downloadable::product/edit/downloadable/links.phtml';
 
     /**
-     * Downloadable file
-     *
      * @var \Magento\Downloadable\Helper\File
      */
     protected $_downloadableFile = null;
@@ -50,8 +47,6 @@ class Links extends \Magento\Backend\Block\Template
     protected $_coreFileStorageDb = null;
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry;

app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php

@@ -1,15 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
 /**
  * Adminhtml catalog product downloadable items tab links section
  *
- * @author      Magento Core Team <[email protected]>
- *
  * @deprecated 100.3.1 because of new class which adds grids samples
  * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples
  */
@@ -28,8 +26,6 @@ class Samples extends \Magento\Backend\Block\Widget
     protected $_template = 'Magento_Downloadable::product/edit/downloadable/samples.phtml';
 
     /**
-     * Downloadable file
-     *
      * @var \Magento\Downloadable\Helper\File
      */
     protected $_downloadableFile = null;
@@ -42,8 +38,6 @@ class Samples extends \Magento\Backend\Block\Widget
     protected $_coreFileStorageDb = null;
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry;

app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php

@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Catalog downloadable product part block
- *
- * @author      Magento Core Team <[email protected]>
  */
 namespace Magento\Downloadable\Block\Catalog\Product\View;
 

app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php

@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Shopping cart downloadable item render block
- *
- * @author      Magento Core Team <[email protected]>
  */
 namespace Magento\Downloadable\Block\Checkout\Cart\Item;
 

app/code/Magento/Downloadable/Block/Checkout/Success.php

@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Downloadable checkout success page
- *
- * @author     Magento Core Team <[email protected]>
  */
 namespace Magento\Downloadable\Block\Checkout;
 

app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php

@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable;
 
 /**
  * Downloadable File upload controller
- *
- * @author      Magento Core Team <[email protected]>
  */
 abstract class File extends \Magento\Backend\App\Action
 {
@@ -17,5 +15,5 @@ abstract class File extends \Magento\Backend\App\Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Catalog::products';
+    public const ADMIN_RESOURCE = 'Magento_Catalog::products';
 }

app/code/Magento/Downloadable/Controller/Download.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Downloadable\Controller;
 
@@ -10,8 +10,6 @@
 
 /**
  * Download controller
- *
- * @author      Magento Core Team <[email protected]>
  */
 abstract class Download extends \Magento\Framework\App\Action\Action
 {