add more Guards

fixes #117

Author: alcohol

src/Guards.php

@@ -15,6 +15,18 @@
 
 final class Guards
 {
+    /**
+     * Assert that input is not an empty string.
+     *
+     * @throws \League\ISO3166\Exception\DomainException if input is an empty string
+     */
+    public static function guardAgainstInvalidName(string $name): void
+    {
+        if ('' === trim($name)) {
+            throw new DomainException('Expected string, got empty string');
+        }
+    }
+
     /**
      * Assert that input looks like an alpha2 key.
      *

src/ISO3166.php

@@ -43,6 +43,8 @@ public function __construct(array $countries = [])
      */
     public function name(string $name): array
     {
+        Guards::guardAgainstInvalidName($name);
+
         return $this->lookup(self::KEY_NAME, $name);
     }
 
@@ -81,6 +83,8 @@ public function numeric(string $numeric): array
      */
     public function exactName(string $name): array
     {
+        Guards::guardAgainstInvalidName($name);
+        
         $value = mb_strtolower($name);
 
         foreach ($this->countries as $country) {

src/ISO3166DataValidator.php

@@ -36,20 +36,26 @@ public function validate(array $data): array
      */
     private function assertEntryHasRequiredKeys(array $entry): void
     {
+        if (!isset($entry[ISO3166::KEY_NAME])) {
+            throw new DomainException('Each data entry must have a name key.');
+        }
+
+        Guards::guardAgainstInvalidName($entry[ISO3166::KEY_NAME]);
+
         if (!isset($entry[ISO3166::KEY_ALPHA2])) {
-            throw new DomainException('Each data entry must have a valid alpha2 key.');
+            throw new DomainException('Each data entry must have a alpha2 key.');
         }
 
         Guards::guardAgainstInvalidAlpha2($entry[ISO3166::KEY_ALPHA2]);
 
         if (!isset($entry[ISO3166::KEY_ALPHA3])) {
-            throw new DomainException('Each data entry must have a valid alpha3 key.');
+            throw new DomainException('Each data entry must have a alpha3 key.');
         }
 
         Guards::guardAgainstInvalidAlpha3($entry[ISO3166::KEY_ALPHA3]);
 
         if (!isset($entry[ISO3166::KEY_NUMERIC])) {
-            throw new DomainException('Each data entry must have a valid numeric key.');
+            throw new DomainException('Each data entry must have a numeric key.');
         }
 
         Guards::guardAgainstInvalidNumeric($entry[ISO3166::KEY_NUMERIC]);

tests/ISO3166DataValidatorTest.php

@@ -53,22 +53,27 @@ public function requiredKeysProvider(): array
     {
         return [
             'entry missing alpha2' => [
-                [[ISO3166::KEY_ALPHA3 => 'FOO', ISO3166::KEY_NUMERIC => '001']],
+                [[ISO3166::KEY_ALPHA3 => 'FOO', ISO3166::KEY_NUMERIC => '001', ISO3166::KEY_NAME => 'Foo']],
                 DomainException::class,
-                '{^Each data entry must have a valid alpha2 key.$}',
+                '{^Each data entry must have a alpha2 key.$}',
             ],
             'entry missing alpha3' => [
-                [[ISO3166::KEY_ALPHA2 => 'FO', ISO3166::KEY_NUMERIC => '001']],
+                [[ISO3166::KEY_ALPHA2 => 'FO', ISO3166::KEY_NUMERIC => '001', ISO3166::KEY_NAME => 'Foo']],
                 DomainException::class,
-                '{^Each data entry must have a valid alpha3 key.$}',
+                '{^Each data entry must have a alpha3 key.$}',
             ],
             'entry missing numeric' => [
-                [[ISO3166::KEY_ALPHA2 => 'FO', ISO3166::KEY_ALPHA3 => 'FOO']],
+                [[ISO3166::KEY_ALPHA2 => 'FO', ISO3166::KEY_ALPHA3 => 'FOO', ISO3166::KEY_NAME => 'Foo']],
                 DomainException::class,
-                '{^Each data entry must have a valid numeric key.$}',
+                '{^Each data entry must have a numeric key.$}',
             ],
-            'entry is complete' => [
+            'entry missing name' => [
                 [[ISO3166::KEY_ALPHA2 => 'FO', ISO3166::KEY_ALPHA3 => 'FOO', ISO3166::KEY_NUMERIC => '001']],
+                DomainException::class,
+                '{^Each data entry must have a name key.$}',
+            ],
+            'entry is complete' => [
+                [[ISO3166::KEY_ALPHA2 => 'FO', ISO3166::KEY_ALPHA3 => 'FOO', ISO3166::KEY_NUMERIC => '001', ISO3166::KEY_NAME => 'Foo']],
                 null,
                 null,
             ],

tests/ISO3166Test.php

@@ -185,7 +185,8 @@ public function invalidNameProvider(): array
         $noMatch = sprintf('{^No "%s" key found matching: .*$}', ISO3166::KEY_NAME);
 
         return [
-            ['000', OutOfBoundsException::class, $noMatch],
+            ['', DomainException::class, '{^Expected string, got empty string$}'],
+            ['Dummy', OutOfBoundsException::class, $noMatch],
         ];
     }
 
@@ -221,6 +222,7 @@ public function invalidExactNameProvider(): array
         $noMatch = sprintf('{^No "%s" key found matching: .*$}', ISO3166::KEY_NAME);
 
         return [
+            ['', DomainException::class, '{^Expected string, got empty string$}'],
             ['FO', OutOfBoundsException::class, $noMatch],
             ['BA', OutOfBoundsException::class, $noMatch],
         ];