MAGETWO-97456: Cart's customer and address mismatch

Author: StasKozar

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

@@ -58,15 +58,16 @@ public function __construct(
      * @param AddressInterface $address
      * @param int|null $customerId Cart belongs to
      * @return void
-     * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
+     * @throws NoSuchEntityException The specified customer ID or address ID is not valid.
      */
     private function doValidate(AddressInterface $address, $customerId)
     {
         //validate customer id
         if ($customerId) {
-            $customer = $this->customerRepository->getById($customerId);
-            if (!$customer->getId()) {
-                throw new \Magento\Framework\Exception\NoSuchEntityException(
+            try {
+                $customer = $this->customerRepository->getById($customerId);
+            } catch (NoSuchEntityException $exception) {
+                throw new NoSuchEntityException(
                     __('Invalid customer id %1', $customerId)
                 );
             }
@@ -75,15 +76,15 @@ private function doValidate(AddressInterface $address, $customerId)
         if ($address->getCustomerAddressId()) {
             //Existing address cannot belong to a guest
             if (!$customerId) {
-                throw new \Magento\Framework\Exception\NoSuchEntityException(
+                throw new NoSuchEntityException(
                     __('Invalid customer address id %1', $address->getCustomerAddressId())
                 );
             }
             //Validating address ID
             try {
                 $this->addressRepository->getById($address->getCustomerAddressId());
             } catch (NoSuchEntityException $e) {
-                throw new \Magento\Framework\Exception\NoSuchEntityException(
+                throw new NoSuchEntityException(
                     __('Invalid address id %1', $address->getId())
                 );
             }
@@ -93,7 +94,7 @@ private function doValidate(AddressInterface $address, $customerId)
                 return $address->getId();
             }, $this->customerRepository->getById($customerId)->getAddresses());
             if (!in_array($address->getCustomerAddressId(), $applicableAddressIds)) {
-                throw new \Magento\Framework\Exception\NoSuchEntityException(
+                throw new NoSuchEntityException(
                     __('Invalid customer address id %1', $address->getCustomerAddressId())
                 );
             }
@@ -105,7 +106,6 @@ private function doValidate(AddressInterface $address, $customerId)
      *
      * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
      * @return bool
-     * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
      */
     public function validate(AddressInterface $addressData): bool
     {
@@ -120,7 +120,6 @@ public function validate(AddressInterface $addressData): bool
      * @param CartInterface $cart
      * @param AddressInterface $address
      * @return void
-     * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
      */
     public function validateForCart(CartInterface $cart, AddressInterface $address)
     {

app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php

@@ -71,7 +71,7 @@ public function testValidateInvalidCustomer()
 
         $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($customerId);
         $this->customerRepositoryMock->expects($this->once())->method('getById')->with($customerId)
-            ->willReturn($customerMock);
+            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
         $this->model->validate($address);
     }
 
@@ -111,7 +111,6 @@ public function testValidateWithValidAddress()
         $customerAddress = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
 
         $this->customerRepositoryMock->expects($this->exactly(2))->method('getById')->willReturn($customerMock);
-        $customerMock->expects($this->once())->method('getId')->willReturn($addressCustomer);
 
         $this->addressRepositoryMock->expects($this->once())->method('getById')->willReturn($this->quoteAddressMock);
         $this->quoteAddressMock->expects($this->any())->method('getCustomerId')->willReturn($addressCustomer);

dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses_rollback.php

@@ -22,9 +22,6 @@
     $customer = $customerRepo->get('customer_with_addresses@test.com');
     /** @var AddressRepositoryInterface $addressRepo */
     $addressRepo = $objectManager->get(AddressRepositoryInterface::class);
-    foreach ($customer->getAddresses() as $address) {
-        $addressRepo->delete($address);
-    }
     $customerRepo->delete($customer);
 } catch (NoSuchEntityException $exception) {
     //Already deleted