fix addresses

Author: magroski

src/Geography/Address/Country.php

@@ -130,11 +130,11 @@ public function getFormatted() : string
     public function __toString() : string
     {
         if ($this->isoAlpha2 !== null) {
-            return $this->isoAlpha2;
+            return strtoupper($this->isoAlpha2);
         }
 
         if ($this->isoAlpha3 !== null) {
-            return $this->isoAlpha3;
+            return strtoupper($this->isoAlpha3);
         }
         return $this->name;
     }

src/Geography/Address/Physical/ByCountry/Br/BrPhysicalAddress.php

@@ -167,13 +167,19 @@ public function getAddress() : string
 
         $street       = $this->getStreet() ? $this->getStreet()->getFormatted() : '';
         $municipality = $this->getMunicipality() ? $this->getMunicipality()->getFormatted() : '';
-        $state        = $this->getState() ? $this->getState()->getFormatted() : '';
+        $state        = $this->getState() ? $this->getState()->__toString() : '';
         $postalCode   = $this->getPostalCode() ? $this->getPostalCode()->getFormatted() : '';
-        $country      = $this->getCountry() ? $this->getCountry()->getFormatted() : '';
+        $country      = $this->getCountry() ? $this->getCountry()->__toString() : '';
+
+        $values = [$street, $municipality, $state, $postalCode, $country];
+        $nonEmptyValues = [];
+        foreach ($values as $value) {
+            if($value !== ''){
+                $nonEmptyValues[] = $value;
+            }
+        }
 
-        $formatted = sprintf(
-            '%s. %s, %s, %s %s', $street, $municipality, $state, $postalCode, $country
-        );
+        $formatted = implode(', ', $nonEmptyValues);
 
         return StringUtils::trimSpacesWisely($formatted);
     }

src/Geography/Address/Physical/ByCountry/Us/UsPhysicalAddress.php

@@ -175,22 +175,22 @@ public function getAddress() : string
             return $this->formattedAddress;
         }
 
-        $street     = $this->getStreet() ? $this->getStreet()
-                                                ->getFormatted() : '';
-        $city       = $this->getCity() ? $this->getCity()
-                                              ->getFormatted() : '';
-        $county     = $this->getCounty() ? $this->getCounty()
-                                                ->getFormatted() : '';
-        $state      = $this->getState() ? $this->getState()
-                                               ->getFormatted() : '';
-        $postalCode = $this->getPostalCode() ? $this->getPostalCode()
-                                                    ->getFormatted() : '';
-        $country    = $this->getCountry() ? $this->getCountry()
-                                                 ->getFormatted() : '';
-
-        $formatted = sprintf(
-            '%s, %s, %s, %s %s', $street, $city, $state, $postalCode, $country
-        );
+        $street     = $this->getStreet() ? $this->getStreet()->getFormatted() : '';
+        $city       = $this->getCity() ? $this->getCity()->getFormatted() : '';
+        $county     = $this->getCounty() ? $this->getCounty()->getFormatted() : '';
+        $state      = $this->getState() ? $this->getState()->__toString() : '';
+        $postalCode = $this->getPostalCode() ? $this->getPostalCode()->getFormatted() : '';
+        $country    = $this->getCountry() ? $this->getCountry()->__toString() : '';
+
+        $values = [$street, $city, $state, $postalCode, $country];
+        $nonEmptyValues = [];
+        foreach ($values as $value) {
+            if($value !== ''){
+                $nonEmptyValues[] = $value;
+            }
+        }
+
+        $formatted = implode(', ', $nonEmptyValues);
 
         return StringUtils::trimSpacesWisely($formatted);
     }

src/Geography/Address/Physical/GenericPhysicalAddress.php

@@ -117,13 +117,19 @@ public function getAddress() : string
 
         $street     = $this->getStreet() ? $this->getStreet()->getFormatted() : '';
         $city       = $this->getCity() ? $this->getCity()->getFormatted() : '';
-        $region     = $this->getRegion() ? $this->getRegion()->getFormatted() : '';
+        $region     = $this->getRegion() ? $this->getRegion()->__toString() : '';
         $postalCode = $this->getPostalCode() ? $this->getPostalCode()->getFormatted() : '';
-        $country    = $this->getCountry() ? $this->getCountry()->getFormatted() : '';
+        $country    = $this->getCountry() ? $this->getCountry()->__toString() : '';
+
+        $values = [$street, $city, $region, $postalCode, $country];
+        $nonEmptyValues = [];
+        foreach ($values as $value) {
+            if($value !== ''){
+                $nonEmptyValues[] = $value;
+            }
+        }
 
-        $formatted = sprintf(
-            '%s, %s, %s, %s %s', $street, $city, $region, $postalCode, $country
-        );
+        $formatted = implode(', ', $nonEmptyValues);
 
         return StringUtils::trimSpacesWisely($formatted);
     }

src/Geography/Address/Region.php

@@ -94,6 +94,10 @@ public function getFormatted() : string
 
     public function __toString() : string
     {
+        if ($this->isoAlpha2 !== null) {
+            return strtoupper($this->isoAlpha2);
+        }
+
         return $this->name;
     }
 }