Merge remote-tracking branch '36979/no-author/backup-bundle' into commpr-10131-0608

del10131 · del10131 · commit 6b275b30af42 · 2025-08-06T16:52:44.000+05:30
diff --git a/app/code/Magento/Backup/Block/Adminhtml/Backup.php b/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()
diff --git a/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php b/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;
 
diff --git a/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Rollback.php b/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;
 
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index.php b/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;
diff --git a/app/code/Magento/Backup/Model/Config/Source/Type.php b/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()
     {
diff --git a/app/code/Magento/Backup/Model/Grid/Options.php b/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()
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/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
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/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
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php b/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
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
@@ -12,7 +12,6 @@
  * Bundle option dropdown type renderer
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
@@ -8,23 +8,18 @@
 
 /**
  * Bundle Extended Attributes Block.
- *
- * @author Magento Core Team <core@magentocommerce.com>
  */
 class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
 {
     /**
-     * Initialize block template
+     * @var string
      */
     private $template = 'Magento_Bundle::catalog/product/edit/tab/attributes/extend.phtml';
 
-    const DYNAMIC = 0;
-
-    const FIXED = 1;
+    public const DYNAMIC = 0;
+    public const FIXED = 1;
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php
@@ -7,12 +7,12 @@
 
 /**
  * Bundle Special Price Attribute Block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Special extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
 {
     /**
+     * Return the HTML for this element
+     *
      * @return string
      */
     public function getElementHtml()
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -7,8 +7,6 @@
 
 /**
  * Adminhtml catalog product bundle items tab block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
@@ -23,8 +21,6 @@ class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
     protected $_template = 'Magento_Bundle::product/edit/bundle.phtml';
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
@@ -44,6 +40,8 @@ public function __construct(
     }
 
     /**
+     * Return tab URL
+     *
      * @return string
      */
     public function getTabUrl()
@@ -52,6 +50,8 @@ public function getTabUrl()
     }
 
     /**
+     * Return tab CSS class
+     *
      * @return string
      */
     public function getTabClass()
@@ -100,6 +100,8 @@ public function isReadonly()
     }
 
     /**
+     * Return HTML for add button
+     *
      * @return string
      */
     public function getAddButtonHtml()
@@ -108,6 +110,8 @@ public function getAddButtonHtml()
     }
 
     /**
+     * Return HTML for options box
+     *
      * @return string
      */
     public function getOptionsBoxHtml()
@@ -116,6 +120,8 @@ public function getOptionsBoxHtml()
     }
 
     /**
+     * Return field suffix
+     *
      * @return string
      */
     public function getFieldSuffix()
@@ -124,6 +130,8 @@ public function getFieldSuffix()
     }
 
     /**
+     * Return product from core registry
+     *
      * @return mixed
      */
     public function getProduct()
@@ -132,6 +140,8 @@ public function getProduct()
     }
 
     /**
+     * Return tab label
+     *
      * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
@@ -140,6 +150,8 @@ public function getTabLabel()
     }
 
     /**
+     * Return tab title
+     *
      * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
@@ -148,6 +160,8 @@ public function getTabTitle()
     }
 
     /**
+     * Return true always
+     *
      * @return bool
      */
     public function canShowTab()
@@ -156,6 +170,8 @@ public function canShowTab()
     }
 
     /**
+     * Return false always
+     *
      * @return bool
      */
     public function isHidden()
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
@@ -7,8 +7,6 @@
 
 /**
  * Bundle selection product block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Search extends \Magento\Backend\Block\Widget
 {
@@ -18,6 +16,8 @@ class Search extends \Magento\Backend\Block\Widget
     protected $_template = 'Magento_Bundle::product/edit/bundle/option/search.phtml';
 
     /**
+     * Initialise the block
+     *
      * @return void
      */
     protected function _construct()
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
@@ -7,8 +7,6 @@
 
 /**
  * Bundle selection product grid
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -7,8 +7,6 @@
 
 /**
  * Bundle selection renderer
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Selection extends \Magento\Backend\Block\Widget
 {
@@ -18,15 +16,11 @@ class Selection extends \Magento\Backend\Block\Widget
     protected $_template = 'Magento_Bundle::product/edit/bundle/option/selection.phtml';
 
     /**
-     * Catalog data
-     *
      * @var \Magento\Catalog\Helper\Data
      */
     protected $_catalogData = null;
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
@@ -7,8 +7,6 @@
 
 /**
  * Adminhtml product edit tabs
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Tabs extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs
 {
@@ -18,7 +16,9 @@ class Tabs extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs
     protected $_attributeTabBlock = \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes::class;
 
     /**
-     * @return $this|void
+     * Prepare the layout
+     *
+     * @return void
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Bundle/Helper/Data.php b/app/code/Magento/Bundle/Helper/Data.php
@@ -7,8 +7,6 @@
 
 /**
  * Bundle helper
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {

-Original file line number
+Diff line change
 /**
  * Backup grid item renderer
 - *
 - * @author     Magento Core Team <[email protected]>
  */
 namespace Magento\Backup\Block\Adminhtml\Grid\Column\Renderer;
Original file line number	Diff line number	Diff line change
`@@ -8,15 +8,12 @@`
`8`	`8`	`/**`
`9`	`9`	`* Backups types' source model for system configuration`
`10`	`10`	`*`
`11`		`- * @author Magento Core Team <[email protected]>`
`12`	`11`	`* @api`
`13`	`12`	`* @since 100.0.2`
`14`	`13`	`*/`
`15`	`14`	`class Type implements \Magento\Framework\Option\ArrayInterface`
`16`	`15`	`{`
`17`	`16`	`/**`
`18`		`- * Backup data`
`19`		`- *`
`20`	`17`	`* @var \Magento\Backup\Helper\Data`
`21`	`18`	`*/`
`22`	`19`	`protected $_backupData = null;`
`@@ -30,7 +27,7 @@ public function __construct(\Magento\Backup\Helper\Data $backupData)`
`30`	`27`	`}`
`31`	`28`
`32`	`29`	`/**`
`33`		`- * {@inheritdoc}`
	`30`	`+ * @inheritDoc`
`34`	`31`	`*/`
`35`	`32`	`public function toOptionArray()`
`36`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`* Bundle option checkbox type renderer`
`13`	`13`	`*`
`14`	`14`	`* @api`
`15`		`- * @author Magento Core Team <[email protected]>`
`16`	`15`	`* @since 100.0.2`
`17`	`16`	`*/`
`18`	`17`	`class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox`