Merge pull request #16 from Talentify/develop

magroski · web-flow · commit ee1b4e2e8fba · 2019-09-04T22:58:15.000-03:00
Improve Street format
diff --git a/src/Geography/Address/Street.php b/src/Geography/Address/Street.php
@@ -96,7 +96,12 @@ public function equals(?ValueObject $object) : bool
 
     public function getFormatted() : string
     {
-        return sprintf('%s %s, %s', $this->getName(), $this->getNumber(), $this->getOtherIdentifiers());
+        $firstPart = sprintf('%s %s', $this->getNumber(), $this->getName());
+        if ($this->getOtherIdentifiers()) {
+            return $firstPart . ', ' . $this->getOtherIdentifiers();
+        }
+
+        return $firstPart;
     }
 
     public function __toString() : string

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,12 @@ public function equals(?ValueObject $object) : bool`
`96`	`96`
`97`	`97`	`public function getFormatted() : string`
`98`	`98`	`{`
`99`		`- return sprintf('%s %s, %s', $this->getName(), $this->getNumber(), $this->getOtherIdentifiers());`
	`99`	`+ $firstPart = sprintf('%s %s', $this->getNumber(), $this->getName());`
	`100`	`+ if ($this->getOtherIdentifiers()) {`
	`101`	`+ return $firstPart . ', ' . $this->getOtherIdentifiers();`
	`102`	`+ }`
	`103`	`+`
	`104`	`+ return $firstPart;`
`100`	`105`	`}`
`101`	`106`
`102`	`107`	`public function __toString() : string`