Merge pull request #27 from Talentify/fix/add-zipcode-validation

change method setValue and remove countCharacters from StringUtils
Talentify · Mar 18, 2021 · 8536997 · 8536997
2 parents cbcce5b + b799027
commit 8536997
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/src/Geography/Address/ByCountry/Us/ZipCode.php b/src/Geography/Address/ByCountry/Us/ZipCode.php
@@ -12,11 +12,11 @@
  */
 class ZipCode extends PostalCode
 {
-    public function setValue(string $value): void
+    protected function setValue(string $value): void
     {
         $value = StringUtils::trimSpacesWisely($value);
         $changedValue = StringUtils::removeNonWordCharacters($value);
-        $characters = StringUtils::countCharacters($changedValue);
+        $characters = strlen($changedValue);
 
         if ($characters == 4) {
             $value = '0' . $value;

diff --git a/src/Geography/Address/PostalCode.php b/src/Geography/Address/PostalCode.php
@@ -24,7 +24,7 @@ public function __construct(string $value)
         $this->setValue($value);
     }
 
-    public function setValue(string $value) : void
+    protected function setValue(string $value) : void
     {
         $normalized = StringUtils::trimSpacesWisely($value);
         if (empty($normalized)) {

diff --git a/src/StringUtils.php b/src/StringUtils.php
@@ -49,9 +49,4 @@ public static function convertCaseToLower(string $value) : string
     {
         return mb_convert_case($value, MB_CASE_LOWER, 'UTF-8');
     }
-
-    public static function countCharacters(string $value) : int
-    {
-        return strlen($value);
-    }
 }