Add countryCode length checker

Author: bjoern-hempel

src/Country.php

@@ -29,10 +29,12 @@
  */
 class Country
 {
+    private const LENGTH_COUNTRY_CODE = 2;
+
     /**
-     * @param string $country
+     * @param string $countryCode
      */
-    public function __construct(protected string $country)
+    public function __construct(protected string $countryCode)
     {
     }
 
@@ -60,15 +62,19 @@ private function getLanguage(array $values, string $language): string
      */
     public function getCode(): string
     {
-        if ($this->country === '') {
+        if ($this->countryCode === '') {
+            return CountryUnknown::COUNTRY_CODE_IV;
+        }
+
+        if (strlen($this->countryCode) !== self::LENGTH_COUNTRY_CODE) {
             return CountryUnknown::COUNTRY_CODE_IV;
         }
 
-        if (!array_key_exists($this->country, CountryAll::COUNTRY_NAMES)) {
+        if (!array_key_exists($this->countryCode, CountryAll::COUNTRY_NAMES)) {
             return CountryUnknown::COUNTRY_CODE_UK;
         }
 
-        return $this->country;
+        return $this->countryCode;
     }
 
     /**
@@ -80,14 +86,20 @@ public function getCode(): string
      */
     public function getName(string $language = Language::EN_GB): string
     {
-        if ($this->country === '') {
+        $countryCode = $this->getCode();
+
+        if ($countryCode === CountryUnknown::COUNTRY_CODE_IV) {
             return $this->getLanguage(CountryUnknown::COUNTRY_NAME_IV, $language);
         }
 
-        if (!array_key_exists($this->country, CountryAll::COUNTRY_NAMES)) {
+        if ($countryCode === CountryUnknown::COUNTRY_CODE_UK) {
+            return $this->getLanguage(CountryUnknown::COUNTRY_NAME_UK, $language);
+        }
+
+        if (!array_key_exists($countryCode, CountryAll::COUNTRY_NAMES)) {
             return $this->getLanguage(CountryUnknown::COUNTRY_NAME_UK, $language);
         }
 
-        return $this->getLanguage(CountryAll::COUNTRY_NAMES[$this->country], $language);
+        return $this->getLanguage(CountryAll::COUNTRY_NAMES[$this->countryCode], $language);
     }
 }

tests/Unit/CountryTest.php

@@ -140,6 +140,10 @@ public function dataProvider(): array
              */
             [++$number, 'getCode', null, '', CountryUnknown::COUNTRY_CODE_IV],
             [++$number, 'getName', null, '', CountryUnknown::COUNTRY_NAME_IV[Language::EN_GB]],
+            [++$number, 'getCode', null, 'DEU', CountryUnknown::COUNTRY_CODE_IV],
+            [++$number, 'getName', null, 'DEU', CountryUnknown::COUNTRY_NAME_IV[Language::EN_GB]],
+            [++$number, 'getCode', null, 'D', CountryUnknown::COUNTRY_CODE_IV],
+            [++$number, 'getName', null, 'D', CountryUnknown::COUNTRY_NAME_IV[Language::EN_GB]],
             [++$number, 'getCode', null, 'XX', CountryUnknown::COUNTRY_CODE_UK],
             [++$number, 'getName', null, 'XX', CountryUnknown::COUNTRY_NAME_UK[Language::EN_GB]],
         ];