Merge remote-tracking branch 'origin/MC-38197' into 2.4-develop-pr43

Author: serhii-balko

app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\ConfigurableProduct\Model\Quote\Item;
 
+use Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueInterface;
+use Magento\Quote\Api\Data\ProductOptionExtensionInterface;
 use Magento\Quote\Model\Quote\Item\CartItemProcessorInterface;
 use Magento\Quote\Api\Data\CartItemInterface;
 use Magento\Framework\Serialize\Serializer\Json;
@@ -64,7 +66,7 @@ public function __construct(
     public function convertToBuyRequest(CartItemInterface $cartItem)
     {
         if ($cartItem->getProductOption() && $cartItem->getProductOption()->getExtensionAttributes()) {
-            /** @var \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueInterface $options */
+            /** @var ConfigurableItemOptionValueInterface $options */
             $options = $cartItem->getProductOption()->getExtensionAttributes()->getConfigurableItemOptions();
             if (is_array($options)) {
                 $requestData = [];
@@ -82,13 +84,17 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
      */
     public function processOptions(CartItemInterface $cartItem)
     {
-        $attributesOption = $cartItem->getProduct()->getCustomOption('attributes');
+        $attributesOption = $cartItem->getProduct()
+            ->getCustomOption('attributes');
+        if (!$attributesOption) {
+            return $cartItem;
+        }
         $selectedConfigurableOptions = $this->serializer->unserialize($attributesOption->getValue());
 
         if (is_array($selectedConfigurableOptions)) {
             $configurableOptions = [];
             foreach ($selectedConfigurableOptions as $optionId => $optionValue) {
-                /** @var \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueInterface $option */
+                /** @var ConfigurableItemOptionValueInterface $option */
                 $option = $this->itemOptionValueFactory->create();
                 $option->setOptionId($optionId);
                 $option->setOptionValue($optionValue);
@@ -99,15 +105,16 @@ public function processOptions(CartItemInterface $cartItem)
                 ? $cartItem->getProductOption()
                 : $this->productOptionFactory->create();
 
-            /** @var  \Magento\Quote\Api\Data\ProductOptionExtensionInterface $extensibleAttribute */
-            $extensibleAttribute =  $productOption->getExtensionAttributes()
+            /** @var  ProductOptionExtensionInterface $extensibleAttribute */
+            $extensibleAttribute = $productOption->getExtensionAttributes()
                 ? $productOption->getExtensionAttributes()
                 : $this->extensionFactory->create();
 
             $extensibleAttribute->setConfigurableItemOptions($configurableOptions);
             $productOption->setExtensionAttributes($extensibleAttribute);
             $cartItem->setProductOption($productOption);
         }
+
         return $cartItem;
     }
 }

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Quote/Item/CartItemProcessorTest.php

@@ -59,7 +59,7 @@ class CartItemProcessorTest extends TestCase
      */
     private $productOptionExtensionAttributes;
 
-    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    /** @var MockObject */
     private $serializer;
 
     protected function setUp(): void
@@ -263,4 +263,25 @@ public function testProcessProductOptionsIfOptionsExist()
 
         $this->assertEquals($cartItemMock, $this->model->processOptions($cartItemMock));
     }
+
+    /**
+     * Checks processOptions method with the empty custom option
+     *
+     * @return void
+     */
+    public function testProcessProductWithEmptyOption(): void
+    {
+        $customOption = $this->createMock(Option::class);
+        $productMock = $this->createMock(Product::class);
+        $productMock->method('getCustomOption')
+            ->with('attributes')
+            ->willReturn(null);
+        $customOption->expects($this->never())
+            ->method('getValue');
+        $cartItemMock = $this->createPartialMock(Item::class, ['getProduct']);
+        $cartItemMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($productMock);
+        $this->assertEquals($cartItemMock, $this->model->processOptions($cartItemMock));
+    }
 }