Merge pull request #1290 from magento-engcom/develop-prs

Public Pull Requests

#10059

Author: Oleksii Korshenko

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

@@ -1445,11 +1445,17 @@ public function hasProductId($productId)
      * Retrieve item model object by item identifier
      *
      * @param   int $itemId
-     * @return  \Magento\Quote\Model\Quote\Item
+     * @return  \Magento\Quote\Model\Quote\Item|false
      */
     public function getItemById($itemId)
     {
-        return $this->getItemsCollection()->getItemById($itemId);
+        foreach ($this->getItemsCollection() as $item) {
+            if ($item->getId() == $itemId) {
+                return $item;
+            }
+        }
+
+        return false;
     }
 
     /**

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php

@@ -449,4 +449,27 @@ public function testAddedProductToQuoteIsSalable()
         $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
         $quote->addProduct($product);
     }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testGetItemById()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+        $quote->load('test01', 'reserved_order_id');
+
+        $quoteItem = $objectManager->create(\Magento\Quote\Model\Quote\Item::class);
+
+        $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple');
+
+        $quoteItem->setProduct($product);
+        $quote->addItem($quoteItem);
+        $quote->save();
+
+        $this->assertInstanceOf(\Magento\Quote\Model\Quote\Item::class, $quote->getItemById($quoteItem->getId()));
+        $this->assertEquals($quoteItem->getId(), $quote->getItemById($quoteItem->getId())->getId());
+    }
 }