ACP2E-4223: Improved validation for rest api

Author: alzota

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

@@ -213,7 +213,7 @@ public function saveAddressInformation(
 
             $quote->setIsMultiShipping(false);
 
-            $this->quoteAddressValidationService->validateAddressesWithRules($quote, $address, $billingAddress);
+            $this->quoteAddressValidationService->validateAddressesWithRules($address, $billingAddress);
 
             $this->quoteRepository->save($quote);
         } catch (LocalizedException $e) {

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

@@ -130,7 +130,7 @@ private function assignBillingAddress(AddressInterface $address, Quote $quote, b
         $quote->removeAddress($quote->getBillingAddress()->getId());
         $quote->setBillingAddress($address);
 
-        $this->quoteAddressValidationService->validateAddressesWithRules($quote, null, $address);
+        $this->quoteAddressValidationService->validateAddressesWithRules(null, $address);
 
         try {
             $this->getShippingAddressAssignment()->setAddress($quote, $address, $useForShipping);

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

@@ -49,10 +49,8 @@ public function __construct(
      * @param AddressInterface|null $billingAddress
      * @return void
      * @throws InputException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function validateAddressesWithRules(
-        Quote $quote,
         ?AddressInterface $shippingAddress = null,
         ?AddressInterface $billingAddress = null
     ): void {
@@ -108,45 +106,6 @@ private function validateSingleAddress(?AddressInterface $address, string $addre
         return true;
     }
 
-    /**
-     * Validate shipping addresses using validation rules
-     *
-     * @param Quote $quote
-     * @return void
-     * @throws InputException
-     */
-    public function validateShippingAddressWithRules(Quote $quote): void
-    {
-        $shippingAddress = $quote->getShippingAddress();
-
-        if ($shippingAddress) {
-            $this->addressAttributeValidator->validate($shippingAddress, 'shipping');
-        }
-    }
-
-    /**
-     * Validate billing addresses using validation rules
-     *
-     * @param Quote $quote
-     * @return void
-     * @throws InputException
-     */
-    public function validateBillingAddressWithRules(Quote $quote): void
-    {
-        $billingAddress = $quote->getBillingAddress();
-        $shippingAddress = $quote->getShippingAddress();
-
-        if (!$billingAddress) {
-            return;
-        }
-
-        if ($shippingAddress && $this->addressComparator->isEqual($billingAddress, $shippingAddress)) {
-            return;
-        }
-
-        $this->addressAttributeValidator->validate($billingAddress, 'billing');
-    }
-
     /**
      * Check if address has any data for validation
      *

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

@@ -125,7 +125,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
         $address->setSaveInAddressBook($saveInAddressBook);
         $address->setCollectShippingRates(true);
 
-        $this->quoteAddressValidationService->validateAddressesWithRules($quote, $address, null);
+        $this->quoteAddressValidationService->validateAddressesWithRules($address, null);
 
         try {
             $address->save();

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

@@ -160,7 +160,7 @@ public function testAssign(bool $saveInAddressBook, bool $showCompany): void
         $this->quoteAddressValidationServiceMock
             ->expects($this->once())
             ->method('validateAddressesWithRules')
-            ->with($this->quoteMock, $addressMock, null);
+            ->with($addressMock, null);
         $this->model->assign($cartId, $addressMock);
     }