ACP2E-1117: CustomerAddressId not set for new billing address

Author: pradeep1819

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

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Magento\Checkout\Model;
 
@@ -51,7 +51,9 @@ public function __construct(
 
     /**
      * @inheritDoc
+     *
      * @throws LocalizedException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function customerCheckoutAddressMapper(
         int $cartId,
@@ -96,8 +98,8 @@ public function customerCheckoutAddressMapper(
      * @inheritDoc
      */
     public function guestCheckoutAddressMapper(
-        string $cartId,
-        string $email,
+        int|string       $cartId,
+        string           $email,
         PaymentInterface $paymentMethod,
         AddressInterface $billingAddress = null
     ): void {
@@ -107,7 +109,10 @@ public function guestCheckoutAddressMapper(
         $shippingAddress = $quote->getShippingAddress();
 
         if (!empty($billingAddress)) {
-            $sameAsBillingFlag = $this->checkIfShippingAddressMatchesWithBillingAddress($shippingAddress, $billingAddress);
+            $sameAsBillingFlag = $this->checkIfShippingAddressMatchesWithBillingAddress(
+                $shippingAddress,
+                $billingAddress
+            );
         } else {
             $sameAsBillingFlag = 0;
         }

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

@@ -29,14 +29,14 @@ public function customerCheckoutAddressMapper(
     /**
      * Process guest address information for same as billing
      *
-     * @param string $cartId
+     * @param int|string $cartId
      * @param string $email
      * @param PaymentInterface $paymentMethod
      * @param AddressInterface|null $billingAddress
      * @return void
      */
     public function guestCheckoutAddressMapper(
-        string $cartId,
+        int|string $cartId,
         string $email,
         PaymentInterface $paymentMethod,
         AddressInterface $billingAddress = null

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

@@ -207,6 +207,7 @@ public function getPaymentInformation($cartId)
      *
      * @return \Psr\Log\LoggerInterface
      * @deprecated 100.1.8
+     * @see not in use anymore
      */
     private function getLogger()
     {

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

@@ -23,6 +23,7 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
     /**
      * @var \Magento\Quote\Api\BillingAddressManagementInterface
      * @deprecated 100.1.0 This call was substituted to eliminate extra quote::save call
+     * @see not in use anymore
      */
     protected $billingAddressManagement;
 
@@ -208,6 +209,7 @@ public function getPaymentInformation($cartId)
      *
      * @return \Psr\Log\LoggerInterface
      * @deprecated 100.1.8
+     * @see not in use anymore
      */
     private function getLogger()
     {