Merge pull request #200 from sprain/country-codes

Re-introduce output of country code for Liechtenstein
sprain · Oct 3, 2022 · a1a4910 · a1a4910
2 parents d12c885 + bc7a489
commit a1a4910
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/DataGroup/Element/CombinedAddress.php b/src/DataGroup/Element/CombinedAddress.php
@@ -96,7 +96,7 @@ public function getFullAddress(bool $forReceipt = false): string
             $lines[2] = $this->getAddressLine1();
         }
 
-        if (in_array($this->getCountry(), ['CH', 'LI'])) {
+        if ('CH' === $this->getCountry()) {
             $lines[3] = $this->getAddressLine2();
         } else {
             $lines[3] = sprintf("%s-%s", $this->getCountry(), $this->getAddressLine2());

diff --git a/src/DataGroup/Element/StructuredAddress.php b/src/DataGroup/Element/StructuredAddress.php
@@ -141,7 +141,7 @@ public function getFullAddress(bool $forReceipt = false): string
             }
         }
 
-        if (in_array($this->getCountry(), ['CH', 'LI'])) {
+        if ('CH' === $this->getCountry()) {
             $lines[3] = sprintf("%s %s", $this->getPostalCode(), $this->getCity());
         } else {
             $lines[3] = sprintf("%s-%s %s", $this->getCountry(), $this->getPostalCode(), $this->getCity());

diff --git a/tests/DataGroup/Element/CombinedAddressTest.php b/tests/DataGroup/Element/CombinedAddressTest.php
@@ -179,7 +179,7 @@ public function addressProvider(): array
                     '9490 Vaduz',
                     'LI'
                 ),
-                "Thomas Mustermann\nMusterweg 22a\n9490 Vaduz"
+                "Thomas Mustermann\nMusterweg 22a\nLI-9490 Vaduz"
             ],
             [
                 CombinedAddress::create(
@@ -256,7 +256,7 @@ public function addressProviderReceipt(): array
                     '9490 Vaduz',
                     'LI'
                 ),
-                "Thomas Mustermann\nMusterweg 22a\n9490 Vaduz"
+                "Thomas Mustermann\nMusterweg 22a\nLI-9490 Vaduz"
             ],
             [
                 CombinedAddress::create(

diff --git a/tests/DataGroup/Element/StructuredAddressTest.php b/tests/DataGroup/Element/StructuredAddressTest.php
@@ -254,7 +254,7 @@ public function addressProvider(): array
                     'Vaduz',
                     'LI'
                 ),
-                "Thomas Mustermann\n9490 Vaduz"
+                "Thomas Mustermann\nLI-9490 Vaduz"
             ],
             [
                 StructuredAddress::createWithoutStreet(
@@ -351,7 +351,7 @@ public function addressProviderReceipt(): array
                     'Vaduz',
                     'LI'
                 ),
-                "Thomas Mustermann\n9490 Vaduz"
+                "Thomas Mustermann\nLI-9490 Vaduz"
             ],
             [
                 StructuredAddress::createWithoutStreet(