MAGETWO-61725: [GITHUB] Improve address save flow to allow to use custom validators #7552

Author: Aleksandr Osadchyi

app/code/Magento/Customer/Model/Address/AbstractAddress.php

@@ -554,6 +554,8 @@ public function getDataModel($defaultBillingAddressId = null, $defaultShippingAd
     /**
      * Validate address attribute values
      *
+     *
+     *
      * @return bool|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -562,23 +564,24 @@ public function validate()
     {
         $errors = [];
         if (!\Zend_Validate::is($this->getFirstname(), 'NotEmpty')) {
-            $errors[] = __('Please enter the first name.');
+            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'firstname']);
         }
 
         if (!\Zend_Validate::is($this->getLastname(), 'NotEmpty')) {
-            $errors[] = __('Please enter the last name.');
+            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'lastname']);
         }
 
         if (!\Zend_Validate::is($this->getStreetLine(1), 'NotEmpty')) {
-            $errors[] = __('Please enter the street.');
+            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'street']);
         }
 
         if (!\Zend_Validate::is($this->getCity(), 'NotEmpty')) {
-            $errors[] = __('Please enter the city.');
+            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'city']);
         }
 
         if (!\Zend_Validate::is($this->getTelephone(), 'NotEmpty')) {
-            $errors[] = __('Please enter the phone number.');
+            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'telephone']);
+
         }
 
         $_havingOptionalZip = $this->_directoryData->getCountriesWithOptionalZip();
@@ -590,11 +593,11 @@ public function validate()
             'NotEmpty'
         )
         ) {
-            $errors[] = __('Please enter the zip/postal code.');
+            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'postcode']);
         }
 
         if (!\Zend_Validate::is($this->getCountryId(), 'NotEmpty')) {
-            $errors[] = __('Please enter the country.');
+            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'countryId']);
         }
 
         if ($this->getCountryModel()->getRegionCollection()->getSize() && !\Zend_Validate::is(
@@ -604,7 +607,7 @@ public function validate()
             $this->getCountryId()
         )
         ) {
-            $errors[] = __('Please enter the state/province.');
+            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'regionId']);
         }
 
         if (empty($errors) || $this->getShouldIgnoreValidation()) {

dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php

@@ -432,7 +432,8 @@ public function testCreateCustomerWithoutAddressRequiresException()
                 $expectedException = new InputException();
                 $expectedException->addError(
                     __(
-                        'Please enter the first name.'
+                        '%fieldName is a required field.',
+                        ['fieldName' => Address::FIRSTNAME]
                     )
                 );
                 $this->assertInstanceOf('SoapFault', $e);
@@ -446,7 +447,8 @@ public function testCreateCustomerWithoutAddressRequiresException()
                 $this->assertEquals(HTTPExceptionCodes::HTTP_BAD_REQUEST, $e->getCode());
                 $exceptionData = $this->processRestExceptionResult($e);
                 $expectedExceptionData = [
-                    'message' => 'Please enter the first name.',
+                    'message' => '%fieldName is a required field.',
+                    'parameters' => ['fieldName' => Address::FIRSTNAME],
                 ];
                 $this->assertEquals($expectedExceptionData, $exceptionData);
             }

dev/tests/integration/testsuite/Magento/Customer/Api/AddressRepositoryTest.php

@@ -207,8 +207,8 @@ public function testSaveNewInvalidAddress()
             $this->assertEquals('One or more input exceptions have occurred.', $exception->getMessage());
             $errors = $exception->getErrors();
             $this->assertCount(2, $errors);
-            $this->assertEquals('Please enter the first name.', $errors[0]->getLogMessage());
-            $this->assertEquals('Please enter the last name.', $errors[1]->getLogMessage());
+            $this->assertEquals('firstname is a required field.', $errors[0]->getLogMessage());
+            $this->assertEquals('lastname is a required field.', $errors[1]->getLogMessage());
         }
     }
 

dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php

@@ -150,8 +150,8 @@ public function testFailedFormPostAction()
             $this->equalTo(
                 [
                     'One or more input exceptions have occurred.',
-                    'Please enter the street.',
-                    'Please enter the city.',
+                    'street is a required field.',
+                    'city is a required field.',
                 ]
             ),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR

dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php

@@ -213,8 +213,8 @@ public function testSaveNewInvalidAddress()
             $this->assertEquals('One or more input exceptions have occurred.', $exception->getMessage());
             $errors = $exception->getErrors();
             $this->assertCount(2, $errors);
-            $this->assertEquals('Please enter the first name.', $errors[0]->getLogMessage());
-            $this->assertEquals('Please enter the last name.', $errors[1]->getLogMessage());
+            $this->assertEquals('firstname is a required field.', $errors[0]->getLogMessage());
+            $this->assertEquals('lastname is a required field.', $errors[1]->getLogMessage());
         }
     }