From a68ec0cf9629be67b4cbae21ce2be25b09e6477e Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Mon, 6 Mar 2023 22:29:43 +0000 Subject: [PATCH 1/3] Remove forbidden @author tag --- app/code/Magento/Backup/Block/Adminhtml/Backup.php | 1 - .../Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php | 2 -- .../Magento/Backup/Block/Adminhtml/Grid/Column/Rollback.php | 2 -- app/code/Magento/Backup/Controller/Adminhtml/Index.php | 1 - app/code/Magento/Backup/Model/Config/Source/Type.php | 1 - app/code/Magento/Backup/Model/Grid/Options.php | 2 -- .../Product/Composite/Fieldset/Options/Type/Checkbox.php | 1 - .../Catalog/Product/Composite/Fieldset/Options/Type/Multi.php | 1 - .../Catalog/Product/Composite/Fieldset/Options/Type/Radio.php | 1 - .../Catalog/Product/Composite/Fieldset/Options/Type/Select.php | 1 - .../Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php | 2 -- .../Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php | 2 -- .../Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php | 2 -- .../Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php | 2 -- .../Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php | 2 -- .../Catalog/Product/Edit/Tab/Bundle/Option/Selection.php | 2 -- .../Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php | 2 -- app/code/Magento/Bundle/Helper/Data.php | 2 -- 18 files changed, 29 deletions(-) diff --git a/app/code/Magento/Backup/Block/Adminhtml/Backup.php b/app/code/Magento/Backup/Block/Adminhtml/Backup.php index 2a41008055773..291f4a348eeed 100644 --- a/app/code/Magento/Backup/Block/Adminhtml/Backup.php +++ b/app/code/Magento/Backup/Block/Adminhtml/Backup.php @@ -11,7 +11,6 @@ * Adminhtml backup page content block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Backup extends \Magento\Backend\Block\Template 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 index 4e51bdf1705e4..969beb5f5b5db 100644 --- 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 */ 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 index b584794b0efee..fe8c3653d3a9d 100644 --- 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 */ 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 index 64052254f5233..062d03e6d0e92 100644 --- a/app/code/Magento/Backup/Controller/Adminhtml/Index.php +++ b/app/code/Magento/Backup/Controller/Adminhtml/Index.php @@ -12,7 +12,6 @@ /** * Backup admin controller * - * @author Magento Core Team * @api * @since 100.0.2 * @SuppressWarnings(PHPMD.AllPurposeAction) diff --git a/app/code/Magento/Backup/Model/Config/Source/Type.php b/app/code/Magento/Backup/Model/Config/Source/Type.php index d8a7f139a1710..c68c52c5732e1 100644 --- a/app/code/Magento/Backup/Model/Config/Source/Type.php +++ b/app/code/Magento/Backup/Model/Config/Source/Type.php @@ -8,7 +8,6 @@ /** * Backups types' source model for system configuration * - * @author Magento Core Team * @api * @since 100.0.2 */ diff --git a/app/code/Magento/Backup/Model/Grid/Options.php b/app/code/Magento/Backup/Model/Grid/Options.php index 762b8ddc3e518..c4b0ede84f546 100644 --- a/app/code/Magento/Backup/Model/Grid/Options.php +++ b/app/code/Magento/Backup/Model/Grid/Options.php @@ -6,8 +6,6 @@ /** * Backup types option array - * - * @author Magento Core Team */ namespace Magento\Backup\Model\Grid; 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 index 05a2a51c51213..46be0055f86ac 100644 --- 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 * @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 index af3642995a6c4..858fcb9eb0ffd 100644 --- 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 * @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 index a9b8f7880cac3..06aa0491df622 100644 --- 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 * @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 index 948d0c4a84c92..4aa6a744410cb 100644 --- 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 * @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 index 91b015782fe1f..0ade7f91b89f5 100644 --- 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,8 +8,6 @@ /** * Bundle Extended Attributes Block. - * - * @author Magento Core Team */ class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element { 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 index b3e52e5560cc2..0cafcb3071811 100644 --- 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,8 +7,6 @@ /** * Bundle Special Price Attribute Block - * - * @author Magento Core Team */ class Special extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element { 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 index 8be512a3e6348..a73d3fceaa60d 100644 --- 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 */ class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\Block\Widget\Tab\TabInterface { 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 index cf4814d3cd778..79a12dc7d021c 100644 --- 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 */ class Search extends \Magento\Backend\Block\Widget { 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 index 965d81ba59c47..7ac7ecdf7ea26 100644 --- 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 */ 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 index cf88f9b93d32f..d7928e8eb0c27 100644 --- 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 */ class Selection extends \Magento\Backend\Block\Widget { 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 index d8e0bcafa8ca9..30bc31d814b2a 100644 --- 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 */ class Tabs extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs { diff --git a/app/code/Magento/Bundle/Helper/Data.php b/app/code/Magento/Bundle/Helper/Data.php index 944876cbdad72..e1f8fbfca0506 100644 --- 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 */ class Data extends \Magento\Framework\App\Helper\AbstractHelper { From 2b10dd5a13c09bf781e3a5fd85718e74a5506bcc Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 14 Mar 2023 17:33:35 +0000 Subject: [PATCH 2/3] Fix static test failures --- .../Magento/Backup/Block/Adminhtml/Backup.php | 8 ++++--- .../Backup/Controller/Adminhtml/Index.php | 5 ++--- .../Backup/Model/Config/Source/Type.php | 4 +--- .../Magento/Backup/Model/Grid/Options.php | 6 ++--- .../Product/Edit/Tab/Attributes/Extend.php | 9 +++----- .../Product/Edit/Tab/Attributes/Special.php | 2 ++ .../Catalog/Product/Edit/Tab/Bundle.php | 22 +++++++++++++++++-- .../Product/Edit/Tab/Bundle/Option/Search.php | 2 ++ .../Edit/Tab/Bundle/Option/Selection.php | 4 ---- .../Adminhtml/Catalog/Product/Edit/Tabs.php | 4 +++- 10 files changed, 41 insertions(+), 25 deletions(-) diff --git a/app/code/Magento/Backup/Block/Adminhtml/Backup.php b/app/code/Magento/Backup/Block/Adminhtml/Backup.php index 291f4a348eeed..09e28c371fbbe 100644 --- a/app/code/Magento/Backup/Block/Adminhtml/Backup.php +++ b/app/code/Magento/Backup/Block/Adminhtml/Backup.php @@ -16,14 +16,14 @@ class Backup extends \Magento\Backend\Block\Template { /** - * Block's template - * * @var string */ protected $_template = 'Magento_Backup::backup/list.phtml'; /** - * @return AbstractBlock|void + * Prepare the layout + * + * @return void */ protected function _prepareLayout() { @@ -61,6 +61,8 @@ protected function _prepareLayout() } /** + * Return HTML for the backups grid + * * @return string */ public function getGridHtml() diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index.php index 062d03e6d0e92..3548bc74a8aaf 100644 --- a/app/code/Magento/Backup/Controller/Adminhtml/Index.php +++ b/app/code/Magento/Backup/Controller/Adminhtml/Index.php @@ -12,6 +12,7 @@ /** * Backup admin controller * + * @phpcs:ignore Magento2.Classes.AbstractApi.AbstractApi * @api * @since 100.0.2 * @SuppressWarnings(PHPMD.AllPurposeAction) @@ -23,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 index c68c52c5732e1..a607116eaf3d3 100644 --- a/app/code/Magento/Backup/Model/Config/Source/Type.php +++ b/app/code/Magento/Backup/Model/Config/Source/Type.php @@ -14,8 +14,6 @@ class Type implements \Magento\Framework\Option\ArrayInterface { /** - * Backup data - * * @var \Magento\Backup\Helper\Data */ protected $_backupData = null; @@ -29,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 index c4b0ede84f546..f8b0ed8d1ea11 100644 --- a/app/code/Magento/Backup/Model/Grid/Options.php +++ b/app/code/Magento/Backup/Model/Grid/Options.php @@ -4,12 +4,11 @@ * See COPYING.txt for license details. */ -/** - * Backup types option array - */ namespace Magento\Backup\Model\Grid; /** + * Backup types option array + * * @api * @since 100.0.2 */ @@ -30,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/Edit/Tab/Attributes/Extend.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php index 0ade7f91b89f5..c1a704ebb1f96 100644 --- 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 @@ -12,17 +12,14 @@ 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 index 0cafcb3071811..750e9d59cb9b7 100644 --- 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 @@ -11,6 +11,8 @@ 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 index a73d3fceaa60d..9e2d96501628d 100644 --- 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 @@ -21,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; @@ -42,6 +40,8 @@ public function __construct( } /** + * Return tab URL + * * @return string */ public function getTabUrl() @@ -50,6 +50,8 @@ public function getTabUrl() } /** + * Return tab CSS class + * * @return string */ public function getTabClass() @@ -98,6 +100,8 @@ public function isReadonly() } /** + * Return HTML for add button + * * @return string */ public function getAddButtonHtml() @@ -106,6 +110,8 @@ public function getAddButtonHtml() } /** + * Return HTML for options box + * * @return string */ public function getOptionsBoxHtml() @@ -114,6 +120,8 @@ public function getOptionsBoxHtml() } /** + * Return field suffix + * * @return string */ public function getFieldSuffix() @@ -122,6 +130,8 @@ public function getFieldSuffix() } /** + * Return product from core registry + * * @return mixed */ public function getProduct() @@ -130,6 +140,8 @@ public function getProduct() } /** + * Return tab label + * * @return \Magento\Framework\Phrase */ public function getTabLabel() @@ -138,6 +150,8 @@ public function getTabLabel() } /** + * Return tab title + * * @return \Magento\Framework\Phrase */ public function getTabTitle() @@ -146,6 +160,8 @@ public function getTabTitle() } /** + * Return true always + * * @return bool */ public function canShowTab() @@ -154,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 index 79a12dc7d021c..219e135266349 100644 --- 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 @@ -16,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/Selection.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php index d7928e8eb0c27..5f6496479d831 100644 --- 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 @@ -16,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 index 30bc31d814b2a..d1c6a19474df9 100644 --- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php +++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php @@ -16,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() { From 2faf86aa64e4898779a2217e18e1b18b9f9b0256 Mon Sep 17 00:00:00 2001 From: Indrani Sonawane Date: Wed, 12 Jun 2024 12:55:31 +0530 Subject: [PATCH 3/3] Updated the code to take care SVC and static test failures --- app/code/Magento/Backup/Block/Adminhtml/Backup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Backup/Block/Adminhtml/Backup.php b/app/code/Magento/Backup/Block/Adminhtml/Backup.php index 09e28c371fbbe..cc1a8a4d234b2 100644 --- a/app/code/Magento/Backup/Block/Adminhtml/Backup.php +++ b/app/code/Magento/Backup/Block/Adminhtml/Backup.php @@ -23,7 +23,7 @@ class Backup extends \Magento\Backend\Block\Template /** * Prepare the layout * - * @return void + * @return AbstractBlock|void */ protected function _prepareLayout() {