Fix #2 Some VAT's business addresses got commas

pH-7 · Aug 22, 2018 · 6ba2b6c · 6ba2b6c
1 parent fd0270b
commit 6ba2b6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Vat/Validator.php b/src/Vat/Validator.php
@@ -54,7 +54,7 @@ public function getName(): string
 
  public function getAddress(): string
  {
- return $this->removeNewLines($this->oResponse->address) ?? '';
+ return $this->cleanAddress($this->oResponse->address) ?? '';
  }
 
  public function getRequestDate(): string
@@ -79,8 +79,8 @@ public function sanitize()
  $this->sCountryCode = strtoupper($this->sCountryCode);
  }
 
- protected function removeNewLines(string $sString): string
+ protected function cleanAddress(string $sString): string
  {
- return str_replace(["\n", "\r\n"], ', ', $sString);
+ return trim(str_replace(["\n", "\r\n"], ', ', $sString), ', ');
  }
 }
diff --git a/tests/Vat/ValidatorTest.php b/tests/Vat/ValidatorTest.php
@@ -89,7 +89,7 @@ public function testAddress(stdClass $oVatDetails)
  {
  $oValidator = $this->setUpAndMock($oVatDetails);
  $this->assertEquals('ELSENSE STEENWEG 12, 1050 ELSENE', $oValidator->getAddress());
- Phake::verify($oValidator)->removeNewLines('ELSENSE STEENWEG 12, 1050 ELSENE');
+ Phake::verify($oValidator)->cleanAddress('ELSENSE STEENWEG 12, 1050 ELSENE');
  }
 
  /**