From d22d67ba88b5f95cd359d4a2a5e5a491cdc9d9b9 Mon Sep 17 00:00:00 2001
From: Sebastian Gehrt <gehrt@dlrg.de>
Date: Sun, 11 Jun 2023 10:32:05 +0200
Subject: [PATCH 1/2] Add ISO 3166 Alpha 2 Validation

---
 src/IsoCodes/ISO3166A2.php             | 275 +++++++++++++++++++++++++
 tests/IsoCodes/Tests/ISO3166A2Test.php |  35 ++++
 2 files changed, 310 insertions(+)
 create mode 100644 src/IsoCodes/ISO3166A2.php
 create mode 100644 tests/IsoCodes/Tests/ISO3166A2Test.php

diff --git a/src/IsoCodes/ISO3166A2.php b/src/IsoCodes/ISO3166A2.php
new file mode 100644
index 0000000..f0a4b03
--- /dev/null
+++ b/src/IsoCodes/ISO3166A2.php
@@ -0,0 +1,275 @@
+<?php
+
+namespace IsoCodes;
+
+/**
+ * Validate Country Codes in ISO 3166 Alpha 2 format
+ */
+class ISO3166A2 implements IsoCodeInterface
+{
+    protected $countries = ['AD',
+        'AE',
+        'AF',
+        'AG',
+        'AI',
+        'AL',
+        'AM',
+        'AN',
+        'AO',
+        'AQ',
+        'AR',
+        'AS',
+        'AT',
+        'AU',
+        'AW',
+        'AX',
+        'AZ',
+        'BA',
+        'BB',
+        'BD',
+        'BE',
+        'BF',
+        'BG',
+        'BH',
+        'BI',
+        'BJ',
+        'BL',
+        'BM',
+        'BN',
+        'BO',
+        'BQ',
+        'BR',
+        'BS',
+        'BT',
+        'BV',
+        'BW',
+        'BY',
+        'BZ',
+        'CA',
+        'CC',
+        'CD',
+        'CF',
+        'CG',
+        'CH',
+        'CI',
+        'CK',
+        'CL',
+        'CM',
+        'CN',
+        'CO',
+        'CR',
+        'CS',
+        'CU',
+        'CV',
+        'CW',
+        'CX',
+        'CY',
+        'CZ',
+        'DE',
+        'DJ',
+        'DK',
+        'DM',
+        'DO',
+        'DZ',
+        'EC',
+        'EE',
+        'EG',
+        'EH',
+        'ER',
+        'ES',
+        'ET',
+        'FI',
+        'FJ',
+        'FK',
+        'FM',
+        'FO',
+        'FR',
+        'GA',
+        'GB',
+        'GD',
+        'GE',
+        'GF',
+        'GG',
+        'GH',
+        'GI',
+        'GL',
+        'GM',
+        'GN',
+        'GP',
+        'GQ',
+        'GR',
+        'GS',
+        'GT',
+        'GU',
+        'GW',
+        'GY',
+        'HK',
+        'HM',
+        'HN',
+        'HR',
+        'HT',
+        'HU',
+        'ID',
+        'IE',
+        'IL',
+        'IM',
+        'IN',
+        'IO',
+        'IQ',
+        'IR',
+        'IS',
+        'IT',
+        'JE',
+        'JM',
+        'JO',
+        'JP',
+        'KE',
+        'KG',
+        'KH',
+        'KI',
+        'KM',
+        'KN',
+        'KP',
+        'KR',
+        'KW',
+        'KY',
+        'KZ',
+        'LA',
+        'LB',
+        'LC',
+        'LI',
+        'LK',
+        'LR',
+        'LS',
+        'LT',
+        'LU',
+        'LV',
+        'LY',
+        'MA',
+        'MC',
+        'MD',
+        'ME',
+        'MF',
+        'MG',
+        'MH',
+        'MK',
+        'ML',
+        'MM',
+        'MN',
+        'MO',
+        'MP',
+        'MQ',
+        'MR',
+        'MS',
+        'MT',
+        'MU',
+        'MV',
+        'MW',
+        'MX',
+        'MY',
+        'MZ',
+        'NA',
+        'NC',
+        'NE',
+        'NF',
+        'NG',
+        'NI',
+        'NL',
+        'NO',
+        'NP',
+        'NR',
+        'NU',
+        'NZ',
+        'OM',
+        'PA',
+        'PE',
+        'PF',
+        'PG',
+        'PH',
+        'PK',
+        'PL',
+        'PM',
+        'PN',
+        'PR',
+        'PS',
+        'PT',
+        'PW',
+        'PY',
+        'QA',
+        'RE',
+        'RO',
+        'RS',
+        'RU',
+        'RW',
+        'SA',
+        'SB',
+        'SC',
+        'SD',
+        'SE',
+        'SG',
+        'SH',
+        'SI',
+        'SJ',
+        'SK',
+        'SL',
+        'SM',
+        'SN',
+        'SO',
+        'SR',
+        'SS',
+        'ST',
+        'SV',
+        'SX',
+        'SY',
+        'SZ',
+        'TC',
+        'TD',
+        'TF',
+        'TG',
+        'TH',
+        'TJ',
+        'TK',
+        'TL',
+        'TM',
+        'TN',
+        'TO',
+        'TR',
+        'TT',
+        'TV',
+        'TW',
+        'TZ',
+        'UA',
+        'UG',
+        'UM',
+        'US',
+        'UY',
+        'UZ',
+        'VA',
+        'VC',
+        'VE',
+        'VG',
+        'VI',
+        'VN',
+        'VU',
+        'WF',
+        'WS',
+        'XK',
+        'YE',
+        'YT',
+        'ZA',
+        'ZM',
+        'ZW'
+    ];
+
+    /**
+     * @param string $alpha2
+     * @return bool
+     */
+    public static function validate($alpha2)
+    {
+        if($alpha2 === null){
+            return false;
+        }
+        return in_array($alpha2);
+    }
+}
\ No newline at end of file
diff --git a/tests/IsoCodes/Tests/ISO3166A2Test.php b/tests/IsoCodes/Tests/ISO3166A2Test.php
new file mode 100644
index 0000000..efb0d0e
--- /dev/null
+++ b/tests/IsoCodes/Tests/ISO3166A2Test.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace IsoCodes\Tests;
+
+/**
+ * Class ISO3166A2.
+ *
+ * @covers \IsoCodes\ISO3166A2
+ */
+class ISO3166A2Test extends AbstractIsoCodeTest
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getValidValues()
+    {
+        return [
+            ['US'],
+            ['DE'],
+            ['NL']
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getInvalidValues()
+    {
+        return [
+            ['ZZ'],      // Value doesn't exist
+            ['ZZZ'],     // Value too long
+            [123]        // No string
+        ];
+    }
+}
\ No newline at end of file

From 99b56cee510dab8684e0c3314c15530022223f01 Mon Sep 17 00:00:00 2001
From: Sebastian Gehrt <gehrt@dlrg.de>
Date: Sun, 11 Jun 2023 10:53:57 +0200
Subject: [PATCH 2/2] Fix validation

---
 src/IsoCodes/ISO3166A2.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/IsoCodes/ISO3166A2.php b/src/IsoCodes/ISO3166A2.php
index f0a4b03..2a9fb05 100644
--- a/src/IsoCodes/ISO3166A2.php
+++ b/src/IsoCodes/ISO3166A2.php
@@ -7,7 +7,7 @@
  */
 class ISO3166A2 implements IsoCodeInterface
 {
-    protected $countries = ['AD',
+    private CONST COUNTRIES = ['AD',
         'AE',
         'AF',
         'AG',
@@ -270,6 +270,6 @@ public static function validate($alpha2)
         if($alpha2 === null){
             return false;
         }
-        return in_array($alpha2);
+        return in_array($alpha2, self::COUNTRIES, true );
     }
 }
\ No newline at end of file