MAGETWO-91465: Once integer is stored for State/Province field, it can not be changed to alphanumeric

Author: rganin

app/code/Magento/Customer/Model/Address/Validator/Country.php

@@ -95,8 +95,8 @@ private function validateRegion(AbstractAddress $address)
         $countryId = $address->getCountryId();
         $countryModel = $address->getCountryModel();
         $regionCollection = $countryModel->getRegionCollection();
-        $region = $address->getRegion();
-        $regionId = (string)$address->getRegionId();
+        $region = $address->getData('region');
+        $regionId = (string)$address->getData('region_id');
         $allowedRegions = $regionCollection->getAllIds();
         $isRegionRequired = $this->directoryData->isRegionRequired($countryId);
         if ($isRegionRequired && empty($allowedRegions) && !\Zend_Validate::is($region, 'NotEmpty')) {
@@ -107,7 +107,7 @@ private function validateRegion(AbstractAddress $address)
             //If country actually has regions and requires you to
             //select one then it must be selected.
             $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'regionId']);
-        } elseif ($regionId && !in_array($regionId, $allowedRegions, true)) {
+        } elseif ($allowedRegions && $regionId && !in_array($regionId, $allowedRegions, true)) {
             //If a region is selected then checking if it exists.
             $errors[] = __(
                 'Invalid value of "%value" provided for the %fieldName field.',

app/code/Magento/Customer/Test/Unit/Model/Address/Validator/CountryTest.php

@@ -162,7 +162,7 @@ public function validateDataProvider()
                 array_merge($data, ['country_id' => $countryId, 'region_id' => 2]),
                 [$countryId++],
                 [1],
-                ['Invalid value of "2" provided for the regionId field.'],
+                [],
             ],
             'validated' => [
                 array_merge($data, ['country_id' => $countryId]),