From 16994379555f2f88389e0d4a485430e3caf4fc4a Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 7 Mar 2023 09:52:24 +0000 Subject: [PATCH 1/2] Remove forbidden @author tag --- .../Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php | 2 -- .../Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php | 2 -- .../Catalog/Block/Adminhtml/Category/Helper/Pricestep.php | 2 -- .../Block/Adminhtml/Category/Helper/Sortby/Available.php | 2 -- .../Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php | 2 -- .../Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php | 2 -- .../Catalog/Block/Adminhtml/Category/Widget/Chooser.php | 2 -- app/code/Magento/Catalog/Block/Adminhtml/Form.php | 2 -- .../Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php | 2 -- .../Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php | 2 -- .../Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php | 2 -- .../Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php | 2 -- .../Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php | 2 -- app/code/Magento/Catalog/Block/Adminhtml/Product.php | 2 -- app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php | 2 -- .../Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php | 2 -- .../Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php | 2 -- .../Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php | 2 -- .../Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php | 2 -- .../Block/Adminhtml/Product/Attribute/Edit/Tab/System.php | 2 -- .../Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php | 2 -- .../Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php | 2 -- .../Product/Attribute/NewAttribute/Product/Attributes.php | 2 -- .../Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php | 3 --- .../Adminhtml/Product/Attribute/Set/Main/Formattribute.php | 3 --- .../Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php | 3 --- .../Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php | 3 --- .../Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php | 3 --- .../Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php | 2 -- .../Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php | 2 -- 30 files changed, 65 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php index 8fdd6de99ad1c..5d45a29d01241 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php @@ -6,8 +6,6 @@ /** * Categories tree with checkboxes - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Category\Checkboxes; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php index 550caf585b8f8..4258764d8b882 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php @@ -6,8 +6,6 @@ /** * Category form image field helper - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Category\Helper; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php index acffce3ca0b8c..c1ab3d7bac2d0 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php @@ -6,8 +6,6 @@ /** * Adminhtml additional helper block for sort by - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Category\Helper; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php index b0f00d0f2b04b..0b871093d4028 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php @@ -6,8 +6,6 @@ /** * Adminhtml additional helper block for sort by - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php index e0836a0d7cb25..c81344a99768f 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php @@ -6,8 +6,6 @@ /** * Adminhtml additional helper block for sort by - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php index 20bd1b379beef..f81ea1b39c234 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php @@ -6,8 +6,6 @@ /** * Product in category grid - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Category\Tab; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php index 9c83d4aea61c7..0104886523c43 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php @@ -6,8 +6,6 @@ /** * Category chooser for Wysiwyg CMS widget - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Category\Widget; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Form.php index efc692a62a742..b3bfd3a008486 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Form.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Form.php @@ -6,8 +6,6 @@ /** * Base block for rendering category and product forms - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php index d927378012f1c..a025ce5ad8bbf 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php @@ -6,8 +6,6 @@ /** * Catalog Custom Options Config Renderer - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Config; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php index cd6c5021f0cc9..b86cefca0e57f 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php @@ -6,8 +6,6 @@ /** * Catalog Custom Options Config Renderer - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Config; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php index 8f1d1dcf7eedf..f31f296729b46 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php @@ -8,8 +8,6 @@ /** * Catalog fieldset element renderer - * - * @author Magento Core Team */ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element { diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php index 48753bfd6efb4..30568258f1c47 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php @@ -6,8 +6,6 @@ /** * Catalog textarea attribute WYSIWYG button - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Helper\Form; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php index f8ea447879e93..5929ee80f72e3 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php @@ -6,8 +6,6 @@ /** * Textarea attribute WYSIWYG content - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Product.php index 00a4b605fba40..f6f56115012a2 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product.php @@ -6,8 +6,6 @@ /** * Catalog manage products block - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php index 98fcc03e6511f..8299017d6d9b0 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php @@ -7,8 +7,6 @@ /** * Adminhtml catalog product attributes block - * - * @author Magento Core Team */ class Attribute extends \Magento\Backend\Block\Widget\Grid\Container { diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php index 7919708aaa8af..d5e7f34f70d3a 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php @@ -6,8 +6,6 @@ /** * Product attribute add/edit form block - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php index a0ca53dce4f50..2438776517011 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php @@ -6,8 +6,6 @@ /** * Product attribute add/edit form main tab - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php index 514b224c5332c..68a3fcf59813d 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php @@ -6,8 +6,6 @@ /** * Product attribute add/edit form main tab - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php index 560be70a789fd..8ce74b0be74aa 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php @@ -9,8 +9,6 @@ * * @method \Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Options setReadOnly(bool $value) * @method null|bool getReadOnly() - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php index cb9f9a0525068..b0a9967849af6 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php @@ -6,8 +6,6 @@ /** * Product attribute add/edit form system tab - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php index 5e03028c9a1f2..0f26eff1c9607 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php @@ -6,8 +6,6 @@ /** * Adminhtml product attribute edit page tabs - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php index 66e04ef03f771..d1b90dd62ddc6 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php @@ -6,8 +6,6 @@ /** * Product attributes grid - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php index a9b10d97ec006..6274eff897078 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php @@ -6,8 +6,6 @@ /** * Product attributes tab - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\NewAttribute\Product; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php index 3b9036c1fbbc0..9a49e53d48553 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php @@ -5,9 +5,6 @@ */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set; -/** - * @author Magento Core Team - */ use Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface; /** diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php index 1b0ab706e7d47..e252535e2e11b 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php @@ -4,9 +4,6 @@ * See COPYING.txt for license details. */ -/** - * @author Magento Core Team - */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main; use Magento\Backend\Block\Widget\Form; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php index 26ffc6e0df3d9..06826ec0b645a 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php @@ -4,9 +4,6 @@ * See COPYING.txt for license details. */ -/** - * @author Magento Core Team - */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main; use Magento\Backend\Block\Widget\Form; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php index cb0a739b56e4e..d914c521088f6 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php @@ -4,9 +4,6 @@ * See COPYING.txt for license details. */ -/** - * @author Magento Core Team - */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Tree; class Attribute extends \Magento\Backend\Block\Template diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php index 93c2dcc76263c..bda48b098ae93 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php @@ -4,9 +4,6 @@ * See COPYING.txt for license details. */ -/** - * @author Magento Core Team - */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Tree; class Group extends \Magento\Backend\Block\Template diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php index f69e58985bfc5..ba86deb79fe3c 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php @@ -6,8 +6,6 @@ /** * description - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php index e29ab26065dc3..baf5763b46a64 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php @@ -6,8 +6,6 @@ /** * Adminhtml catalog product sets main page toolbar - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar; From 2cb115a2d524156841cb85d098adf048c9fd1698 Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 14 Mar 2023 18:00:23 +0000 Subject: [PATCH 2/2] Fix static test failures --- .../Block/Adminhtml/Category/Helper/Image.php | 2 ++ .../Block/Adminhtml/Category/Tab/Product.php | 21 +++++++++++++++++-- .../Adminhtml/Category/Widget/Chooser.php | 2 ++ .../Magento/Catalog/Block/Adminhtml/Form.php | 8 ++++--- .../Form/Renderer/Config/DateFieldsOrder.php | 8 ++++--- .../Form/Renderer/Config/YearRange.php | 8 ++++--- .../Form/Renderer/Fieldset/Element.php | 2 +- .../Adminhtml/Helper/Form/Wysiwyg/Content.php | 8 +++---- .../Block/Adminhtml/Product/Attribute.php | 2 ++ .../Adminhtml/Product/Attribute/Edit/Form.php | 8 ++++--- .../Product/Attribute/Edit/Tab/Front.php | 7 +++---- .../Product/Attribute/Edit/Tab/System.php | 8 ++++--- .../Adminhtml/Product/Attribute/Edit/Tabs.php | 9 +++++--- .../NewAttribute/Product/Attributes.php | 11 +++++++--- .../Adminhtml/Product/Attribute/Set/Main.php | 2 -- .../Attribute/Set/Main/Formattribute.php | 2 ++ .../Product/Attribute/Set/Toolbar/Add.php | 9 +++++--- .../Product/Attribute/Set/Toolbar/Main.php | 13 +++++++++--- 18 files changed, 89 insertions(+), 41 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php index 4258764d8b882..3fa01d7f7b82d 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php @@ -37,6 +37,8 @@ public function __construct( } /** + * Return the URL + * * @return bool|string */ protected function _getUrl() diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php index f81ea1b39c234..84e30dc0b03a2 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php @@ -19,8 +19,6 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Extended { /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry = null; @@ -66,6 +64,8 @@ public function __construct( } /** + * Initialise the block + * * @return void */ protected function _construct() @@ -77,6 +77,8 @@ protected function _construct() } /** + * Return the category from the core registry + * * @return array|null */ public function getCategory() @@ -85,6 +87,8 @@ public function getCategory() } /** + * Add a column filter to the collection + * * @param Column $column * @return $this */ @@ -108,6 +112,8 @@ protected function _addColumnFilterToCollection($column) } /** + * Prepare the collection + * * @return Grid */ protected function _prepareCollection() @@ -115,6 +121,7 @@ protected function _prepareCollection() if ($this->getCategory()->getId()) { $this->setDefaultFilter(['in_category' => 1]); } + $collection = $this->_productFactory->create()->getCollection()->addAttributeToSelect( 'name' )->addAttributeToSelect( @@ -137,6 +144,7 @@ protected function _prepareCollection() if ($storeId > 0) { $collection->addStoreFilter($storeId); } + $this->setCollection($collection); if ($this->getCategory()->getProductsReadonly()) { @@ -144,6 +152,7 @@ protected function _prepareCollection() if (empty($productIds)) { $productIds = 0; } + $this->getCollection()->addFieldToFilter('entity_id', ['in' => $productIds]); } @@ -151,6 +160,8 @@ protected function _prepareCollection() } /** + * Prepare the columns + * * @return Extended */ protected function _prepareColumns() @@ -168,6 +179,7 @@ protected function _prepareColumns() ] ); } + $this->addColumn( 'entity_id', [ @@ -228,6 +240,8 @@ protected function _prepareColumns() } /** + * Return the grid URL + * * @return string */ public function getGridUrl() @@ -236,6 +250,8 @@ public function getGridUrl() } /** + * Return the selected products + * * @return array */ protected function _getSelectedProducts() @@ -245,6 +261,7 @@ protected function _getSelectedProducts() $products = $this->getCategory()->getProductsPosition(); return array_keys($products); } + return $products; } } diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php index 0104886523c43..dba669bc5ca4a 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php @@ -25,6 +25,8 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree protected $_template = 'Magento_Catalog::catalog/category/widget/tree.phtml'; /** + * Initialise the block + * * @return void */ protected function _construct() diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Form.php index b3bfd3a008486..e3d8c1a045bcd 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Form.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Form.php @@ -4,16 +4,18 @@ * See COPYING.txt for license details. */ -/** - * Base block for rendering category and product forms - */ namespace Magento\Catalog\Block\Adminhtml; use Magento\Backend\Block\Widget\Form\Generic; +/** + * Base block for rendering category and product forms + */ class Form extends Generic { /** + * Prepare the layout + * * @return void */ protected function _prepareLayout() diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php index a025ce5ad8bbf..34b3814411bf8 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php @@ -4,17 +4,19 @@ * See COPYING.txt for license details. */ -/** - * Catalog Custom Options Config Renderer - */ namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Config; use Magento\Config\Block\System\Config\Form\Field; use Magento\Framework\Data\Form\Element\AbstractElement; +/** + * Catalog Custom Options Config Renderer + */ class DateFieldsOrder extends Field { /** + * Return the HTML for this element + * * @param AbstractElement $element * @return string * @SuppressWarnings(PHPMD.NPathComplexity) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php index b86cefca0e57f..2ede6c15eb767 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php @@ -4,17 +4,19 @@ * See COPYING.txt for license details. */ -/** - * Catalog Custom Options Config Renderer - */ namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Config; use Magento\Config\Block\System\Config\Form\Field; use Magento\Framework\Data\Form\Element\AbstractElement; +/** + * Catalog Custom Options Config Renderer + */ class YearRange extends Field { /** + * Return the HTML for this element + * * @param AbstractElement $element * @return string */ diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php index f31f296729b46..a2dc05cea07d6 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php @@ -12,7 +12,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element { /** - * Initialize block template + * @var string */ protected $_template = 'Magento_Catalog::catalog/form/renderer/fieldset/element.phtml'; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php index 5929ee80f72e3..e55e9f5c239a9 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php @@ -4,16 +4,13 @@ * See COPYING.txt for license details. */ -/** - * Textarea attribute WYSIWYG content - */ namespace Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg; use Magento\Backend\Block\Widget\Form; use Magento\Backend\Block\Widget\Form\Generic; /** - * Class Content + * Textarea attribute WYSIWYG content * * @deprecated 101.0.8 * @see \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav @@ -44,7 +41,8 @@ public function __construct( } /** - * Prepare form. + * Prepare the form + * * Adding editor field to render * * @return Form diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php index 8299017d6d9b0..c51889e100d43 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php @@ -11,6 +11,8 @@ class Attribute extends \Magento\Backend\Block\Widget\Grid\Container { /** + * Initialise the block + * * @return void */ protected function _construct() diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php index d5e7f34f70d3a..861ff83a40707 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php @@ -4,17 +4,19 @@ * See COPYING.txt for license details. */ -/** - * Product attribute add/edit form block - */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit; use Magento\Backend\Block\Widget\Form\Generic; use Magento\Framework\Data\Form as DataForm; +/** + * Product attribute add/edit form block + */ class Form extends Generic { /** + * Prepare the form + * * @return $this */ protected function _prepareForm() diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php index 2438776517011..72e06548a50fe 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php @@ -4,9 +4,6 @@ * See COPYING.txt for license details. */ -/** - * Product attribute add/edit form main tab - */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab; use Magento\Backend\Block\Template\Context; @@ -19,6 +16,8 @@ use Magento\Framework\Registry; /** + * Product attribute add/edit form main tab + * * @api * @since 100.0.2 */ @@ -56,7 +55,7 @@ public function __construct( } /** - * {@inheritdoc} + * @inheritDoc * @return $this * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php index b0a9967849af6..5ee3f37d8eafb 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php @@ -4,16 +4,18 @@ * See COPYING.txt for license details. */ -/** - * Product attribute add/edit form system tab - */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab; use Magento\Backend\Block\Widget\Form\Generic; +/** + * Product attribute add/edit form system tab + */ class System extends Generic { /** + * Prepare the form + * * @return $this */ protected function _prepareForm() diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php index 0f26eff1c9607..40a570e51667d 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php @@ -4,18 +4,19 @@ * See COPYING.txt for license details. */ -/** - * Adminhtml product attribute edit page tabs - */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit; /** + * Adminhtml product attribute edit page tabs + * * @api * @since 100.0.2 */ class Tabs extends \Magento\Backend\Block\Widget\Tabs { /** + * Initialise the block + * * @return void */ protected function _construct() @@ -27,6 +28,8 @@ protected function _construct() } /** + * Add tabs + * * @return $this */ protected function _beforeToHtml() diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php index 6274eff897078..00de4ddfcab4f 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php @@ -4,19 +4,20 @@ * See COPYING.txt for license details. */ -/** - * Product attributes tab - */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\NewAttribute\Product; use Magento\Backend\Block\Widget\Form; /** + * Product attributes tab + * * @SuppressWarnings(PHPMD.DepthOfInheritance) */ class Attributes extends \Magento\Catalog\Block\Adminhtml\Form { /** + * Prepare the form + * * @return void */ protected function _prepareForm() @@ -54,6 +55,8 @@ protected function _prepareForm() } /** + * Return an array of additional element types + * * @return array */ protected function _getAdditionalElementTypes() @@ -76,6 +79,8 @@ protected function _getAdditionalElementTypes() } /** + * Return HTML for this block + * * @return string */ protected function _toHtml() diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php index 9a49e53d48553..466809c091a51 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php @@ -22,8 +22,6 @@ class Main extends \Magento\Backend\Block\Template protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main.phtml'; /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry = null; diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php index e252535e2e11b..d92dea0b2dbab 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php @@ -11,6 +11,8 @@ class Formattribute extends \Magento\Backend\Block\Widget\Form\Generic { /** + * Prepare the form + * * @return void */ protected function _prepareForm() diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php index ba86deb79fe3c..b34d5a49c9d03 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php @@ -4,9 +4,6 @@ * See COPYING.txt for license details. */ -/** - * description - */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar; use Magento\Framework\View\Element\AbstractBlock; @@ -19,6 +16,8 @@ class Add extends \Magento\Backend\Block\Template protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/add.phtml'; /** + * Prepare the layout + * * @return AbstractBlock */ protected function _prepareLayout() @@ -51,6 +50,8 @@ protected function _prepareLayout() } /** + * Return header text + * * @return \Magento\Framework\Phrase */ protected function _getHeader() @@ -59,6 +60,8 @@ protected function _getHeader() } /** + * Return HTML for the form + * * @return string */ public function getFormHtml() diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php index baf5763b46a64..94cd8fad2a996 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php @@ -4,12 +4,11 @@ * See COPYING.txt for license details. */ -/** - * Adminhtml catalog product sets main page toolbar - */ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar; /** + * Adminhtml catalog product sets main page toolbar + * * @api * @since 100.0.2 */ @@ -21,6 +20,8 @@ class Main extends \Magento\Backend\Block\Template protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/main.phtml'; /** + * Prepare the layout + * * @return $this */ protected function _prepareLayout() @@ -38,6 +39,8 @@ protected function _prepareLayout() } /** + * Return HTML for the new button + * * @return string */ public function getNewButtonHtml() @@ -46,6 +49,8 @@ public function getNewButtonHtml() } /** + * Return header text + * * @return \Magento\Framework\Phrase */ protected function _getHeader() @@ -54,6 +59,8 @@ protected function _getHeader() } /** + * Return HTML for this block + * * @return string */ protected function _toHtml()