Merge branch '2.4-develop' into AC-15165-updated

Author: admanesachin

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/Backup/Block/Adminhtml/Backup.php

@@ -11,19 +11,18 @@
  * Adminhtml backup page content block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Backup extends \Magento\Backend\Block\Template
 {
     /**
-     * Block's template
-     *
      * @var string
      */
     protected $_template = 'Magento_Backup::backup/list.phtml';
 
     /**
+     * Prepare the layout
+     *
      * @return AbstractBlock|void
      */
     protected function _prepareLayout()
@@ -62,6 +61,8 @@ protected function _prepareLayout()
     }
 
     /**
+     * Return HTML for the backups grid
+     *
      * @return string
      */
     public function getGridHtml()

app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php

@@ -6,8 +6,6 @@
 
 /**
  * Backup grid item renderer
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Backup\Block\Adminhtml\Grid\Column\Renderer;
 

app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Rollback.php

@@ -6,8 +6,6 @@
 
 /**
  * Grid column block that is displayed only if rollback allowed
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Backup\Block\Adminhtml\Grid\Column;
 

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

@@ -12,7 +12,7 @@
 /**
  * Backup admin controller
  *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @phpcs:ignore Magento2.Classes.AbstractApi.AbstractApi
  * @api
  * @since 100.0.2
  * @SuppressWarnings(PHPMD.AllPurposeAction)
@@ -24,11 +24,9 @@ abstract class Index extends Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Backup::backup';
+    public const ADMIN_RESOURCE = 'Magento_Backup::backup';
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;

app/code/Magento/Backup/Model/Config/Source/Type.php

@@ -8,15 +8,12 @@
 /**
  * Backups types' source model for system configuration
  *
- * @author     Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
  */
 class Type implements \Magento\Framework\Option\ArrayInterface
 {
     /**
-     * Backup data
-     *
      * @var \Magento\Backup\Helper\Data
      */
     protected $_backupData = null;
@@ -30,7 +27,7 @@ public function __construct(\Magento\Backup\Helper\Data $backupData)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function toOptionArray()
     {

app/code/Magento/Backup/Model/Grid/Options.php

@@ -4,14 +4,11 @@
  * All Rights Reserved.
  */
 
-/**
- * Backup types option array
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Backup\Model\Grid;
 
 /**
+ * Backup types option array
+ *
  * @api
  * @since 100.0.2
  */
@@ -32,6 +29,7 @@ public function __construct(\Magento\Backup\Helper\Data $backupHelper)
 
     /**
      * Return backup types array
+     *
      * @return array
      */
     public function toOptionArray()

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php

@@ -12,7 +12,6 @@
  * Bundle option checkbox type renderer
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php

@@ -12,7 +12,6 @@
  * Bundle option multi select type renderer
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php

@@ -12,7 +12,6 @@
  * Bundle option radiobox type renderer
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio