[Magento Community Engineering] Community Contributions - 2.4-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

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

@@ -0,0 +1,50 @@
+<?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
+{
+    /**
+     * Collect items qty
+     *
+     * @param Quote $quote
+     * @return Quote
+     */
+    public function collectItemsQtys(Quote $quote)
+    {
+        $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());
+        }
+
+        return $quote;
+    }
+}

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

@@ -7,12 +7,13 @@
 
 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;
 
 /**
- * Class TotalsCollector
+ * Composite object for collecting total.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TotalsCollector
@@ -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)
     {
@@ -273,7 +285,7 @@ public function collectAddressTotals(
             /** @var CollectorInterface $collector */
             $collector->collect($quote, $shippingAssignment, $total);
         }
-        
+
         $this->eventManager->dispatch(
             'sales_quote_address_collect_totals_after',
             [

app/code/Magento/Security/Model/AdminSessionsManager.php

@@ -8,7 +8,7 @@
 namespace Magento\Security\Model;
 
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
-use \Magento\Security\Model\ResourceModel\AdminSessionInfo\CollectionFactory;
+use Magento\Security\Model\ResourceModel\AdminSessionInfo\CollectionFactory;
 
 /**
  * Admin Sessions Manager Model
@@ -174,8 +174,15 @@ public function processLogout()
     public function getCurrentSession()
     {
         if (!$this->currentSession) {
+            $adminSessionInfoId = $this->authSession->getAdminSessionInfoId();
+            if (!$adminSessionInfoId) {
+                $this->createNewSession();
+                $adminSessionInfoId = $this->authSession->getAdminSessionInfoId();
+                $this->logoutOtherUserSessions();
+            }
+
             $this->currentSession = $this->adminSessionInfoFactory->create();
-            $this->currentSession->load($this->authSession->getAdminSessionInfoId(), 'id');
+            $this->currentSession->load($adminSessionInfoId, 'id');
         }
 
         return $this->currentSession;

app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php

@@ -335,9 +335,32 @@ public function testCleanExpiredSessions()
      */
     public function testGetLogoutReasonMessage($expectedResult, $sessionStatus)
     {
-        $this->adminSessionInfoFactoryMock->expects($this->once())
+        $this->adminSessionInfoFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->willReturn($this->currentSessionMock);
+        $this->authSessionMock->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->userMock);
+        $this->currentSessionMock->expects($this->once())
+            ->method('setData')
+            ->willReturn($this->currentSessionMock);
+        $this->currentSessionMock->expects($this->once())
+            ->method('save')
+            ->willReturn($this->currentSessionMock);
+        $this->adminSessionInfoCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->adminSessionInfoCollectionMock);
+        $this->adminSessionInfoCollectionMock->expects($this->once())->method('filterByUser')
+            ->willReturnSelf();
+        $this->adminSessionInfoCollectionMock->expects($this->once())
+            ->method('filterExpiredSessions')
+            ->willReturnSelf();
+        $this->adminSessionInfoCollectionMock->expects($this->once())
+            ->method('loadData')
+            ->willReturnSelf();
+        $this->adminSessionInfoCollectionMock->expects($this->once())
+            ->method('setDataToAll')
+            ->willReturnSelf();
         $this->currentSessionMock->expects($this->once())
             ->method('getStatus')
             ->willReturn($sessionStatus);

dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php

@@ -39,6 +39,7 @@ protected function setUp(): void
             ->setCurrentScope(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
         $this->auth = $this->objectManager->create(\Magento\Backend\Model\Auth::class);
         $this->authSession = $this->objectManager->create(\Magento\Backend\Model\Auth\Session::class);
+        $this->authSession->setUser($this->objectManager->create(\Magento\User\Model\User::class));
         $this->auth->setAuthStorage($this->authSession);
         $this->auth->logout();
     }