[2.3-develop] Forwardport of magento/magento2#13036

Author: magento-engcom-team

app/code/Magento/ConfigurableProductSales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php

@@ -45,7 +45,7 @@ public function __construct(
     public function isAvailable(Item $item)
     {
         $buyRequest = $item->getBuyRequest();
-        $superAttribute = $buyRequest->getData()['super_attribute'];
+        $superAttribute = $buyRequest->getData()['super_attribute'] ?? [];
         $connection = $this->getConnection();
         $select = $connection->select();
         $orderItemParentId = $item->getParentItem()->getProductId();

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

@@ -745,6 +745,9 @@ public function saveItemOptions()
                 unset($this->_options[$index]);
                 unset($this->_optionsByCode[$option->getCode()]);
             } else {
+                if (!$option->getItem() || !$option->getItem()->getId()) {
+                    $option->setItem($this);
+                }
                 $option->save();
             }
         }

app/code/Magento/Quote/Test/Unit/Model/Quote/ItemTest.php

@@ -850,7 +850,18 @@ public function testSetOptionsWithNull()
     private function createOptionMock($optionCode, $optionData = [])
     {
         $optionMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item\Option::class)
-            ->setMethods(['setData', 'setItem', 'getCode', '__wakeup', 'isDeleted', 'getValue', 'getProduct'])
+            ->setMethods([
+                'setData',
+                'setItem',
+                'getItem',
+                'getCode',
+                '__wakeup',
+                'isDeleted',
+                'delete',
+                'getValue',
+                'getProduct',
+                'save'
+            ])
             ->disableOriginalConstructor()
             ->getMock();
         $optionMock->expects($this->any())
@@ -1189,4 +1200,33 @@ public function testRemoveErrorInfosByParamsAllErrorsRemoved()
         $this->assertFalse($this->model->getHasError());
         $this->assertEquals('', $this->model->getMessage());
     }
+
+    /**
+     * Test method \Magento\Quote\Model\Quote\Item::saveItemOptions
+     */
+    public function testSaveItemOptions()
+    {
+        $optionMockDeleted = $this->createOptionMock(100);
+        $optionMockDeleted->expects(self::once())->method('isDeleted')->willReturn(true);
+        $optionMockDeleted->expects(self::once())->method('delete');
+
+        $optionMock1 = $this->createOptionMock(200);
+        $optionMock1->expects(self::once())->method('isDeleted')->willReturn(false);
+        $quoteItemMock1 = $this->createPartialMock(\Magento\Quote\Model\Quote\Item::class, ['getId']);
+        $quoteItemMock1->expects(self::once())->method('getId')->willReturn(null);
+        $optionMock1->expects(self::exactly(2))->method('getItem')->willReturn($quoteItemMock1);
+        $optionMock1->expects(self::exactly(2))->method('setItem')->with($this->model);
+        $optionMock1->expects(self::once())->method('save');
+
+        $optionMock2 = $this->createOptionMock(300);
+        $optionMock2->expects(self::once())->method('isDeleted')->willReturn(false);
+        $quoteItemMock2 = $this->createPartialMock(\Magento\Quote\Model\Quote\Item::class, ['getId']);
+        $quoteItemMock2->expects(self::once())->method('getId')->willReturn(11);
+        $optionMock2->expects(self::exactly(2))->method('getItem')->willReturn($quoteItemMock2);
+        $optionMock2->expects(self::once())->method('setItem')->with($this->model);
+        $optionMock2->expects(self::once())->method('save');
+
+        $this->model->setOptions([$optionMockDeleted, $optionMock1, $optionMock2]);
+        $this->model->saveItemOptions();
+    }
 }