From 16d6f39c4735e19a162258e82242fa4f70b19a3c Mon Sep 17 00:00:00 2001 From: Nicholai Bush Date: Tue, 26 Jun 2018 14:49:45 -0400 Subject: [PATCH 1/2] [ENG-343] Use both Keys and Values as Options --- Helper/UsstateMapHelper.php | 46 +++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/Helper/UsstateMapHelper.php b/Helper/UsstateMapHelper.php index c310761..4f98e85 100644 --- a/Helper/UsstateMapHelper.php +++ b/Helper/UsstateMapHelper.php @@ -12,24 +12,46 @@ class UsstateMapHelper { public static function getMap() { - return ['AL' => 'Alabama', 'AK' => 'Alaska', 'AZ' => 'Arizona', 'AR' => 'Arkansas', 'CA' => 'California', - 'CO' => 'Colorado', 'CT' => 'Connecticut', 'DE' => 'Delaware', 'FL' => 'Florida', 'GA' => 'Georgia', - 'HI' => 'Hawaii', 'ID' => 'Idaho', 'IL' => 'Illinois', 'IN' => 'Indiana', 'IA' => 'Iowa', - 'KS' => 'Kansas', 'KY' => 'Kentucky', 'LA' => 'Louisiana', 'ME' => 'Maine', 'MD' => 'Maryland', - 'MA' => 'Massachusetts', 'MI' => 'Michigan', 'MN' => 'Minnesota', 'MS' => 'Mississippi', 'MO' => 'Missouri', - 'MT' => 'Montana', 'NE' => 'Nebraska', 'NV' => 'Nevada', 'NH' => 'New Hampshire', 'NJ' => 'New Jersey', - 'NM' => 'New Mexico', 'NY' => 'New York', 'NC' => 'North Carolina', 'ND' => 'North Dakota', 'OH' => 'Ohio', - 'OK' => 'Oklahoma', 'OR' => 'Oregon', 'PA' => 'Pennsylvania', 'RI' => 'Rhode Island', 'SC' => 'South Carolina', - 'SD' => 'South Dakota', 'TN' => 'Tennessee', 'TX' => 'Texas', 'UT' => 'Utah', 'VT' => 'Vermont', - 'VA' => 'Virginia', 'WA' => 'Washington', 'WV' => 'West Virginia', 'WI' => 'Wisconsin', 'WY' => 'Wyoming', ]; + return [ + 'AL' => 'Alabama', 'AK' => 'Alaska', + 'AZ' => 'Arizona', 'AR' => 'Arkansas', + 'CA' => 'California', 'CO' => 'Colorado', + 'CT' => 'Connecticut', 'DE' => 'Delaware', + 'FL' => 'Florida', 'GA' => 'Georgia', + 'HI' => 'Hawaii', 'ID' => 'Idaho', + 'IL' => 'Illinois', 'IN' => 'Indiana', + 'IA' => 'Iowa', 'KS' => 'Kansas', + 'KY' => 'Kentucky', 'LA' => 'Louisiana', + 'ME' => 'Maine', 'MD' => 'Maryland', + 'MA' => 'Massachusetts', 'MI' => 'Michigan', + 'MN' => 'Minnesota', 'MS' => 'Mississippi', + 'MO' => 'Missouri', 'MT' => 'Montana', + 'NE' => 'Nebraska', 'NV' => 'Nevada', + 'NH' => 'New Hampshire', 'NJ' => 'New Jersey', + 'NM' => 'New Mexico', 'NY' => 'New York', + 'NC' => 'North Carolina', 'ND' => 'North Dakota', + 'OH' => 'Ohio', 'OK' => 'Oklahoma', + 'OR' => 'Oregon', 'PA' => 'Pennsylvania', + 'RI' => 'Rhode Island', 'SC' => 'South Carolina', + 'SD' => 'South Dakota', 'TN' => 'Tennessee', + 'TX' => 'Texas', 'UT' => 'Utah', + 'VT' => 'Vermont', 'VA' => 'Virginia', + 'WA' => 'Washington', 'WV' => 'West Virginia', + 'WI' => 'Wisconsin', 'WY' => 'Wyoming', ]; } /** - * @return array|null + * @return array */ public static function getStateOptions() { - return array_flip(static::getMap()); + $options = []; + foreach (self::getMap() as $key => $value) { + $options[$key] = $key; + $options[$value] = $key; + } + + return $options; } /** From 7ac8b18c16375dc94eecaf75dc39d799bc2a668d Mon Sep 17 00:00:00 2001 From: Nicholai Bush Date: Tue, 26 Jun 2018 14:59:02 -0400 Subject: [PATCH 2/2] [ENG-343] Use both Keys and Values as Options with php-cs-fixer changes --- Helper/UsstateMapHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Helper/UsstateMapHelper.php b/Helper/UsstateMapHelper.php index 4f98e85..7703595 100644 --- a/Helper/UsstateMapHelper.php +++ b/Helper/UsstateMapHelper.php @@ -47,7 +47,7 @@ public static function getStateOptions() { $options = []; foreach (self::getMap() as $key => $value) { - $options[$key] = $key; + $options[$key] = $key; $options[$value] = $key; }