Merge branch 'ACP2E-1459' of https://github.com/magento-l3/magento2ce into PR-01-10-2023

Author: chittima

app/code/Magento/Checkout/Model/GuestShippingInformationManagement.php

@@ -31,7 +31,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function saveAddressInformation(
         $cartId,
@@ -40,7 +40,7 @@ public function saveAddressInformation(
         /** @var $quoteIdMask \Magento\Quote\Model\QuoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->shippingInformationManagement->saveAddressInformation(
-            $quoteIdMask->getQuoteId(),
+            (int) $quoteIdMask->getQuoteId(),
             $addressInformation
         );
     }

app/code/Magento/Checkout/Test/Unit/Model/GuestShippingInformationManagementTest.php

@@ -57,7 +57,7 @@ protected function setUp(): void
     public function testSaveAddressInformation()
     {
         $cartId = 'masked_id';
-        $quoteId = 100;
+        $quoteId = '100';
         $addressInformationMock = $this->getMockForAbstractClass(ShippingInformationInterface::class);
 
         $quoteIdMaskMock = $this->getMockBuilder(QuoteIdMask::class)
@@ -73,7 +73,10 @@ public function testSaveAddressInformation()
         $paymentInformationMock = $this->getMockForAbstractClass(PaymentDetailsInterface::class);
         $this->shippingInformationManagementMock->expects($this->once())
             ->method('saveAddressInformation')
-            ->with($quoteId, $addressInformationMock)
+            ->with(
+                self::callback(fn($actualQuoteId): bool => (int) $quoteId === $actualQuoteId),
+                $addressInformationMock
+            )
             ->willReturn($paymentInformationMock);
 
         $this->model->saveAddressInformation($cartId, $addressInformationMock);