Merge branch 'ACP2E-2070' of https://github.com/magento-l3/magento2ce into PR-L3-2023-07-14

Author: vkolesny

app/code/Magento/Customer/Model/App/Action/ContextPlugin.php

@@ -48,7 +48,7 @@ public function beforeExecute(ActionInterface $subject)
     {
         $this->httpContext->setValue(
             Context::CONTEXT_GROUP,
-            $this->customerSession->getCustomerGroupId(),
+            (string)$this->customerSession->getCustomerGroupId(),
             GroupManagement::NOT_LOGGED_IN_ID
         );
         $this->httpContext->setValue(

app/code/Magento/Customer/Model/Session.php

@@ -211,7 +211,7 @@ public function setCustomerData(CustomerData $customer)
         } else {
             $this->_httpContext->setValue(
                 Context::CONTEXT_GROUP,
-                $customer->getGroupId(),
+                (string)$customer->getGroupId(),
                 \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID
             );
             $this->setCustomerId($customer->getId());
@@ -271,7 +271,7 @@ public function setCustomer(Customer $customerModel)
         $this->_customerModel = $customerModel;
         $this->_httpContext->setValue(
             Context::CONTEXT_GROUP,
-            $customerModel->getGroupId(),
+            (string)$customerModel->getGroupId(),
             \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID
         );
         $this->setCustomerId($customerModel->getId());

app/code/Magento/Customer/Test/Unit/Model/App/Action/ContextPluginTest.php

@@ -20,8 +20,8 @@
  */
 class ContextPluginTest extends TestCase
 {
-    const STUB_CUSTOMER_GROUP = 'UAH';
-    const STUB_CUSTOMER_NOT_LOGGED_IN = 0;
+    public const STUB_CUSTOMER_GROUP = 'UAH';
+    public const STUB_CUSTOMER_NOT_LOGGED_IN = 0;
     /**
      * @var ContextPlugin
      */
@@ -66,6 +66,10 @@ public function testBeforeExecute()
             ->willReturn(true);
         $this->httpContextMock->expects($this->atLeastOnce())
             ->method('setValue')
+            ->withConsecutive(
+                [Context::CONTEXT_GROUP, self::callback(fn($value): bool => $value === '1'), 0],
+                [Context::CONTEXT_AUTH, true, self::STUB_CUSTOMER_NOT_LOGGED_IN]
+            )
             ->willReturnMap(
                 [
                     [Context::CONTEXT_GROUP, self::STUB_CUSTOMER_GROUP, $this->httpContextMock],

app/code/Magento/Customer/Test/Unit/Model/SessionTest.php

@@ -1,14 +1,15 @@
-<?php declare(strict_types=1);
+<?php
 /**
- * Unit test for session \Magento\Customer\Model\Session
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Test\Unit\Model;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Context as CustomerContext;
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\CustomerFactory;
 use Magento\Customer\Model\ResourceModel\Customer as ResourceCustomer;
@@ -118,6 +119,9 @@ public function testSetCustomerAsLoggedIn(): void
     {
         $customer = $this->createMock(Customer::class);
         $customerDto = $this->getMockForAbstractClass(CustomerInterface::class);
+        $customer->expects($this->any())
+            ->method('getGroupId')
+            ->willReturn(1);
         $customer->expects($this->any())
             ->method('getDataModel')
             ->willReturn($customerDto);
@@ -129,6 +133,10 @@ public function testSetCustomerAsLoggedIn(): void
                 ['customer_data_object_login', ['customer' => $customerDto]]
             );
 
+        $this->_httpContextMock->expects($this->once())
+            ->method('setValue')
+            ->with(CustomerContext::CONTEXT_GROUP, self::callback(fn($value): bool => $value === '1'), 0);
+
         $_SESSION = [];
         $this->_model->setCustomerAsLoggedIn($customer);
         $this->assertSame($customer, $this->_model->getCustomer());
@@ -348,4 +356,17 @@ public function testGetCustomerForRegisteredUser(): void
 
         $this->assertSame($customerMock, $this->_model->getCustomer());
     }
+
+    public function testSetCustomer(): void
+    {
+        $customer = $this->createMock(Customer::class);
+        $customer->expects($this->any())
+            ->method('getGroupId')
+            ->willReturn(1);
+        $this->_httpContextMock->expects($this->once())
+            ->method('setValue')
+            ->with(CustomerContext::CONTEXT_GROUP, self::callback(fn($value): bool => $value === '1'), 0);
+
+        $this->_model->setCustomer($customer);
+    }
 }