Merge remote-tracking branch 'performance/MCP-549' into MCP-648

Author: vzabaznov

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

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Quote;
+
+use Magento\Quote\Model\Quote;
+
+class QuantityCollector
+{
+    /**
+     * @var []
+     */
+    private $quoteCache = [];
+
+    /**
+     * Collect items qty
+     *
+     * @param Quote $quote
+     * @return Quote
+     */
+    public function collectItemsQtys(Quote $quote)
+    {
+        if (!isset($this->quoteCache[$quote->getEntityId()])) {
+            $quoteItems = $quote->getAllVisibleItems();
+            $quote->setItemsCount(0);
+            $quote->setItemsQty(0);
+            $quote->setVirtualItemsQty(0);
+
+            foreach ($quoteItems as $item) {
+                if ($item->getParentItem()) {
+                    continue;
+                }
+
+                $children = $item->getChildren();
+                if ($children && $item->isShipSeparately()) {
+                    foreach ($children as $child) {
+                        if ($child->getProduct()->getIsVirtual()) {
+                            $quote->setVirtualItemsQty(
+                                $quote->getVirtualItemsQty() + $child->getQty() * $item->getQty()
+                            );
+                        }
+                    }
+                }
+
+                if ($item->getProduct()->getIsVirtual()) {
+                    $quote->setVirtualItemsQty($quote->getVirtualItemsQty() + $item->getQty());
+                }
+                $quote->setItemsCount($quote->getItemsCount() + 1);
+                $quote->setItemsQty((float)$quote->getItemsQty() + $item->getQty());
+            }
+
+            $this->quoteCache[$quote->getEntityId()] = $quote;
+
+            return $quote;
+        }
+
+        return $this->quoteCache[$quote->getEntityId()];
+    }
+}

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

@@ -7,6 +7,7 @@
 
 namespace Magento\Quote\Model\Quote;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Quote\Model\Quote\Address\Total\Collector;
 use Magento\Quote\Model\Quote\Address\Total\CollectorFactory;
 use Magento\Quote\Model\Quote\Address\Total\CollectorInterface;
@@ -68,6 +69,11 @@ class TotalsCollector
      */
     protected $shippingAssignmentFactory;
 
+    /**
+     * @var QuantityCollector
+     */
+    private $quantityCollector;
+
     /**
      * @param Collector $totalCollector
      * @param CollectorFactory $totalCollectorFactory
@@ -78,6 +84,7 @@ class TotalsCollector
      * @param \Magento\Quote\Model\ShippingFactory $shippingFactory
      * @param \Magento\Quote\Model\ShippingAssignmentFactory $shippingAssignmentFactory
      * @param \Magento\Quote\Model\QuoteValidator $quoteValidator
+     * @param QuantityCollector $quantityCollector
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -89,7 +96,8 @@ public function __construct(
         \Magento\Quote\Model\Quote\TotalsCollectorList $collectorList,
         \Magento\Quote\Model\ShippingFactory $shippingFactory,
         \Magento\Quote\Model\ShippingAssignmentFactory $shippingAssignmentFactory,
-        \Magento\Quote\Model\QuoteValidator $quoteValidator
+        \Magento\Quote\Model\QuoteValidator $quoteValidator,
+        QuantityCollector $quantityCollector = null
     ) {
         $this->totalCollector = $totalCollector;
         $this->totalCollectorFactory = $totalCollectorFactory;
@@ -100,6 +108,8 @@ public function __construct(
         $this->shippingFactory = $shippingFactory;
         $this->shippingAssignmentFactory = $shippingAssignmentFactory;
         $this->quoteValidator = $quoteValidator;
+        $this->quantityCollector = $quantityCollector
+            ?: ObjectManager::getInstance()->get(QuantityCollector::class);
     }
 
     /**
@@ -132,7 +142,7 @@ public function collect(\Magento\Quote\Model\Quote $quote)
             ['quote' => $quote]
         );
 
-        $this->_collectItemsQtys($quote);
+        $this->quantityCollector->collectItemsQtys($quote);
 
         $total->setSubtotal(0);
         $total->setBaseSubtotal(0);
@@ -206,6 +216,8 @@ protected function _validateCouponCode(\Magento\Quote\Model\Quote $quote)
      *
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
+     * @deprecated
+     * @see \Magento\Quote\Model\Quote\QuantityCollector
      */
     protected function _collectItemsQtys(\Magento\Quote\Model\Quote $quote)
     {