From 447a91729f10533d680f44f717c28a16f8ca7eab Mon Sep 17 00:00:00 2001 From: Volodymyr Hryvinskyi Date: Tue, 17 Jul 2018 23:34:38 +0300 Subject: [PATCH 1/4] Add Clean Code --- .../Initialization/Helper/ProductLinks/Plugin/Grouped.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php index 6cdcfd248e798..7b9523015c882 100644 --- a/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php +++ b/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php @@ -8,6 +8,7 @@ use Magento\Catalog\Api\Data\ProductLinkExtensionFactory; use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory; use Magento\Catalog\Api\ProductRepositoryInterface; +use Magento\Framework\Exception\NoSuchEntityException; use Magento\GroupedProduct\Model\Product\Type\Grouped as TypeGrouped; /** @@ -60,6 +61,9 @@ public function __construct( * @param array $links * * @return \Magento\Catalog\Model\Product + * + * @throws NoSuchEntityException + * * @SuppressWarnings(PHPMD.UnusedFormalParameter) * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) @@ -70,7 +74,7 @@ public function beforeInitializeLinks( array $links ) { if ($product->getTypeId() === TypeGrouped::TYPE_CODE && !$product->getGroupedReadonly()) { - $links = (isset($links[self::TYPE_NAME])) ? $links[self::TYPE_NAME] : $product->getGroupedLinkData(); + $links = $links[self::TYPE_NAME] ?? $product->getGroupedLinkData(); if (!is_array($links)) { $links = []; } From c393a404e3c3b2e009e6596d67c78f3017cf9a28 Mon Sep 17 00:00:00 2001 From: Volodymyr Hryvinskyi Date: Wed, 18 Jul 2018 21:06:17 +0300 Subject: [PATCH 2/4] Update construct and phpdoc --- .../Magento/CatalogRule/Model/Rule/Job.php | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/app/code/Magento/CatalogRule/Model/Rule/Job.php b/app/code/Magento/CatalogRule/Model/Rule/Job.php index 63ff98d4ca5b7..709869940e1e6 100644 --- a/app/code/Magento/CatalogRule/Model/Rule/Job.php +++ b/app/code/Magento/CatalogRule/Model/Rule/Job.php @@ -8,6 +8,10 @@ * See COPYING.txt for license details. */ +namespace Magento\CatalogRule\Model\Rule; + +use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor; + /** * Catalog Rule job model * @@ -18,13 +22,8 @@ * @method bool hasSuccess() * @method bool hasError() * - * @author Magento Core Team - */ -namespace Magento\CatalogRule\Model\Rule; - -use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor; - -/** + * @author Magento Core Team + * * @api * @since 100.0.2 */ @@ -35,14 +34,18 @@ class Job extends \Magento\Framework\DataObject */ protected $ruleProcessor; - /** - * Basic object initialization - * - * @param RuleProductProcessor $ruleProcessor - */ - public function __construct(RuleProductProcessor $ruleProcessor) - { - $this->ruleProcessor = $ruleProcessor; + /** + * Basic object initialization + * + * @param RuleProductProcessor $ruleProcessor + * @param array $data + */ + public function __construct( + RuleProductProcessor $ruleProcessor, + array $data = [] + ) { + $this->ruleProcessor = $ruleProcessor; + parent::__construct($data); } /** From 18bfebe75f0feda24935a24e6668709ae086c3e8 Mon Sep 17 00:00:00 2001 From: Volodymyr Hryvinskyi Date: Thu, 19 Jul 2018 12:24:29 +0300 Subject: [PATCH 3/4] replace tab space --- .../Magento/CatalogRule/Model/Rule/Job.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/CatalogRule/Model/Rule/Job.php b/app/code/Magento/CatalogRule/Model/Rule/Job.php index 709869940e1e6..f73fd60d740ff 100644 --- a/app/code/Magento/CatalogRule/Model/Rule/Job.php +++ b/app/code/Magento/CatalogRule/Model/Rule/Job.php @@ -34,18 +34,18 @@ class Job extends \Magento\Framework\DataObject */ protected $ruleProcessor; - /** - * Basic object initialization - * - * @param RuleProductProcessor $ruleProcessor - * @param array $data - */ + /** + * Basic object initialization + * + * @param RuleProductProcessor $ruleProcessor + * @param array $data + */ public function __construct( RuleProductProcessor $ruleProcessor, - array $data = [] + array $data = [] ) { - $this->ruleProcessor = $ruleProcessor; - parent::__construct($data); + $this->ruleProcessor = $ruleProcessor; + parent::__construct($data); } /** From 6c9203ffac9bf850fba24fc68f43be5000373a67 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Fri, 20 Jul 2018 12:46:25 +0300 Subject: [PATCH 4/4] Fixed coding standards issue --- app/code/Magento/CatalogRule/Model/Rule/Job.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CatalogRule/Model/Rule/Job.php b/app/code/Magento/CatalogRule/Model/Rule/Job.php index f73fd60d740ff..71734eb3c5d46 100644 --- a/app/code/Magento/CatalogRule/Model/Rule/Job.php +++ b/app/code/Magento/CatalogRule/Model/Rule/Job.php @@ -41,8 +41,8 @@ class Job extends \Magento\Framework\DataObject * @param array $data */ public function __construct( - RuleProductProcessor $ruleProcessor, - array $data = [] + RuleProductProcessor $ruleProcessor, + array $data = [] ) { $this->ruleProcessor = $ruleProcessor; parent::__construct($data);