From 5a4c627cb2dcc2c6fca6b8b334d460c640154f75 Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 7 Mar 2023 10:23:21 +0000 Subject: [PATCH 1/2] Remove forbidden @author tag --- .../Magento/Catalog/Model/Product/Attribute/Frontend/Image.php | 2 -- app/code/Magento/Catalog/Model/Product/Attribute/Group.php | 1 - .../Catalog/Model/Product/Attribute/OptionManagement.php | 1 - .../Model/Product/Attribute/Source/Countryofmanufacture.php | 2 -- .../Magento/Catalog/Model/Product/Attribute/Source/Layout.php | 2 -- .../Magento/Catalog/Model/Product/Configuration/Item/Option.php | 2 -- .../Model/Product/Configuration/Item/Option/OptionInterface.php | 1 - app/code/Magento/Catalog/Model/Product/Link.php | 1 - app/code/Magento/Catalog/Model/Product/Option.php | 1 - .../Magento/Catalog/Model/Product/Option/Type/DefaultType.php | 1 - app/code/Magento/Catalog/Model/Product/Type/Virtual.php | 2 -- app/code/Magento/Catalog/Model/Product/Website.php | 2 -- app/code/Magento/Catalog/Model/ResourceModel/Category.php | 2 -- .../Model/ResourceModel/Category/Attribute/Collection.php | 2 -- .../Model/ResourceModel/Category/Attribute/Frontend/Image.php | 2 -- .../Model/ResourceModel/Category/Attribute/Source/Layout.php | 2 -- .../Model/ResourceModel/Category/Attribute/Source/Page.php | 2 -- .../Magento/Catalog/Model/ResourceModel/Category/Collection.php | 1 - .../Catalog/Model/ResourceModel/Category/Flat/Collection.php | 1 - .../Model/ResourceModel/Collection/AbstractCollection.php | 1 - app/code/Magento/Catalog/Model/ResourceModel/Config.php | 2 -- app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php | 1 - .../Catalog/Model/ResourceModel/Layer/Filter/Attribute.php | 2 -- .../Catalog/Model/ResourceModel/Layer/Filter/Decimal.php | 2 -- app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php | 1 - .../Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php | 2 -- .../Model/ResourceModel/Product/Attribute/Backend/Image.php | 2 -- .../Model/ResourceModel/Product/Attribute/Backend/Tierprice.php | 2 -- .../Catalog/Model/ResourceModel/Product/Compare/Item.php | 2 -- .../Model/ResourceModel/Product/Compare/Item/Collection.php | 1 - app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php | 2 -- .../Model/ResourceModel/Product/Indexer/AbstractIndexer.php | 2 -- 32 files changed, 52 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php index cdd6da7019da5..d260f63fb1538 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php @@ -6,8 +6,6 @@ /** * Product image attribute frontend - * - * @author Magento Core Team */ namespace Magento\Catalog\Model\Product\Attribute\Frontend; diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Group.php b/app/code/Magento/Catalog/Model/Product/Attribute/Group.php index 1eaa8e5afc42a..1c7b4734dd6d5 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Group.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Group.php @@ -1,6 +1,5 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php index 1554293661c02..3cad08d419bd0 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php @@ -1,6 +1,5 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php index c0a13aa8b934a..3db66261e6465 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php @@ -6,8 +6,6 @@ /** * Catalog product country attribute source - * - * @author Magento Core Team */ namespace Magento\Catalog\Model\Product\Attribute\Source; diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php index 333e8021d30b5..24d30c2e28366 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php @@ -7,8 +7,6 @@ /** * Catalog product 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/Product/Configuration/Item/Option.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option.php index 7a183f2a4273e..0a2cc51e6ff5b 100644 --- a/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option.php +++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option.php @@ -6,8 +6,6 @@ /** * Configuration item option model - * - * @author Magento Core Team */ namespace Magento\Catalog\Model\Product\Configuration\Item; diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option/OptionInterface.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option/OptionInterface.php index e765464ea6d3a..34f031b96142c 100644 --- a/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option/OptionInterface.php +++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option/OptionInterface.php @@ -8,7 +8,6 @@ * Interface of product configurational item option * * @api - * @author Magento Core Team */ namespace Magento\Catalog\Model\Product\Configuration\Item\Option; diff --git a/app/code/Magento/Catalog/Model/Product/Link.php b/app/code/Magento/Catalog/Model/Product/Link.php index f2b07bad8891c..5c39b2a6551e2 100644 --- a/app/code/Magento/Catalog/Model/Product/Link.php +++ b/app/code/Magento/Catalog/Model/Product/Link.php @@ -19,7 +19,6 @@ * @method int getLinkTypeId() * @method \Magento\Catalog\Model\Product\Link setLinkTypeId(int $value) * - * @author Magento Core Team * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @since 100.0.2 */ diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php index a2d2e82149c34..96ac6596deb39 100644 --- a/app/code/Magento/Catalog/Model/Product/Option.php +++ b/app/code/Magento/Catalog/Model/Product/Option.php @@ -30,7 +30,6 @@ * @method int getProductId() * @method \Magento\Catalog\Model\Product\Option setProductId(int $value) * - * @author Magento Core Team * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @SuppressWarnings(PHPMD.ExcessivePublicCount) * @since 100.0.2 diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php index 225f1bb3d10e3..06e5f7e06f6b8 100644 --- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php +++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php @@ -18,7 +18,6 @@ * Catalog product option default type * * @api - * @author Magento Core Team * @SuppressWarnings(PHPMD.CookieAndSessionMisuse) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @since 100.0.2 diff --git a/app/code/Magento/Catalog/Model/Product/Type/Virtual.php b/app/code/Magento/Catalog/Model/Product/Type/Virtual.php index 4f8e048bb067c..76af7b9210957 100644 --- a/app/code/Magento/Catalog/Model/Product/Type/Virtual.php +++ b/app/code/Magento/Catalog/Model/Product/Type/Virtual.php @@ -6,8 +6,6 @@ /** * Virtual product type implementation - * - * @author Magento Core Team */ namespace Magento\Catalog\Model\Product\Type; diff --git a/app/code/Magento/Catalog/Model/Product/Website.php b/app/code/Magento/Catalog/Model/Product/Website.php index 148c2c9e9e267..6562091106dc4 100644 --- a/app/code/Magento/Catalog/Model/Product/Website.php +++ b/app/code/Magento/Catalog/Model/Product/Website.php @@ -9,8 +9,6 @@ * * @method int getWebsiteId() * @method \Magento\Catalog\Model\Product\Website setWebsiteId(int $value) - * - * @author Magento Core Team */ namespace Magento\Catalog\Model\Product; diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php index 35828fc8ec117..1464edad80a48 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php @@ -6,8 +6,6 @@ /** * Catalog category model - * - * @author Magento Core Team */ declare(strict_types=1); diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Collection.php index a12120613c2a7..b97667864a500 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Collection.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Collection.php @@ -7,8 +7,6 @@ /** * Catalog category EAV additional attribute resource collection - * - * @author Magento Core Team */ class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection { diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Frontend/Image.php index 3e6bea7e0a8d6..6d0926d34197c 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Frontend/Image.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Frontend/Image.php @@ -7,8 +7,6 @@ /** * Category image attribute frontend - * - * @author Magento Core Team */ class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend { diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Layout.php index 41b9a5b6861e3..b092e18f1ac58 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Layout.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/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/ResourceModel/Category/Attribute/Source/Page.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Page.php index 955342cb3c2ee..eac36a00564b6 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Page.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Page.php @@ -7,8 +7,6 @@ /** * Catalog category landing page attribute source - * - * @author Magento Core Team */ class Page extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource { diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php index 56fb7290b81a6..a25e9facdd3d4 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php @@ -16,7 +16,6 @@ * Category resource collection * * @api - * @author Magento Core Team * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @since 100.0.2 */ diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php index 03e33365b776b..6992b385f4e89 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php @@ -17,7 +17,6 @@ /** * Catalog category flat collection * - * @author Magento Core Team * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php index a121648b7acba..03d7df8aa4eac 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php @@ -14,7 +14,6 @@ * Implement using different stores for retrieve attribute values * * @api - * @author Magento Core Team * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @since 100.0.2 */ diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Config.php b/app/code/Magento/Catalog/Model/ResourceModel/Config.php index 7b5d4e09a3599..37b36b0bb40fd 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Config.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Config.php @@ -7,8 +7,6 @@ /** * Catalog Config Resource Model - * - * @author Magento Core Team */ class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php index 07ce84c7cd62e..25f3e706ec4bc 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php @@ -24,7 +24,6 @@ * @method bool getIsUsedForPriceRules() * @method int setIsUsedForPriceRules(int $value) * - * @author Magento Core Team * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @SuppressWarnings(PHPMD.ExcessivePublicCount) * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Attribute.php index b975db2bdf799..7e3665bf43375 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Attribute.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Attribute.php @@ -9,8 +9,6 @@ * Catalog Layer Attribute Filter Resource Model * * @api - * - * @author Magento Core Team * @since 100.0.2 */ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Decimal.php b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Decimal.php index f44b03acc2e5d..40b307acd9235 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Decimal.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Decimal.php @@ -9,8 +9,6 @@ * Catalog Layer Decimal attribute Filter Resource Model * * @api - * - * @author Magento Core Team * @since 100.0.2 */ class Decimal extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php index 85f6269f63af0..16e3c6a4f8d60 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php @@ -26,7 +26,6 @@ /** * Catalog Product Mass processing resource model * - * @author Magento Core Team * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Action extends AbstractResource diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php index ba635a270f210..178b7bca659ef 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php @@ -6,8 +6,6 @@ /** * Catalog product abstract price backend attribute model with customer group specific - * - * @author Magento Core Team */ namespace Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\GroupPrice; diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php index b75fa1491aa77..5993f89be1eb3 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php @@ -10,8 +10,6 @@ /** * Product image attribute backend - * - * @author Magento Core Team */ class Image extends AbstractBackend { diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Tierprice.php index b310f6e68774f..b82250ce0df8a 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Tierprice.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Tierprice.php @@ -9,8 +9,6 @@ /** * Catalog product tier price backend attribute model - * - * @author Magento Core Team */ class Tierprice extends AbstractGroupPrice { diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item.php index ff29a5afa7eda..63373b1cab0f1 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item.php @@ -7,8 +7,6 @@ /** * Catalog compare item resource model - * - * @author Magento Core Team */ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php index 76f566a364769..a0e2fec9d42ca 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php @@ -9,7 +9,6 @@ * Catalog Product Compare Items Resource Collection * * @api - * @author Magento Core Team * @SuppressWarnings(PHPMD.LongVariable) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @SuppressWarnings(PHPMD.CookieAndSessionMisuse) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php index 58dde2d0cf4b5..9f8784db17838 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php @@ -10,8 +10,6 @@ /** * Catalog Product Flat resource model - * - * @author Magento Core Team */ class Flat extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements DefaultAttributesProvider { diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php index 4259504b8f0f0..694b055c6f052 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php @@ -11,8 +11,6 @@ * Catalog Product Indexer Abstract Resource Model * * @api - * - * @author Magento Core Team * @since 100.0.2 */ abstract class AbstractIndexer extends \Magento\Indexer\Model\ResourceModel\AbstractResource From f710632320eb25bc4d2b5e7cc01a850261a43300 Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 14 Mar 2023 20:17:32 +0000 Subject: [PATCH 2/2] Fix static test failures --- .../Product/Attribute/Frontend/Image.php | 11 +++----- .../Catalog/Model/Product/Attribute/Group.php | 3 --- .../Attribute/Source/Countryofmanufacture.php | 12 +++------ .../Model/Product/Attribute/Source/Layout.php | 5 +++- .../Magento/Catalog/Model/Product/Link.php | 22 +++++++++------- .../Catalog/Model/Product/Type/Virtual.php | 1 + .../Magento/Catalog/Model/Product/Website.php | 1 + .../Category/Attribute/Collection.php | 5 ++-- .../Category/Attribute/Frontend/Image.php | 6 +---- .../Category/Attribute/Source/Page.php | 4 --- .../Category/Flat/Collection.php | 25 ++++++++++++------- .../Catalog/Model/ResourceModel/Config.php | 7 +----- .../Model/ResourceModel/Eav/Attribute.php | 10 +++----- .../ResourceModel/Layer/Filter/Decimal.php | 1 + .../Backend/GroupPrice/AbstractGroupPrice.php | 4 +++ .../Product/Attribute/Backend/Image.php | 4 --- .../Product/Compare/Item/Collection.php | 5 ---- .../Model/ResourceModel/Product/Flat.php | 11 +++----- .../Product/Indexer/AbstractIndexer.php | 25 ++++++++++--------- 19 files changed, 70 insertions(+), 92 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php index d260f63fb1538..39681e69254ce 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php @@ -4,28 +4,23 @@ * See COPYING.txt for license details. */ -/** - * Product image attribute frontend - */ - namespace Magento\Catalog\Model\Product\Attribute\Frontend; use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend; use Magento\Framework\UrlInterface; use Magento\Store\Model\StoreManagerInterface; +/** + * Product image attribute frontend + */ class Image extends AbstractFrontend { /** - * Store manager - * * @var StoreManagerInterface */ protected $_storeManager; /** - * Construct - * * @param StoreManagerInterface $storeManager */ public function __construct(StoreManagerInterface $storeManager) diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Group.php b/app/code/Magento/Catalog/Model/Product/Attribute/Group.php index 1c7b4734dd6d5..b7a92702d965e 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Group.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Group.php @@ -10,14 +10,11 @@ class Group extends \Magento\Eav\Model\Entity\Attribute\Group { /** - * Attribute collection factory - * * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory */ protected $_attributeCollectionFactory; /** - * Group constructor. * @param \Magento\Framework\Model\Context $context * @param \Magento\Framework\Registry $registry * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php index 3db66261e6465..2e1be5b36b6e5 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php @@ -4,14 +4,14 @@ * See COPYING.txt for license details. */ -/** - * Catalog product country attribute source - */ namespace Magento\Catalog\Model\Product\Attribute\Source; use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource; use Magento\Framework\Data\OptionSourceInterface; +/** + * Catalog product country attribute source + */ class Countryofmanufacture extends AbstractSource implements OptionSourceInterface { /** @@ -20,15 +20,11 @@ class Countryofmanufacture extends AbstractSource implements OptionSourceInterfa protected $_configCacheType; /** - * Store manager - * * @var \Magento\Store\Model\StoreManagerInterface */ protected $_storeManager; /** - * Country factory - * * @var \Magento\Directory\Model\CountryFactory */ protected $_countryFactory; @@ -39,8 +35,6 @@ class Countryofmanufacture extends AbstractSource implements OptionSourceInterfa private $serializer; /** - * Construct - * * @param \Magento\Directory\Model\CountryFactory $countryFactory * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Framework\App\Cache\Type\Config $configCacheType diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php index 24d30c2e28366..1ea4e08671eb8 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php @@ -5,6 +5,8 @@ */ namespace Magento\Catalog\Model\Product\Attribute\Source; +use Magento\Theme\Model\PageLayout\Config\Builder; + /** * Catalog product 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/Product/Link.php b/app/code/Magento/Catalog/Model/Product/Link.php index 5c39b2a6551e2..4ad3d54be9240 100644 --- a/app/code/Magento/Catalog/Model/Product/Link.php +++ b/app/code/Magento/Catalog/Model/Product/Link.php @@ -24,11 +24,9 @@ */ class Link extends \Magento\Framework\Model\AbstractModel { - const LINK_TYPE_RELATED = 1; - - const LINK_TYPE_UPSELL = 4; - - const LINK_TYPE_CROSSSELL = 5; + public const LINK_TYPE_RELATED = 1; + public const LINK_TYPE_UPSELL = 4; + public const LINK_TYPE_CROSSSELL = 5; /** * @var mixed @@ -36,15 +34,11 @@ class Link extends \Magento\Framework\Model\AbstractModel protected $_attributes = null; /** - * Product collection factory - * * @var \Magento\Catalog\Model\ResourceModel\Product\Link\Product\CollectionFactory */ protected $_productCollectionFactory; /** - * Link collection factory - * * @var \Magento\Catalog\Model\ResourceModel\Product\Link\CollectionFactory */ protected $_linkCollectionFactory; @@ -98,6 +92,8 @@ protected function _construct() } /** + * Set this link to use related links + * * @return $this */ public function useRelatedLinks() @@ -107,6 +103,8 @@ public function useRelatedLinks() } /** + * Set this link to use upsell links + * * @return $this */ public function useUpSellLinks() @@ -116,6 +114,8 @@ public function useUpSellLinks() } /** + * Set this link to use cross-sell links + * * @return $this */ public function useCrossSellLinks() @@ -158,6 +158,8 @@ public function getLinkCollection() } /** + * Return attributes + * * @param int $type * @return array */ @@ -186,6 +188,8 @@ public function saveProductRelations($product) } /** + * Return product link save handler + * * @return Link\SaveHandler */ private function getProductLinkSaveHandler() diff --git a/app/code/Magento/Catalog/Model/Product/Type/Virtual.php b/app/code/Magento/Catalog/Model/Product/Type/Virtual.php index 76af7b9210957..941b3358a987b 100644 --- a/app/code/Magento/Catalog/Model/Product/Type/Virtual.php +++ b/app/code/Magento/Catalog/Model/Product/Type/Virtual.php @@ -37,6 +37,7 @@ public function hasWeight() * * @param \Magento\Catalog\Model\Product $product * @return void + * @phpcs:disable Magento2.CodeAnalysis.EmptyBlock.DetectedFunction */ public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product) { diff --git a/app/code/Magento/Catalog/Model/Product/Website.php b/app/code/Magento/Catalog/Model/Product/Website.php index 6562091106dc4..aace44d22dbf5 100644 --- a/app/code/Magento/Catalog/Model/Product/Website.php +++ b/app/code/Magento/Catalog/Model/Product/Website.php @@ -66,6 +66,7 @@ public function addProducts($websiteIds, $productIds) /** * Retrieve product websites + * * Return array with key as product ID and value array of websites * * @param int|array $productIds diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Collection.php index b97667864a500..2cb01a86994e5 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Collection.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Collection.php @@ -11,8 +11,6 @@ class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection { /** - * Entity factory - * * @var \Magento\Eav\Model\EntityFactory */ protected $_eavEntityFactory; @@ -22,8 +20,8 @@ class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Colle * @param \Psr\Log\LoggerInterface $logger * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy * @param \Magento\Framework\Event\ManagerInterface $eventManager - * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory * @param \Magento\Eav\Model\Config $eavConfig + * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource */ @@ -43,6 +41,7 @@ public function __construct( /** * Main select object initialization. + * * Joins catalog/eav_attribute table * * @return $this diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Frontend/Image.php index 6d0926d34197c..8b018ae04d79d 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Frontend/Image.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Frontend/Image.php @@ -10,18 +10,14 @@ */ class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend { - const IMAGE_PATH_SEGMENT = 'catalog/category/'; + public const IMAGE_PATH_SEGMENT = 'catalog/category/'; /** - * Store manager - * * @var \Magento\Store\Model\StoreManagerInterface */ protected $_storeManager; /** - * Construct - * * @param \Magento\Store\Model\StoreManagerInterface $storeManager */ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Page.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Page.php index eac36a00564b6..e9b2b689a30b3 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Page.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Attribute/Source/Page.php @@ -11,15 +11,11 @@ class Page extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource { /** - * Block collection factory - * * @var \Magento\Cms\Model\ResourceModel\Block\CollectionFactory */ protected $_blockCollectionFactory; /** - * Construct - * * @param \Magento\Cms\Model\ResourceModel\Block\CollectionFactory $blockCollectionFactory */ public function __construct(\Magento\Cms\Model\ResourceModel\Block\CollectionFactory $blockCollectionFactory) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php index 6992b385f4e89..08247e7af2bba 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php @@ -22,8 +22,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'catalog_category_collection'; @@ -36,8 +34,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab protected $_eventObject = 'category_collection'; /** - * Store manager - * * @var \Magento\Store\Model\StoreManagerInterface */ protected $_storeManager; @@ -95,6 +91,8 @@ protected function _construct() } /** + * Initialise the select + * * @return $this */ protected function _initSelect() @@ -124,11 +122,9 @@ public function addIdFilter($categoryIds) $condition = $categoryIds; } elseif (is_string($categoryIds)) { $ids = explode(',', $categoryIds); - if (empty($ids)) { - $condition = $categoryIds; - } else { - $condition = ['in' => $ids]; - } + $condition = ['in' => $ids]; + } else { + return $this; } $this->addFieldToFilter('main_table.entity_id', $condition); return $this; @@ -170,6 +166,7 @@ public function setStoreId($storeId) /** * Return store id. + * * If store id is not set yet, return store of application * * @return integer @@ -222,6 +219,8 @@ public function addSortedField($sorted) } /** + * Add a filter to only show active categories + * * @return $this */ public function addIsActiveFilter() @@ -328,6 +327,8 @@ public function addAttributeToFilter($attribute, $condition = null) } /** + * Join the URL rewrite table to the result + * * @return $this */ public function addUrlRewriteToResult() @@ -345,6 +346,8 @@ public function addUrlRewriteToResult() } /** + * Add a paths filter + * * @param string|array $paths * @return $this */ @@ -367,6 +370,8 @@ public function addPathsFilter($paths) } /** + * Add a level filter + * * @param string $level * @return $this */ @@ -377,6 +382,8 @@ public function addLevelFilter($level) } /** + * Add an order field + * * @param string $field * @return $this */ diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Config.php b/app/code/Magento/Catalog/Model/ResourceModel/Config.php index 37b36b0bb40fd..bcf15bc1eb7b9 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Config.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Config.php @@ -18,22 +18,16 @@ class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb protected $_entityTypeId; /** - * Store id - * * @var int */ protected $_storeId = null; /** - * Eav config - * * @var \Magento\Eav\Model\Config */ protected $_eavConfig; /** - * Store manager - * * @var \Magento\Store\Model\StoreManagerInterface */ protected $_storeManager; @@ -79,6 +73,7 @@ public function setStoreId($storeId) /** * Return store id. + * * If is not set return current app store * * @return integer diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php index 25f3e706ec4bc..04077a2a94ad3 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php @@ -33,11 +33,9 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements \Magento\Catalog\Api\Data\ProductAttributeInterface, \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface { - const MODULE_NAME = 'Magento_Catalog'; - - const ENTITY = 'catalog_eav_attribute'; - - const KEY_IS_GLOBAL = 'is_global'; + public const MODULE_NAME = 'Magento_Catalog'; + public const ENTITY = 'catalog_eav_attribute'; + public const KEY_IS_GLOBAL = 'is_global'; private const ALLOWED_INPUT_TYPES = [ 'boolean' => true, @@ -71,8 +69,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements protected static $_labels = null; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'catalog_entity_attribute'; diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Decimal.php b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Decimal.php index 40b307acd9235..4cb8291671715 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Decimal.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Decimal.php @@ -86,6 +86,7 @@ public function getMinMax(\Magento\Catalog\Model\Layer\Filter\FilterInterface $f /** * Retrieve clean select with joined index table + * * Joined table has index * * @param \Magento\Catalog\Model\Layer\Filter\FilterInterface $filter diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php index 178b7bca659ef..75cbec7040c2e 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php @@ -30,6 +30,8 @@ public function loadPriceData($productId, $websiteId = null) } /** + * Return the select object + * * @param int|null $websiteId * @return \Magento\Framework\DB\Select */ @@ -59,6 +61,8 @@ public function getSelect($websiteId = null) } /** + * Return the product ID field name + * * @return string */ protected function getProductIdFieldName() diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php index 5993f89be1eb3..4e43070e180e5 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php @@ -14,15 +14,11 @@ class Image extends AbstractBackend { /** - * Filesystem facade - * * @var \Magento\Framework\Filesystem */ protected $_filesystem; /** - * File Uploader factory - * * @var \Magento\MediaStorage\Model\File\UploaderFactory */ protected $_fileUploaderFactory; diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php index a0e2fec9d42ca..43e3dc278ce69 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php @@ -45,15 +45,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection protected $_comparableAttributes; /** - * Catalog product compare - * * @var \Magento\Catalog\Helper\Product\Compare */ protected $_catalogProductCompare = null; /** - * Catalog product compare item - * * @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item */ protected $_catalogProductCompareItem; @@ -286,7 +282,6 @@ public function getProductsByListId(int $listId): array return $this->getConnection()->fetchCol($select); } - /** * Set list_id for customer compare item * diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php index 9f8784db17838..db66bebd6c905 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php @@ -14,22 +14,16 @@ class Flat extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements DefaultAttributesProvider { /** - * Store scope Id - * * @var int */ protected $_storeId; /** - * Catalog config - * * @var \Magento\Catalog\Model\Config */ protected $_catalogConfig; /** - * Store manager - * * @var \Magento\Store\Model\StoreManagerInterface */ protected $_storeManager; @@ -180,7 +174,8 @@ public function getAllTableColumns() /** * Check whether the attribute is a real field in entity table - * Rewrited for EAV Collection + * + * Rewriten for EAV Collection * * @param integer|string|\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute * @return bool @@ -208,6 +203,7 @@ public function isAttributeStatic($attribute) /** * Retrieve entity id field name in entity table + * * Rewrote for EAV collection compatibility * * @return string @@ -219,6 +215,7 @@ public function getEntityIdField() /** * Retrieve attribute instance + * * Special for non static flat table * * @param mixed $attribute diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php index 694b055c6f052..c7142b3367cd2 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php @@ -10,14 +10,13 @@ /** * Catalog Product Indexer Abstract Resource Model * + * @phpcs:ignore Magento2.Classes.AbstractApi.AbstractApi * @api * @since 100.0.2 */ abstract class AbstractIndexer extends \Magento\Indexer\Model\ResourceModel\AbstractResource { /** - * Eav config - * * @var \Magento\Eav\Model\Config */ protected $_eavConfig; @@ -29,8 +28,6 @@ abstract class AbstractIndexer extends \Magento\Indexer\Model\ResourceModel\Abst protected $metadataPool; /** - * Class constructor - * * @param \Magento\Framework\Model\ResourceModel\Db\Context $context * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy * @param \Magento\Eav\Model\Config $eavConfig @@ -58,17 +55,17 @@ protected function _getAttribute($attributeCode) } /** - * Add attribute join condition to select and return \Zend_Db_Expr - * attribute value definition + * Add attribute join condition to select and return \Zend_Db_Expr attribute value definition + * * If $condition is not empty apply limitation for select * * @param \Magento\Framework\DB\Select $select - * @param string $attrCode the attribute code - * @param string|\Zend_Db_Expr $entity the entity field or expression for condition - * @param string|\Zend_Db_Expr $store the store field or expression for condition - * @param \Zend_Db_Expr $condition the limitation condition - * @param bool $required if required or has condition used INNER join, else - LEFT - * @return \Zend_Db_Expr the attribute value expression + * @param string $attrCode the attribute code + * @param string|\Zend_Db_Expr $entity the entity field or expression for condition + * @param string|\Zend_Db_Expr $store the store field or expression for condition + * @param \Zend_Db_Expr $condition the limitation condition + * @param bool $required if required or has condition used INNER join, else - LEFT + * @return \Zend_Db_Expr the attribute value expression */ protected function _addAttributeToSelect($select, $attrCode, $entity, $store, $condition = null, $required = false) { @@ -120,6 +117,7 @@ protected function _addAttributeToSelect($select, $attrCode, $entity, $store, $c /** * Add website data join to select + * * If add default store join also limitation of only has default store website * Joined table has aliases * cw for website table, @@ -156,6 +154,7 @@ protected function _addWebsiteJoinToSelect($select, $store = true, $joinConditio /** * Add join for catalog/product_website table + * * Joined table has alias pw * * @param \Magento\Framework\DB\Select $select the select object @@ -232,6 +231,8 @@ public function getRelationsByParent($parentIds) } /** + * Return metadata pool + * * @return \Magento\Framework\EntityManager\MetadataPool * @since 101.0.0 */