diff --git a/app/code/Magento/Directory/etc/zip_codes.xml b/app/code/Magento/Directory/etc/zip_codes.xml index f186102911a6a..d915d2945e9e7 100644 --- a/app/code/Magento/Directory/etc/zip_codes.xml +++ b/app/code/Magento/Directory/etc/zip_codes.xml @@ -258,7 +258,7 @@ - ^[a-zA-Z]{2}[0-9]{1}\s[0-9]{1}[a-zA-Z]{2}$ + ^[gG][yY]([1-9]|10)\s?[0-9]{1}[a-zA-Z]{2}$ @@ -378,7 +378,7 @@ - ^[a-zA-Z]{2}[0-9]{1}\s[0-9]{1}[a-zA-Z]{2}$ + ^[jJ][eE][1-5]{1}\s?[0-9]{1}[a-zA-Z]{2}$ diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php index 0f3a4a20fec09..3806cdba939cd 100644 --- a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php +++ b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php @@ -152,7 +152,7 @@ public function getPostcodesDataProvider() ['countryId' => 'GB', 'postcode' => 'Q1 2PL'], ['countryId' => 'GE', 'postcode' => '1234'], ['countryId' => 'GF', 'postcode' => '12345'], - ['countryId' => 'GG', 'postcode' => 'PL5 7TH'], + ['countryId' => 'GG', 'postcode' => 'GY10 2AB'], ['countryId' => 'GL', 'postcode' => '1234'], ['countryId' => 'GH', 'postcode' => 'GA18400'], ['countryId' => 'GN', 'postcode' => '123'], @@ -174,7 +174,7 @@ public function getPostcodesDataProvider() ['countryId' => 'IN', 'postcode' => '123456'], ['countryId' => 'IS', 'postcode' => '123'], ['countryId' => 'IT', 'postcode' => '12345'], - ['countryId' => 'JE', 'postcode' => 'TY8 9PL'], + ['countryId' => 'JE', 'postcode' => 'JE2 4PJ'], ['countryId' => 'JO', 'postcode' => '12345'], ['countryId' => 'JP', 'postcode' => '123-4567'], ['countryId' => 'JP', 'postcode' => '1234567'],