From 8966adc14dcdc068ec40051c29b1c998bd7e8e9b Mon Sep 17 00:00:00 2001 From: Lukasz Bajsarowicz Date: Tue, 5 Nov 2024 15:03:29 +0100 Subject: [PATCH 1/3] SwiftOtter-SOP-348 Quote AbstractItem code style --- .../Quote/Model/Quote/Item/AbstractItem.php | 52 ++++++++----------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php index 058411abe720b..61eb6081c2a98 100644 --- a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php +++ b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php @@ -3,10 +3,12 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Quote\Model\Quote\Item; -use Magento\Quote\Model\Quote\Item; +use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface; use Magento\Framework\Api\AttributeValueFactory; +use Magento\Quote\Model\Quote\Item; /** * Quote item abstract model @@ -47,8 +49,8 @@ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @since 100.0.2 */ -abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleModel implements - \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface +abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleModel + implements \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface { /** * @var Item|null @@ -68,7 +70,7 @@ abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleM /** * List of custom options * - * @var array + * @var OptionInterface[] */ protected $_optionsByCode; @@ -187,7 +189,7 @@ public function beforeSave() /** * Set parent item * - * @param Item $parentItem + * @param Item $parentItem * @return $this */ public function setParentItem($parentItem) @@ -222,7 +224,7 @@ public function getChildren() /** * Add child item * - * @param \Magento\Quote\Model\Quote\Item\AbstractItem $child + * @param \Magento\Quote\Model\Quote\Item\AbstractItem $child * @return $this */ public function addChild($child) @@ -235,7 +237,7 @@ public function addChild($child) /** * Adds message(s) for quote item. Duplicated messages are not added. * - * @param mixed $messages + * @param mixed $messages * @return $this */ public function setMessage($messages) @@ -255,7 +257,7 @@ public function setMessage($messages) /** * Add message of quote item to array of messages * - * @param string $message + * @param string $message * @return $this */ public function addMessage($message) @@ -267,7 +269,7 @@ public function addMessage($message) /** * Get messages array of quote item * - * @param bool $string flag for converting messages to string + * @param bool $string flag for converting messages to string * @return array|string */ public function getMessage($string = true) @@ -624,18 +626,12 @@ public function __clone() */ public function isChildrenCalculated() { - if ($this->getParentItem()) { - $calculate = $this->getParentItem()->getProduct()->getPriceType(); - } else { - $calculate = $this->getProduct()->getPriceType(); - } + $calculate = $this->getParentItem() + ? $this->getParentItem()->getProduct()->getPriceType() + : $this->getProduct()->getPriceType(); - if (null !== $calculate && - (int)$calculate === \Magento\Catalog\Model\Product\Type\AbstractType::CALCULATE_CHILD - ) { - return true; - } - return false; + return $calculate !== null + && (int)$calculate === \Magento\Catalog\Model\Product\Type\AbstractType::CALCULATE_CHILD; } /** @@ -648,18 +644,12 @@ public function isChildrenCalculated() */ public function isShipSeparately() { - if ($this->getParentItem()) { - $shipmentType = $this->getParentItem()->getProduct()->getShipmentType(); - } else { - $shipmentType = $this->getProduct()->getShipmentType(); - } + $shipmentType = $this->getParentItem() + ? $this->getParentItem()->getProduct()->getShipmentType() + : $this->getProduct()->getShipmentType(); - if (null !== $shipmentType && - (int)$shipmentType === \Magento\Catalog\Model\Product\Type\AbstractType::SHIPMENT_SEPARATELY - ) { - return true; - } - return false; + return null !== $shipmentType && + (int)$shipmentType === \Magento\Catalog\Model\Product\Type\AbstractType::SHIPMENT_SEPARATELY; } /** From 9963612b9858ee1283e65cbe417e08d3ee64b07e Mon Sep 17 00:00:00 2001 From: Lukasz Bajsarowicz Date: Tue, 5 Nov 2024 15:06:20 +0100 Subject: [PATCH 2/3] SwiftOtter-SOP-348 Add missing argument types --- .../Magento/Quote/Model/Quote/Item/AbstractItem.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php index 61eb6081c2a98..cb01e38c462c0 100644 --- a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php +++ b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php @@ -26,15 +26,15 @@ * @method float getBaseDiscountAmount() * @method \Magento\Quote\Model\Quote\Item\AbstractItem setBaseDiscountAmount(float $amount) * @method float getDiscountPercent() - * @method \Magento\Quote\Model\Quote\Item\AbstractItem setDiscountPercent() + * @method \Magento\Quote\Model\Quote\Item\AbstractItem setDiscountPercent(float $percent) * @method float getOriginalDiscountAmount() - * @method \Magento\Quote\Model\Quote\Item\AbstractItem setOriginalDiscountAmount() + * @method \Magento\Quote\Model\Quote\Item\AbstractItem setOriginalDiscountAmount(float $amount) * @method float getBaseOriginalDiscountAmount() - * @method \Magento\Quote\Model\Quote\Item\AbstractItem setBaseOriginalDiscountAmount() + * @method \Magento\Quote\Model\Quote\Item\AbstractItem setBaseOriginalDiscountAmount(float $amount) * @method float getDiscountCalculationPrice() - * @method \Magento\Quote\Model\Quote\Item\AbstractItem setDiscountCalculationPrice() + * @method \Magento\Quote\Model\Quote\Item\AbstractItem setDiscountCalculationPrice(float $amount) * @method float getBaseDiscountCalculationPrice() - * @method \Magento\Quote\Model\Quote\Item\AbstractItem setBaseDiscountCalculationPrice($price) + * @method \Magento\Quote\Model\Quote\Item\AbstractItem setBaseDiscountCalculationPrice(float $price) * @method int[] getAppliedRuleIds() * @method \Magento\Quote\Model\Quote\Item\AbstractItem setAppliedRuleIds(array $ruleIds) * @method float getBaseTaxAmount() From 73fedb8e0ebef2ee70f8f976aaa3dc3c82142b98 Mon Sep 17 00:00:00 2001 From: Lukasz Bajsarowicz Date: Fri, 13 Dec 2024 11:18:02 +0100 Subject: [PATCH 3/3] SwiftOtter-SOP-348 Code Review adjustments --- app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php index 3f5dcf223d9ca..feb811920c6c4 100644 --- a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php +++ b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php @@ -6,8 +6,10 @@ namespace Magento\Quote\Model\Quote\Item; +use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface; use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface; use Magento\Framework\Api\AttributeValueFactory; +use Magento\Framework\Model\AbstractExtensibleModel; use Magento\Quote\Model\Quote\Item; /** @@ -50,8 +52,7 @@ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @since 100.0.2 */ -abstract class AbstractItem extends \Magento\Framework\Model\AbstractExtensibleModel - implements \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface +abstract class AbstractItem extends AbstractExtensibleModel implements ItemInterface { /** * @var Item|null @@ -271,7 +272,7 @@ public function addMessage($message) * Get messages array of quote item * * @param bool $string flag for converting messages to string - * @return array|string + * @return string[]|string */ public function getMessage($string = true) {