Merge branch '2.4-develop' into 2.4.0-develop

# Conflicts:
#	app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
#	app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerPasswordTest.xml

Author: dvoskoboinikov

.github/CONTRIBUTING.md

@@ -31,7 +31,7 @@ If you are a new GitHub user, we recommend that you create your own [free github
 This will allow you to collaborate with the Magento 2 development team, fork the Magento 2 project and send pull requests.
 
 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
-2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
+2. Review the [Contributor License Agreement](https://opensource.adobe.com/cla.html) if this is your first time contributing.
 3. Create and test your work.
 4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.

app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/_Deprecated_ActionGroup.xml

@@ -0,0 +1,13 @@
+<?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="LoginAdminWithCredentialsActionGroup" deprecated="Use AdminLoginActionGroup instead">
+        <conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/_Deprecated_ActionGroup/LoginAdminWithCredentialsActionGroup.xml

@@ -0,0 +1,13 @@
+<?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="LoginAsAdmin" deprecated="Use AdminLoginActionGroup instead">
+        <conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/_Deprecated_ActionGroup/LoginAsAdminActionGroup.xml

@@ -35,8 +35,9 @@
         <waitForPageLoad time="30" stepKey="wait2"/>
         <seeInField selector="{{AdminEditUserSection.usernameTextField}}" userInput="$$noReportUser.username$$" stepKey="seeUsernameInField"/>
         <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
-        <click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRoleTab"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
 
+        <click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRoleTab"/>
         <fillField selector="{{AdminEditUserSection.roleNameFilterTextField}}" userInput="$$noReportUserRole.rolename$$" stepKey="fillRoleNameSearch"/>
         <click selector="{{AdminEditUserSection.searchButton}}" stepKey="clickSearchButtonUserRole"/>
         <waitForPageLoad time="10" stepKey="wait3"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml

@@ -14,7 +14,7 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
-use Zend\Uri\Uri;
+use Laminas\Uri\Uri;
 
 /**
  * Class to get area front name.

app/code/Magento/Backend/App/Area/FrontNameResolver.php

@@ -3,14 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Backend\Block;
 
 /**
+ * Class used to initialize layout for MBO Dashboard
+ * @deprecated dashboard graphs were migrated to dynamic chart.js solution
+ * @see dashboard in adminhtml_dashboard_index.xml
+ *
  * @api
  * @since 100.0.2
  */
-class Dashboard extends \Magento\Backend\Block\Template
+class Dashboard extends Template
 {
     /**
      * Location of the "Enable Chart" config param
@@ -23,42 +28,8 @@ class Dashboard extends \Magento\Backend\Block\Template
     protected $_template = 'Magento_Backend::dashboard/index.phtml';
 
     /**
-     * @return void
-     */
-    protected function _prepareLayout()
-    {
-        $this->addChild('lastOrders', \Magento\Backend\Block\Dashboard\Orders\Grid::class);
-
-        $this->addChild('totals', \Magento\Backend\Block\Dashboard\Totals::class);
-
-        $this->addChild('sales', \Magento\Backend\Block\Dashboard\Sales::class);
-
-        $isChartEnabled = $this->_scopeConfig->getValue(
-            self::XML_PATH_ENABLE_CHARTS,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-        if ($isChartEnabled) {
-            $block = $this->getLayout()->createBlock(\Magento\Backend\Block\Dashboard\Diagrams::class);
-        } else {
-            $block = $this->getLayout()->createBlock(
-                \Magento\Backend\Block\Template::class
-            )->setTemplate(
-                'dashboard/graph/disabled.phtml'
-            )->setConfigUrl(
-                $this->getUrl(
-                    'adminhtml/system_config/edit',
-                    ['section' => 'admin', '_fragment' => 'admin_dashboard-link']
-                )
-            );
-        }
-        $this->setChild('diagrams', $block);
-
-        $this->addChild('grids', \Magento\Backend\Block\Dashboard\Grids::class);
-
-        parent::_prepareLayout();
-    }
-
-    /**
+     * Get url for switch action
+     *
      * @return string
      */
     public function getSwitchUrl()

app/code/Magento/Backend/Block/Dashboard.php

@@ -7,6 +7,8 @@
 
 /**
  * Adminhtml dashboard diagram tabs
+ * @deprecated dashboard graphs were migrated to dynamic chart.js solution
+ * @see dashboard.diagrams in adminhtml_dashboard_index.xml
  *
  * @author      Magento Core Team <[email protected]>
  */
@@ -18,6 +20,8 @@ class Diagrams extends \Magento\Backend\Block\Widget\Tabs
     protected $_template = 'Magento_Backend::widget/tabshoriz.phtml';
 
     /**
+     * Internal constructor, that is called from real constructor
+     *
      * @return void
      */
     protected function _construct()
@@ -28,6 +32,8 @@ protected function _construct()
     }
 
     /**
+     * Preparing global layout
+     *
      * @return $this
      */
     protected function _prepareLayout()

app/code/Magento/Backend/Block/Dashboard/Diagrams.php

@@ -9,6 +9,8 @@
 
 /**
  * Adminhtml dashboard google chart block
+ * @deprecated dashboard graphs were migrated to dynamic chart.js solution
+ * @see dashboard.chart.amounts and dashboard.chart.orders in adminhtml_dashboard_index.xml
  *
  * @author     Magento Core Team <[email protected]>
  */

app/code/Magento/Backend/Block/Dashboard/Graph.php

@@ -3,21 +3,29 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Backend\Block\Dashboard;
 
+use Magento\Backend\Block\Dashboard\Tab\Products\Ordered;
+use Magento\Backend\Block\Widget\Tabs;
+
 /**
  * Adminhtml dashboard bottom tabs
  *
+ * @api
  * @author      Magento Core Team <[email protected]>
  */
-class Grids extends \Magento\Backend\Block\Widget\Tabs
+class Grids extends Tabs
 {
     /**
      * @var string
      */
     protected $_template = 'Magento_Backend::widget/tabshoriz.phtml';
 
     /**
+     * Internal constructor, that is called from real constructor
+     *
      * @return void
      */
     protected function _construct()
@@ -49,7 +57,7 @@ protected function _prepareLayout()
             [
                 'label' => __('Bestsellers'),
                 'content' => $this->getLayout()->createBlock(
-                    \Magento\Backend\Block\Dashboard\Tab\Products\Ordered::class
+                    Ordered::class
                 )->toHtml(),
                 'active' => true
             ]

app/code/Magento/Backend/Block/Dashboard/Grids.php

@@ -5,36 +5,42 @@
  */
 namespace Magento\Backend\Block\Dashboard\Orders;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Helper\Data;
+use Magento\Framework\Module\Manager;
+use Magento\Reports\Model\ResourceModel\Order\CollectionFactory;
+
 /**
  * Adminhtml dashboard recent orders grid
  *
+ * @api
  * @author      Magento Core Team <[email protected]>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  */
 class Grid extends \Magento\Backend\Block\Dashboard\Grid
 {
     /**
-     * @var \Magento\Reports\Model\ResourceModel\Order\CollectionFactory
+     * @var CollectionFactory
      */
     protected $_collectionFactory;
 
     /**
-     * @var \Magento\Framework\Module\Manager
+     * @var Manager
      */
     protected $_moduleManager;
 
     /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Backend\Helper\Data $backendHelper
-     * @param \Magento\Framework\Module\Manager $moduleManager
-     * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
+     * @param Context $context
+     * @param Data $backendHelper
+     * @param Manager $moduleManager
+     * @param CollectionFactory $collectionFactory
      * @param array $data
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Backend\Helper\Data $backendHelper,
-        \Magento\Framework\Module\Manager $moduleManager,
-        \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
+        Context $context,
+        Data $backendHelper,
+        Manager $moduleManager,
+        CollectionFactory $collectionFactory,
         array $data = []
     ) {
         $this->_moduleManager = $moduleManager;

app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php

@@ -3,35 +3,42 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Backend\Block\Dashboard;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\Module\Manager;
+use Magento\Reports\Model\ResourceModel\Order\CollectionFactory;
+
 /**
  * Adminhtml dashboard sales statistics bar
  *
+ * @api
  * @author      Magento Core Team <[email protected]>
  */
-class Sales extends \Magento\Backend\Block\Dashboard\Bar
+class Sales extends Bar
 {
     /**
      * @var string
      */
     protected $_template = 'Magento_Backend::dashboard/salebar.phtml';
 
     /**
-     * @var \Magento\Framework\Module\Manager
+     * @var Manager
      */
     protected $_moduleManager;
 
     /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
-     * @param \Magento\Framework\Module\Manager $moduleManager
+     * @param Context $context
+     * @param CollectionFactory $collectionFactory
+     * @param Manager $moduleManager
      * @param array $data
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
-        \Magento\Framework\Module\Manager $moduleManager,
+        Context $context,
+        CollectionFactory $collectionFactory,
+        Manager $moduleManager,
         array $data = []
     ) {
         $this->_moduleManager = $moduleManager;

app/code/Magento/Backend/Block/Dashboard/Sales.php

@@ -4,13 +4,15 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Backend\Block\Dashboard\Tab;
+
 /**
  * Adminhtml dashboard order amounts diagram
+ * @deprecated dashboard graphs were migrated to dynamic chart.js solution
+ * @see dashboard.chart.amounts in adminhtml_dashboard_index.xml
  *
  * @author     Magento Core Team <[email protected]>
  */
-namespace Magento\Backend\Block\Dashboard\Tab;
-
 class Amounts extends \Magento\Backend\Block\Dashboard\Graph
 {
     /**

app/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php

@@ -4,13 +4,15 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Backend\Block\Dashboard\Tab;
+
 /**
  * Adminhtml dashboard orders diagram
+ * @deprecated dashboard graphs were migrated to dynamic chart.js solution
+ * @see dashboard.chart.orders in adminhtml_dashboard_index.xml
  *
  * @author     Magento Core Team <[email protected]>
  */
-namespace Magento\Backend\Block\Dashboard\Tab;
-
 class Orders extends \Magento\Backend\Block\Dashboard\Graph
 {
     /**