From 9104cb571ef4a41bd03cfaa8dc68b487ccb8946f Mon Sep 17 00:00:00 2001 From: Oleh Usik Date: Tue, 9 Jun 2020 23:47:36 +0300 Subject: [PATCH 1/3] Remove redundant method --- .../AdvancedPricing/Validator/TierPrice.php | 28 ++++++++++------ .../Validator/TierPriceType.php | 14 +++----- .../AdvancedPricing/Validator/Website.php | 32 +++++++++---------- 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php index b1f99bb1fc05f..e936244d242dc 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php @@ -3,15 +3,22 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + +declare(strict_types=1); + namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator; use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing; use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface; +use Magento\CatalogImportExport\Model\Import\Product\StoreResolver; +use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractPrice; +use Magento\Customer\Api\GroupRepositoryInterface; +use Magento\Framework\Api\SearchCriteriaBuilder; -class TierPrice extends \Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractPrice +class TierPrice extends AbstractPrice { /** - * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver + * @var StoreResolver */ protected $storeResolver; @@ -27,14 +34,14 @@ class TierPrice extends \Magento\CatalogImportExport\Model\Import\Product\Valida ]; /** - * @param \Magento\Customer\Api\GroupRepositoryInterface $groupRepository - * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder - * @param \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver + * @param GroupRepositoryInterface $groupRepository + * @param SearchCriteriaBuilder $searchCriteriaBuilder + * @param StoreResolver $storeResolver */ public function __construct( - \Magento\Customer\Api\GroupRepositoryInterface $groupRepository, - \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder, - \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver + GroupRepositoryInterface $groupRepository, + SearchCriteriaBuilder $searchCriteriaBuilder, + StoreResolver $storeResolver ) { $this->storeResolver = $storeResolver; parent::__construct($groupRepository, $searchCriteriaBuilder); @@ -53,6 +60,7 @@ public function init($context) /** * @param string $attribute + * * @return void */ protected function addDecimalError($attribute) @@ -83,12 +91,12 @@ public function getCustomerGroups() } /** - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * Validation * * @param mixed $value * @return bool * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ public function isValid($value) { @@ -133,6 +141,7 @@ public function isValid($value) * Check if at list one value and length are valid * * @param array $value + * * @return bool */ protected function isValidValueAndLength(array $value) @@ -150,6 +159,7 @@ protected function isValidValueAndLength(array $value) * Check if value has empty columns * * @param array $value + * * @return bool */ protected function hasEmptyColumns(array $value) diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php index 6aa59e6227a05..71b5271a90fa2 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php @@ -4,28 +4,24 @@ * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator; use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing; use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface; +use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator; /** * Class TierPriceType validates tier price type. */ -class TierPriceType extends \Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator +class TierPriceType extends AbstractImportValidator { - /** - * {@inheritdoc} - */ - public function init($context) - { - return parent::init($context); - } - /** * Validate tier price type. * * @param array $value + * * @return bool */ public function isValid($value) diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php index 0f3f8b3389c7d..a6c6bbb4cd49b 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php @@ -3,49 +3,47 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + +declare(strict_types=1); + namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator; use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing; -use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator; use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface; +use Magento\CatalogImportExport\Model\Import\Product\StoreResolver; +use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator; +use Magento\Store\Model\Website as WebsiteModel; class Website extends AbstractImportValidator implements RowValidatorInterface { /** - * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver + * @var StoreResolver */ protected $storeResolver; /** - * @var \Magento\Store\Model\Website + * @var WebsiteModel */ protected $websiteModel; /** - * @param \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver - * @param \Magento\Store\Model\Website $websiteModel + * @param StoreResolver $storeResolver + * @param WebsiteModel $websiteModel */ public function __construct( - \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver, - \Magento\Store\Model\Website $websiteModel + StoreResolver $storeResolver, + WebsiteModel $websiteModel ) { $this->storeResolver = $storeResolver; $this->websiteModel = $websiteModel; } - /** - * {@inheritdoc} - */ - public function init($context) - { - return parent::init($context); - } - /** * Validate by website type * * @param array $value * @param string $websiteCode + * * @return bool */ protected function isWebsiteValid($value, $websiteCode) @@ -63,6 +61,7 @@ protected function isWebsiteValid($value, $websiteCode) * Validate value * * @param mixed $value + * * @return bool */ public function isValid($value) @@ -85,6 +84,7 @@ public function isValid($value) */ public function getAllWebsitesValue() { - return AdvancedPricing::VALUE_ALL_WEBSITES . ' ['.$this->websiteModel->getBaseCurrency()->getCurrencyCode().']'; + return AdvancedPricing::VALUE_ALL_WEBSITES . + ' [' . $this->websiteModel->getBaseCurrency()->getCurrencyCode() . ']'; } } From f1516ba52826d8b9a3c1c83538d8fa5bac90cb09 Mon Sep 17 00:00:00 2001 From: Oleh Usik Date: Wed, 10 Jun 2020 00:45:43 +0300 Subject: [PATCH 2/3] fixed static issues --- .../Import/AdvancedPricing/Validator/TierPrice.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php index e936244d242dc..2ad96cfeab1d9 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php @@ -9,11 +9,14 @@ namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator; use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing; +use Magento\CatalogImportExport\Model\Import\Product; use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface; use Magento\CatalogImportExport\Model\Import\Product\StoreResolver; +use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator; use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractPrice; use Magento\Customer\Api\GroupRepositoryInterface; use Magento\Framework\Api\SearchCriteriaBuilder; +use Magento\Framework\Exception\LocalizedException; class TierPrice extends AbstractPrice { @@ -48,7 +51,12 @@ public function __construct( } /** - * {@inheritdoc} + * Initialize method + * + * @param Product $context + * + * @return RowValidatorInterface|AbstractImportValidator|void + * @throws LocalizedException */ public function init($context) { @@ -59,6 +67,8 @@ public function init($context) } /** + * Add decimal error + * * @param string $attribute * * @return void From 6d43eb149677be44be5b76400a1c4b9cba97a1aa Mon Sep 17 00:00:00 2001 From: Oleh Usik Date: Wed, 10 Jun 2020 11:17:31 +0300 Subject: [PATCH 3/3] add type to parameter --- .../Model/Import/AdvancedPricing/Validator/Website.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php index a6c6bbb4cd49b..93c63dcbcab28 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php @@ -60,7 +60,7 @@ protected function isWebsiteValid($value, $websiteCode) /** * Validate value * - * @param mixed $value + * @param array $value * * @return bool */