From ee3e2b34b84908d84815c7143bf55ee0d84a0e31 Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Wed, 20 Nov 2024 17:36:37 +0100 Subject: [PATCH 1/2] Fix incorrect return type for getOptionByCode method --- .../Product/Configuration/Item/ItemInterface.php | 12 ++++++++---- app/code/Magento/Quote/Model/Quote/Item.php | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemInterface.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemInterface.php index 0e10c6160fb02..78afff9353182 100644 --- a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemInterface.php +++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemInterface.php @@ -6,8 +6,12 @@ namespace Magento\Catalog\Model\Product\Configuration\Item; +use Magento\Catalog\Model\Product; +use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface; +use Magento\Framework\DataObject; + /** - * Product configurational item interface + * Product configuration item interface * * @api * @since 100.0.2 @@ -17,7 +21,7 @@ interface ItemInterface /** * Retrieve associated product * - * @return \Magento\Catalog\Model\Product + * @return Product */ public function getProduct(); @@ -25,7 +29,7 @@ public function getProduct(); * Get item option by code * * @param string $code - * @return \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface + * @return OptionInterface|null */ public function getOptionByCode($code); @@ -36,7 +40,7 @@ public function getOptionByCode($code); * - 'url' - url of controller to give the file * - 'urlParams' - additional parameters for url (custom option id, or item id, for example) * - * @return null|\Magento\Framework\DataObject + * @return null|DataObject */ public function getFileDownloadParams(); } diff --git a/app/code/Magento/Quote/Model/Quote/Item.php b/app/code/Magento/Quote/Model/Quote/Item.php index d05085d1d3cb4..4f7068713faec 100644 --- a/app/code/Magento/Quote/Model/Quote/Item.php +++ b/app/code/Magento/Quote/Model/Quote/Item.php @@ -727,7 +727,7 @@ protected function _addOptionCode($option) * Get item option by code * * @param string $code - * @return \Magento\Quote\Model\Quote\Item\Option || null + * @return \Magento\Quote\Model\Quote\Item\Option|null */ public function getOptionByCode($code) { From 62cd9b9fa42029a38e90e8dad8748878c5330a5b Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Wed, 22 Jan 2025 12:54:20 +0100 Subject: [PATCH 2/2] Fix incorrect return type for getOptionByCode method Fix static tests failure --- .../Model/Product/Configuration/Item/ItemInterface.php | 4 ++-- app/code/Magento/Quote/Model/Quote/Item.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemInterface.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemInterface.php index 78afff9353182..4ba8fa349a788 100644 --- a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemInterface.php +++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemInterface.php @@ -1,7 +1,7 @@