Merge remote-tracking branch 'core/2.4-develop' into 2.4-develop-pagination-fix

Author: lbajsarowicz

app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php

@@ -6,17 +6,23 @@
 
 namespace Magento\AsynchronousOperations\Controller\Adminhtml\Index;
 
-class Index extends \Magento\Backend\App\Action
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\View\Result\Page;
+use Magento\Framework\View\Result\PageFactory;
+
+class Index extends Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Logging::system_magento_logging_bulk_operations';
+    public const ADMIN_RESOURCE = 'Magento_Logging::system_magento_logging_bulk_operations';
 
     /**
-     * @var \Magento\Framework\View\Result\PageFactory
+     * @var PageFactory
      */
     private $resultPageFactory;
 
@@ -26,33 +32,24 @@ class Index extends \Magento\Backend\App\Action
     private $menuId;
 
     /**
-     * Details constructor.
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param Context $context
+     * @param PageFactory $resultPageFactory
      * @param string $menuId
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        Context $context,
+        PageFactory $resultPageFactory,
         $menuId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations'
     ) {
         $this->resultPageFactory = $resultPageFactory;
         $this->menuId = $menuId;
         parent::__construct($context);
     }
 
-    /**
-     * @inheritDoc
-     */
-    protected function _isAllowed()
-    {
-        return parent::_isAllowed();
-    }
-
     /**
      * Bulk list action
      *
-     * @return \Magento\Framework\View\Result\Page
+     * @return Page
      */
     public function execute()
     {

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

@@ -10,8 +10,6 @@
 
 /**
  * Adminhtml dashboard tab abstract
- *
- * @author      Magento Core Team <[email protected]>
  */
 abstract class AbstractDashboard extends \Magento\Backend\Block\Widget
 {
@@ -40,6 +38,8 @@ public function __construct(
     }
 
     /**
+     * Return a collection
+     *
      * @return array|AbstractCollection|\Magento\Eav\Model\Entity\Collection\Abstract
      */
     public function getCollection()
@@ -48,6 +48,8 @@ public function getCollection()
     }
 
     /**
+     * Return items count
+     *
      * @return int
      */
     public function getCount()
@@ -66,6 +68,8 @@ public function getDataHelper()
     }
 
     /**
+     * Prepare any data for display, if required
+     *
      * @return $this
      */
     protected function _prepareData()
@@ -74,6 +78,8 @@ protected function _prepareData()
     }
 
     /**
+     * Ensure data is prepared before layout
+     *
      * @return $this
      */
     protected function _prepareLayout()

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

@@ -10,8 +10,6 @@
 
 /**
  * Adminhtml dashboard bar block
- *
- * @author      Magento Core Team <[email protected]>
  */
 class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
 {

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

@@ -9,8 +9,6 @@
  * 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]>
  */
 class Diagrams extends \Magento\Backend\Block\Widget\Tabs
 {

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

@@ -11,37 +11,27 @@
  * 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]>
  */
 class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
 {
-    const API_URL = 'https://image-charts.com/chart';
+    public const API_URL = 'https://image-charts.com/chart';
 
     /**
-     * All series
-     *
      * @var array
      */
     protected $_allSeries = [];
 
     /**
-     * Axis labels
-     *
      * @var array
      */
     protected $_axisLabels = [];
 
     /**
-     * Axis maps
-     *
      * @var array
      */
     protected $_axisMaps = [];
 
     /**
-     * Data rows
-     *
      * @var array
      */
     protected $_dataRows = [];
@@ -78,6 +68,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
      * Google chart api data encoding
      *
      * @deprecated 101.0.2 since the Google Image Charts API not accessible from March 14, 2019
+     * @see Nothing
      * @var string
      */
     protected $_encoding = 'e';

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

@@ -8,7 +8,6 @@
 /**
  * Adminhtml dashboard grid
  *
- * @author      Magento Core Team <[email protected]>
  * @api
  * @since 100.0.2
  */

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

@@ -14,7 +14,6 @@
  * Adminhtml dashboard bottom tabs
  *
  * @api
- * @author      Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class Grids extends Tabs

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

@@ -15,7 +15,6 @@
  * Adminhtml dashboard sales statistics bar
  *
  * @api
- * @author      Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class Sales extends Bar

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

@@ -10,8 +10,6 @@
  * 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]>
  */
 class Amounts extends \Magento\Backend\Block\Dashboard\Graph
 {

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

@@ -10,8 +10,6 @@
  * 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]>
  */
 class Orders extends \Magento\Backend\Block\Dashboard\Graph
 {