update abbreviation function

Vinelab · Dec 15, 2016 · a19d2be · a19d2be
1 parent af23d71
commit a19d2be
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/Vinelab/Country/Guide.php b/src/Vinelab/Country/Guide.php
@@ -19,14 +19,19 @@ public function name($abbreviation)
     public function abbreviation($name)
     {
         $countries = $this->config->get('countries');
-
-        return array_search(ucwords($name), $countries);
+        if (array_search(ucwords($name), $countries)) {
+            return array_search(ucwords($name), $countries);
+        } else {
+            foreach ($countries as $key => $value) {
+                if (is_array($value) && in_array(strtolower($name), array_map('strtolower', $value))) {
+                    return $key;
+                }
+            }
+        }
     }
 
     public function all()
     {
         return $this->config->get('countries');
     }
-
 }
-
diff --git a/src/config/countries.php b/src/config/countries.php
@@ -2,7 +2,7 @@
 
 return array(
   'AD' => 'Andorra',
-  'AE' => 'United Arab Emirates',
+  'AE' => ['UAE', 'United Arab Emirates'],
   'AF' => 'Afghanistan',
   'AG' => 'Antigua and Barbuda',
   'AI' => 'Anguilla',
@@ -64,7 +64,7 @@
   'DJ' => 'Djibouti',
   'DK' => 'Denmark',
   'DM' => 'Dominica',
-  'DO' => 'Dominican Republic',
+  'DO' => ['Dominican Republic', 'Dom. Republic'],
   'DZ' => 'Algeria',
   'EC' => 'Ecuador',
   'EE' => 'Estonia',