From 023e66cd0219d89b8deb7dd8bc5e0e04675e65be Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 7 Mar 2023 10:19:45 +0000 Subject: [PATCH 1/3] Remove forbidden @author tag --- app/code/Magento/Catalog/Block/Product/View/BaseImage.php | 2 -- app/code/Magento/Catalog/Block/Product/View/Description.php | 2 -- app/code/Magento/Catalog/Block/Product/View/Options.php | 1 - .../Catalog/Block/Product/View/Options/AbstractOptions.php | 2 -- app/code/Magento/Catalog/Block/Product/View/Type/Simple.php | 2 -- app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php | 2 -- app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php | 2 -- .../Magento/Catalog/Controller/Adminhtml/Category/Widget.php | 2 -- app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php | 2 -- app/code/Magento/Catalog/Helper/Catalog.php | 2 -- app/code/Magento/Catalog/Helper/Product/Composite.php | 2 -- app/code/Magento/Catalog/Model/AbstractModel.php | 1 - app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php | 2 -- .../Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php | 2 -- .../Magento/Catalog/Model/Category/Attribute/Source/Layout.php | 2 -- .../Magento/Catalog/Model/Category/Attribute/Source/Mode.php | 2 -- .../Magento/Catalog/Model/Category/Attribute/Source/Sortby.php | 2 -- app/code/Magento/Catalog/Model/Config/Backend/Category.php | 2 -- app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php | 2 -- app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php | 2 -- app/code/Magento/Catalog/Model/Config/Source/ListSort.php | 2 -- .../Catalog/Model/Config/Source/Product/Options/Price.php | 2 -- .../Magento/Catalog/Model/Config/Source/Watermark/Position.php | 2 -- app/code/Magento/Catalog/Model/Design.php | 2 -- .../Model/Entity/Product/Attribute/Design/Options/Container.php | 2 -- app/code/Magento/Catalog/Model/Layer/State.php | 1 - app/code/Magento/Catalog/Model/Product/Action.php | 2 -- .../Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php | 2 -- .../Catalog/Model/Product/Attribute/Backend/Category.php | 2 -- .../Magento/Catalog/Model/Product/Attribute/Backend/Price.php | 2 -- .../Catalog/Model/Product/Attribute/Backend/Tierprice.php | 2 -- .../Magento/Catalog/Model/Product/Attribute/Backend/Weight.php | 2 -- 32 files changed, 61 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Product/View/BaseImage.php b/app/code/Magento/Catalog/Block/Product/View/BaseImage.php index 75a0228e1785f..5c6894e8947ff 100644 --- a/app/code/Magento/Catalog/Block/Product/View/BaseImage.php +++ b/app/code/Magento/Catalog/Block/Product/View/BaseImage.php @@ -7,8 +7,6 @@ /** * Simple product data view - * - * @author Magento Core Team */ class BaseImage extends \Magento\Catalog\Block\Product\View\AbstractView { diff --git a/app/code/Magento/Catalog/Block/Product/View/Description.php b/app/code/Magento/Catalog/Block/Product/View/Description.php index 5296f95ec6099..3ced7203c000d 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Description.php +++ b/app/code/Magento/Catalog/Block/Product/View/Description.php @@ -6,8 +6,6 @@ /** * Product description block - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Product\View; diff --git a/app/code/Magento/Catalog/Block/Product/View/Options.php b/app/code/Magento/Catalog/Block/Product/View/Options.php index 26c6bab809927..526655a814a4f 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Options.php +++ b/app/code/Magento/Catalog/Block/Product/View/Options.php @@ -12,7 +12,6 @@ /** * Product options block * - * @author Magento Core Team * @api * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @since 100.0.2 diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php index 0d6bca2d37a10..ad02521c722ee 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php +++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php @@ -6,8 +6,6 @@ /** * Product options abstract type block - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Product\View\Options; diff --git a/app/code/Magento/Catalog/Block/Product/View/Type/Simple.php b/app/code/Magento/Catalog/Block/Product/View/Type/Simple.php index d28dcdf205f89..8fcf81f36c1f9 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Type/Simple.php +++ b/app/code/Magento/Catalog/Block/Product/View/Type/Simple.php @@ -6,8 +6,6 @@ /** * Simple product data view - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Product\View\Type; diff --git a/app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php b/app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php index 69dd82da76eda..3c32b740abb55 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php +++ b/app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php @@ -6,8 +6,6 @@ /** * Simple product data view - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Product\View\Type; diff --git a/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php b/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php index 0e50d1fb3ff97..b48034ea4f453 100644 --- a/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php +++ b/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php @@ -6,8 +6,6 @@ /** * New products widget pager block - * - * @author Magento Core Team */ namespace Magento\Catalog\Block\Product\Widget\Html; diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php index 4feaa706d42fb..daf9c7da85527 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php @@ -9,8 +9,6 @@ /** * Catalog category widgets controller for CMS WYSIWYG - * - * @author Magento Core Team */ abstract class Widget extends \Magento\Backend\App\Action { diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php index 5231bdd340650..8f703b4d00d7a 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php @@ -7,8 +7,6 @@ /** * Adminhtml entity sets controller - * - * @author Magento Core Team */ abstract class Set extends \Magento\Backend\App\Action { diff --git a/app/code/Magento/Catalog/Helper/Catalog.php b/app/code/Magento/Catalog/Helper/Catalog.php index 83535fa19e969..8fd365403bb1f 100644 --- a/app/code/Magento/Catalog/Helper/Catalog.php +++ b/app/code/Magento/Catalog/Helper/Catalog.php @@ -7,8 +7,6 @@ /** * Adminhtml Catalog helper - * - * @author Magento Core Team */ class Catalog extends \Magento\Framework\App\Helper\AbstractHelper { diff --git a/app/code/Magento/Catalog/Helper/Product/Composite.php b/app/code/Magento/Catalog/Helper/Product/Composite.php index 75b37107ee9c4..68ebf18a17857 100644 --- a/app/code/Magento/Catalog/Helper/Product/Composite.php +++ b/app/code/Magento/Catalog/Helper/Product/Composite.php @@ -18,8 +18,6 @@ * Adminhtml catalog product composite helper * * @api - * - * @author Magento Core Team * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @since 100.0.2 */ diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php index 851055c1bf810..e8e2b78c8e5a0 100644 --- a/app/code/Magento/Catalog/Model/AbstractModel.php +++ b/app/code/Magento/Catalog/Model/AbstractModel.php @@ -11,7 +11,6 @@ * Abstract model for catalog entities * @api * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - * @author Magento Core Team * @since 100.0.2 */ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensibleModel diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php index 03e9fbb1e9132..5ad60658a55b0 100644 --- a/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php +++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php @@ -10,8 +10,6 @@ * Special Start Date attribute backend * * @api - * - * @author Magento Core Team * @since 100.0.2 */ class Startdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Datetime diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php index c1cfbdade3403..f2818bad6eed5 100644 --- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php +++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php @@ -10,8 +10,6 @@ * Catalog Category Attribute Default and Available Sort By Backend Model * * @api - * - * @author Magento Core Team * @since 100.0.2 */ class Sortby extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php index 486263f3de5a6..2ab7f126aba4f 100644 --- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php +++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php @@ -7,8 +7,6 @@ /** * Catalog category landing page attribute source - * - * @author Magento Core Team */ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource { diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php index 6a6c228e63fd6..ab03b80435ad2 100644 --- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php +++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php @@ -7,8 +7,6 @@ /** * Catalog category landing page attribute source - * - * @author Magento Core Team */ class Mode extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource { diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php index 4dda2fe5786e3..cf62d195fd698 100644 --- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php +++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php @@ -7,8 +7,6 @@ /** * Catalog Category *_sort_by Attributes Source Model - * - * @author Magento Core Team */ class Sortby extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource { diff --git a/app/code/Magento/Catalog/Model/Config/Backend/Category.php b/app/code/Magento/Catalog/Model/Config/Backend/Category.php index 5ca94c9b034dc..ce7fcd04b8f7a 100644 --- a/app/code/Magento/Catalog/Model/Config/Backend/Category.php +++ b/app/code/Magento/Catalog/Model/Config/Backend/Category.php @@ -7,8 +7,6 @@ /** * Config category field backend - * - * @author Magento Core Team */ class Category extends \Magento\Framework\App\Config\Value { diff --git a/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php b/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php index cad1e664b6cb0..7c436b877a5e0 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php +++ b/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php @@ -7,8 +7,6 @@ /** * Catalog products per page on Grid mode source - * - * @author Magento Core Team */ class GridPerPage implements \Magento\Framework\Option\ArrayInterface { diff --git a/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php b/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php index 18acb2f137263..b928a56b25fcb 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php +++ b/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php @@ -7,8 +7,6 @@ /** * Catalog products per page on List mode source - * - * @author Magento Core Team */ class ListPerPage implements \Magento\Framework\Option\ArrayInterface { diff --git a/app/code/Magento/Catalog/Model/Config/Source/ListSort.php b/app/code/Magento/Catalog/Model/Config/Source/ListSort.php index 5cd2297fd7cbc..8244c11d7dccf 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/ListSort.php +++ b/app/code/Magento/Catalog/Model/Config/Source/ListSort.php @@ -6,8 +6,6 @@ /** * Catalog Product List Sortable allowed sortable attributes source - * - * @author Magento Core Team */ namespace Magento\Catalog\Model\Config\Source; diff --git a/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php b/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php index bd00ba0a73fbc..c7cdd3e4e1ef9 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php +++ b/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php @@ -9,8 +9,6 @@ /** * Price types mode source - * - * @author Magento Core Team */ class Price implements ProductPriceOptionsInterface { diff --git a/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php b/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php index 83f4313724694..143ef20228ee7 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php +++ b/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php @@ -6,8 +6,6 @@ /** * Watermark position config source model - * - * @author Magento Core Team */ namespace Magento\Catalog\Model\Config\Source\Watermark; diff --git a/app/code/Magento/Catalog/Model/Design.php b/app/code/Magento/Catalog/Model/Design.php index 3db91aa4c782d..ecbab69807c0a 100644 --- a/app/code/Magento/Catalog/Model/Design.php +++ b/app/code/Magento/Catalog/Model/Design.php @@ -24,8 +24,6 @@ * Catalog Custom Category design Model * * @api - * - * @author Magento Core Team * @since 100.0.2 * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ diff --git a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php index d9893be3125fe..d03ffdd928a49 100644 --- a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php +++ b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php @@ -7,8 +7,6 @@ /** * Entity/Attribute/Model - select product design options container from config - * - * @author Magento Core Team */ class Container extends \Magento\Eav\Model\Entity\Attribute\Source\Config { diff --git a/app/code/Magento/Catalog/Model/Layer/State.php b/app/code/Magento/Catalog/Model/Layer/State.php index c404e5539d209..1ca51b06dd142 100644 --- a/app/code/Magento/Catalog/Model/Layer/State.php +++ b/app/code/Magento/Catalog/Model/Layer/State.php @@ -14,7 +14,6 @@ * Layered navigation state model * * @api - * @author Magento Core Team * @since 100.0.2 */ class State extends DataObject diff --git a/app/code/Magento/Catalog/Model/Product/Action.php b/app/code/Magento/Catalog/Model/Product/Action.php index 3863cf2457247..4bf973c5ceb4f 100644 --- a/app/code/Magento/Catalog/Model/Product/Action.php +++ b/app/code/Magento/Catalog/Model/Product/Action.php @@ -10,8 +10,6 @@ * Catalog Product Mass Action processing model * * @api - * - * @author Magento Core Team * @since 100.0.2 */ class Action extends \Magento\Framework\Model\AbstractModel diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php index be1e523960f27..2dbacc5e432fe 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php @@ -11,8 +11,6 @@ /** * Product attribute for enable/disable option - * - * @author Magento Core Team */ class Boolean extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend { diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Category.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Category.php index 609d35a105c1a..17fd742d43175 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Category.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Category.php @@ -6,8 +6,6 @@ /** * Catalog product categories backend attribute model - * - * @author Magento Core Team */ namespace Magento\Catalog\Model\Product\Attribute\Backend; diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php index 0ce29234e52ed..cd7163b32014e 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php @@ -12,8 +12,6 @@ * Backend model for set of EAV attributes with 'frontend_input' equals 'price'. * * @api - * - * @author Magento Core Team * @since 100.0.2 */ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php index db967052cb7a5..825246f434243 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php @@ -6,8 +6,6 @@ /** * Catalog product tier price backend attribute model - * - * @author Magento Core Team */ namespace Magento\Catalog\Model\Product\Attribute\Backend; diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php index c75362750cbe8..6d6c9e83934d0 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php @@ -6,8 +6,6 @@ /** * Catalog product weight backend attribute model - * - * @author Magento Core Team */ namespace Magento\Catalog\Model\Product\Attribute\Backend; From d5040e1de435138129f98153ed7db65c4d4b5b87 Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 14 Mar 2023 19:48:23 +0000 Subject: [PATCH 2/3] Fix static test failures --- .../Catalog/Block/Product/View/Description.php | 9 ++++----- .../Catalog/Block/Product/View/Options.php | 6 ------ .../Block/Product/Widget/Html/Pager.php | 13 +++++-------- .../Controller/Adminhtml/Category/Widget.php | 4 +++- .../Controller/Adminhtml/Product/Set.php | 4 +--- .../Catalog/Helper/Product/Composite.php | 9 +++------ .../Magento/Catalog/Model/AbstractModel.php | 18 ++++++------------ .../Model/Attribute/Backend/Startdate.php | 7 ++----- .../Model/Category/Attribute/Source/Layout.php | 5 ++++- .../Model/Category/Attribute/Source/Mode.php | 2 +- .../Model/Category/Attribute/Source/Sortby.php | 4 ---- .../Catalog/Model/Config/Backend/Category.php | 6 +----- .../Catalog/Model/Config/Source/ListSort.php | 4 ---- .../Config/Source/Product/Options/Price.php | 4 +--- app/code/Magento/Catalog/Model/Design.php | 5 ++--- .../Attribute/Design/Options/Container.php | 2 +- .../Magento/Catalog/Model/Product/Action.php | 2 -- .../Model/Product/Attribute/Backend/Price.php | 9 +++------ 18 files changed, 37 insertions(+), 76 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Product/View/Description.php b/app/code/Magento/Catalog/Block/Product/View/Description.php index 3ced7203c000d..511706de4e4d3 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Description.php +++ b/app/code/Magento/Catalog/Block/Product/View/Description.php @@ -4,14 +4,13 @@ * See COPYING.txt for license details. */ -/** - * Product description block - */ namespace Magento\Catalog\Block\Product\View; use Magento\Catalog\Model\Product; /** + * Product description block + * * @api * @since 100.0.2 */ @@ -23,8 +22,6 @@ class Description extends \Magento\Framework\View\Element\Template protected $_product = null; /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry = null; @@ -44,6 +41,8 @@ public function __construct( } /** + * Return the product + * * @return Product */ public function getProduct() diff --git a/app/code/Magento/Catalog/Block/Product/View/Options.php b/app/code/Magento/Catalog/Block/Product/View/Options.php index 526655a814a4f..dac95a0a3b3b8 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Options.php +++ b/app/code/Magento/Catalog/Block/Product/View/Options.php @@ -24,22 +24,16 @@ class Options extends \Magento\Framework\View\Element\Template protected $_product; /** - * Product option - * * @var \Magento\Catalog\Model\Product\Option */ protected $_option; /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_registry = null; /** - * Catalog product - * * @var Product */ protected $_catalogProduct; diff --git a/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php b/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php index b48034ea4f453..35b4d9920f133 100644 --- a/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php +++ b/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php @@ -4,16 +4,14 @@ * See COPYING.txt for license details. */ +namespace Magento\Catalog\Block\Product\Widget\Html; + /** * New products widget pager block */ -namespace Magento\Catalog\Block\Product\Widget\Html; - class Pager extends \Magento\Theme\Block\Html\Pager { /** - * Collection size - * * Size of collection which may has a manual limitation * * @var int @@ -21,15 +19,11 @@ class Pager extends \Magento\Theme\Block\Html\Pager protected $_collectionSize; /** - * Current page - * * @var int */ protected $_currentPage; /** - * Last page - * * @var int */ protected $_lastPage; @@ -204,6 +198,9 @@ public function getPages() } elseif ($this->getCurrentPage() > $this->getLastPageNum() - $half) { $finish = $this->getLastPageNum(); $start = $finish - $this->_displayPages + 1; + } else { + $start = 1; + $finish = $this->_displayPages; } $pages = range($start, $finish); } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php index daf9c7da85527..382b61dbff623 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php @@ -17,7 +17,7 @@ abstract class Widget extends \Magento\Backend\App\Action * * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_Catalog::categories'; + public const ADMIN_RESOURCE = 'Magento_Catalog::categories'; /** * @var \Magento\Framework\View\LayoutFactory @@ -37,6 +37,8 @@ public function __construct( } /** + * Return the category tree block + * * @return BlockInterface */ protected function _getCategoryTreeBlock() diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php index 8f703b4d00d7a..6f44432712a10 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php @@ -15,11 +15,9 @@ abstract class Set extends \Magento\Backend\App\Action * * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_Catalog::sets'; + public const ADMIN_RESOURCE = 'Magento_Catalog::sets'; /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry; diff --git a/app/code/Magento/Catalog/Helper/Product/Composite.php b/app/code/Magento/Catalog/Helper/Product/Composite.php index 68ebf18a17857..98a37b4c69692 100644 --- a/app/code/Magento/Catalog/Helper/Product/Composite.php +++ b/app/code/Magento/Catalog/Helper/Product/Composite.php @@ -24,15 +24,11 @@ class Composite extends \Magento\Framework\App\Helper\AbstractHelper { /** - * Core registry - * * @var Registry */ protected $_coreRegistry = null; /** - * Catalog product - * * @var Product */ protected $_catalogProduct = null; @@ -89,8 +85,9 @@ protected function _initUpdateResultLayout() } /** - * Prepares and render result of composite product configuration update for a case - * when single configuration submitted + * Prepares and render result of composite product configuration update + * + * This is for a case when single configuration was submitted * * @param \Magento\Framework\DataObject $updateResult * @return \Magento\Framework\View\Result\Layout diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php index e8e2b78c8e5a0..8e2c32acb4784 100644 --- a/app/code/Magento/Catalog/Model/AbstractModel.php +++ b/app/code/Magento/Catalog/Model/AbstractModel.php @@ -9,6 +9,8 @@ /** * Abstract model for catalog entities + * + * @phpcs:ignore Magento2.Classes.AbstractApi.AbstractApi * @api * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @since 100.0.2 @@ -33,29 +35,21 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible protected $_storeValuesFlags; /** - * Locked attributes - * * @var array */ protected $_lockedAttributes = []; /** - * Is model deleteable - * * @var boolean */ protected $_isDeleteable = true; /** - * Is model readonly - * * @var boolean */ protected $_isReadonly = false; /** - * Store manager - * * @var \Magento\Store\Model\StoreManagerInterface */ protected $_storeManager; @@ -312,8 +306,8 @@ private function getAttributeScopeOverriddenValue() /** * Retrieve default value for attribute code * - * @param string $attributeCode - * @return array|boolean + * @param string $attributeCode + * @return array|boolean * * @deprecated 101.0.0 */ @@ -347,8 +341,8 @@ public function setExistsStoreValueFlag($attributeCode) /** * Check if object attribute has value in current store * - * @param string $attributeCode - * @return bool + * @param string $attributeCode + * @return bool * @SuppressWarnings(PHPMD.BooleanGetMethodName) * * @deprecated 101.0.0 diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php index 5ad60658a55b0..1bfb2a4e4d562 100644 --- a/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php +++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php @@ -6,7 +6,6 @@ namespace Magento\Catalog\Model\Attribute\Backend; /** - * * Special Start Date attribute backend * * @api @@ -15,15 +14,11 @@ class Startdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Datetime { /** - * Date model - * * @var \Magento\Framework\Stdlib\DateTime\DateTime */ protected $_date; /** - * Constructor - * * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate * @param \Magento\Framework\Stdlib\DateTime\DateTime $date */ @@ -51,6 +46,7 @@ protected function _getValueForSave($object) /** * Before save hook. + * * Prepare attribute value for save * * @param \Magento\Framework\DataObject $object @@ -70,6 +66,7 @@ public function beforeSave($object) /** * Product from date attribute validate function. + * * In case invalid data throws exception. * * @param \Magento\Framework\DataObject $object diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php index 2ab7f126aba4f..40535f9276327 100644 --- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php +++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php @@ -5,6 +5,8 @@ */ namespace Magento\Catalog\Model\Category\Attribute\Source; +use Magento\Theme\Model\PageLayout\Config\Builder; + /** * Catalog category landing page attribute source */ @@ -17,7 +19,8 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource /** * @inheritdoc - * @deprecated 103.0.1 since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles + * @var array + * @deprecated 103.0.1 since the cache is now handled by Builder::$configFiles */ protected $_options = null; diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php index ab03b80435ad2..c8a47ace9046e 100644 --- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php +++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php @@ -11,7 +11,7 @@ class Mode extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource { /** - * {@inheritdoc} + * @inheritDoc * @codeCoverageIgnore */ public function getAllOptions() diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php index cf62d195fd698..68f86d92e3fdb 100644 --- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php +++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php @@ -11,15 +11,11 @@ class Sortby extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource { /** - * Catalog config - * * @var \Magento\Catalog\Model\Config */ protected $_catalogConfig; /** - * Construct - * * @param \Magento\Catalog\Model\Config $catalogConfig */ public function __construct(\Magento\Catalog\Model\Config $catalogConfig) diff --git a/app/code/Magento/Catalog/Model/Config/Backend/Category.php b/app/code/Magento/Catalog/Model/Config/Backend/Category.php index ce7fcd04b8f7a..d1cedcc0f6023 100644 --- a/app/code/Magento/Catalog/Model/Config/Backend/Category.php +++ b/app/code/Magento/Catalog/Model/Config/Backend/Category.php @@ -11,15 +11,11 @@ class Category extends \Magento\Framework\App\Config\Value { /** - * Catalog category - * * @var \Magento\Catalog\Model\Category */ protected $_catalogCategory; /** - * Constructor - * * @param \Magento\Framework\Model\Context $context * @param \Magento\Framework\Registry $registry * @param \Magento\Framework\App\Config\ScopeConfigInterface $config @@ -44,7 +40,7 @@ public function __construct( } /** - * {@inheritdoc} + * @inheritDoc */ public function afterSave() { diff --git a/app/code/Magento/Catalog/Model/Config/Source/ListSort.php b/app/code/Magento/Catalog/Model/Config/Source/ListSort.php index 8244c11d7dccf..b09d5b1561eea 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/ListSort.php +++ b/app/code/Magento/Catalog/Model/Config/Source/ListSort.php @@ -12,15 +12,11 @@ class ListSort implements \Magento\Framework\Option\ArrayInterface { /** - * Catalog config - * * @var \Magento\Catalog\Model\Config */ protected $_catalogConfig; /** - * Construct - * * @param \Magento\Catalog\Model\Config $catalogConfig */ public function __construct(\Magento\Catalog\Model\Config $catalogConfig) diff --git a/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php b/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php index c7cdd3e4e1ef9..d2d47359798cb 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php +++ b/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php @@ -13,8 +13,6 @@ class Price implements ProductPriceOptionsInterface { /** - * Store manager. - * * @var \Magento\Store\Model\StoreManagerInterface */ private $storeManager; @@ -28,7 +26,7 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan } /** - * {@inheritdoc} + * @inheritDoc * * @codeCoverageIgnore */ diff --git a/app/code/Magento/Catalog/Model/Design.php b/app/code/Magento/Catalog/Model/Design.php index ecbab69807c0a..a08f093b5f013 100644 --- a/app/code/Magento/Catalog/Model/Design.php +++ b/app/code/Magento/Catalog/Model/Design.php @@ -29,9 +29,8 @@ */ class Design extends \Magento\Framework\Model\AbstractModel { - const APPLY_FOR_PRODUCT = 1; - - const APPLY_FOR_CATEGORY = 2; + public const APPLY_FOR_PRODUCT = 1; + public const APPLY_FOR_CATEGORY = 2; /** * Design package instance diff --git a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php index d03ffdd928a49..4eb0868a27a39 100644 --- a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php +++ b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php @@ -27,7 +27,7 @@ public function getOptionText($value) } } if (isset($options[$value])) { - return $option[$value]; + return $options[$value]; } return false; } diff --git a/app/code/Magento/Catalog/Model/Product/Action.php b/app/code/Magento/Catalog/Model/Product/Action.php index 4bf973c5ceb4f..eea316228f016 100644 --- a/app/code/Magento/Catalog/Model/Product/Action.php +++ b/app/code/Magento/Catalog/Model/Product/Action.php @@ -15,8 +15,6 @@ class Action extends \Magento\Framework\Model\AbstractModel { /** - * Product website factory - * * @var \Magento\Catalog\Model\Product\WebsiteFactory */ protected $_productWebsiteFactory; diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php index cd7163b32014e..b932e7722176c 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php @@ -17,22 +17,16 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend { /** - * Catalog helper - * * @var \Magento\Catalog\Helper\Data */ protected $_helper; /** - * Store manager - * * @var \Magento\Store\Model\StoreManagerInterface */ protected $_storeManager; /** - * Currency factory - * * @var \Magento\Directory\Model\CurrencyFactory */ protected $_currencyFactory; @@ -81,6 +75,7 @@ public function __construct( /** * Set Attribute instance + * * Rewrite for redefine attribute scope * * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute @@ -112,6 +107,7 @@ public function setScope($attribute) /** * After Save Price Attribute manipulation + * * Processes product price attributes if price scoped to website and updates data when: * * Price changed for non-default store view - will update price for all stores assigned to current website. * * Price will be changed according to store currency even if price changed in product with default store id. @@ -144,6 +140,7 @@ public function afterSave($object) /** * Check whether product uses default attribute's value in selected scope + * * @param \Magento\Catalog\Model\Product $object * @return bool */ From 9da27cc6118b634baef18d534e475d5ab0084b00 Mon Sep 17 00:00:00 2001 From: engcom-Dash Date: Mon, 2 Dec 2024 13:28:01 +0530 Subject: [PATCH 3/3] 36989: fix static failures --- .../Magento/Catalog/Block/Product/View/BaseImage.php | 4 ++-- .../Magento/Catalog/Block/Product/View/Description.php | 4 ++-- .../Magento/Catalog/Block/Product/View/Options.php | 4 ++-- .../Block/Product/View/Options/AbstractOptions.php | 4 ++-- .../Magento/Catalog/Block/Product/View/Type/Simple.php | 4 ++-- .../Catalog/Block/Product/View/Type/Virtual.php | 4 ++-- .../Catalog/Block/Product/Widget/Html/Pager.php | 4 ++-- .../Catalog/Controller/Adminhtml/Category/Widget.php | 4 ++-- .../Catalog/Controller/Adminhtml/Product/Set.php | 4 ++-- app/code/Magento/Catalog/Helper/Catalog.php | 4 ++-- app/code/Magento/Catalog/Helper/Product/Composite.php | 4 ++-- app/code/Magento/Catalog/Model/AbstractModel.php | 10 ++++++++-- .../Catalog/Model/Attribute/Backend/Startdate.php | 4 ++-- .../Model/Category/Attribute/Backend/Sortby.php | 4 ++-- .../Catalog/Model/Category/Attribute/Source/Layout.php | 5 +++-- .../Catalog/Model/Category/Attribute/Source/Mode.php | 4 ++-- .../Catalog/Model/Category/Attribute/Source/Sortby.php | 4 ++-- .../Magento/Catalog/Model/Config/Backend/Category.php | 4 ++-- .../Catalog/Model/Config/Source/GridPerPage.php | 4 ++-- .../Catalog/Model/Config/Source/ListPerPage.php | 4 ++-- .../Magento/Catalog/Model/Config/Source/ListSort.php | 4 ++-- .../Model/Config/Source/Product/Options/Price.php | 4 ++-- .../Catalog/Model/Config/Source/Watermark/Position.php | 4 ++-- app/code/Magento/Catalog/Model/Design.php | 5 +++-- .../Product/Attribute/Design/Options/Container.php | 4 ++-- app/code/Magento/Catalog/Model/Layer/State.php | 4 ++-- app/code/Magento/Catalog/Model/Product/Action.php | 4 ++-- .../Model/Product/Attribute/Backend/Boolean.php | 4 ++-- .../Model/Product/Attribute/Backend/Category.php | 4 ++-- .../Catalog/Model/Product/Attribute/Backend/Price.php | 4 ++-- .../Model/Product/Attribute/Backend/Tierprice.php | 4 ++-- .../Catalog/Model/Product/Attribute/Backend/Weight.php | 4 ++-- 32 files changed, 72 insertions(+), 64 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Product/View/BaseImage.php b/app/code/Magento/Catalog/Block/Product/View/BaseImage.php index 5c6894e8947ff..cde7aa5ddbd91 100644 --- a/app/code/Magento/Catalog/Block/Product/View/BaseImage.php +++ b/app/code/Magento/Catalog/Block/Product/View/BaseImage.php @@ -1,7 +1,7 @@