Merge pull request #8 from paulboenisch/master

adding Kosovo to country list when iso switch is false
sameer-shelavale · Feb 12, 2019 · 1c9a4bf · 1c9a4bf
2 parents d5faa8e + 1d9078d
commit 1c9a4bf
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea/*
diff --git a/README.md b/README.md
@@ -33,6 +33,11 @@ Get simple key-value array by default it returns alpha2 => name pairs
 $countries = CountriesArray::get();
 ```
 
+Include non iso countries:
+```
+$countries = CountriesArray::iso(false)->get();
+```
+
 Get key values pairs
 
 ```

diff --git a/src/CountriesArray.php b/src/CountriesArray.php
@@ -269,6 +269,50 @@ class CountriesArray{
         "ZW" => array( 'alpha2'=>'ZW', 'alpha3'=>'ZWE', 'num'=>'716', 'isd'=> '263', "name" => "Zimbabwe", "continent" => "Africa")
     );
 
+    /**
+     * Non iso countries
+     * @var array
+     */
+    public static $countries_non_iso = array(
+        "XK" => array( 'alpha2'=>'XK', 'alpha3'=>'KOS', 'num'=>'383', 'isd'=> '383', "name" => "Kosovo", "continent" => "Europe", ),
+    );
+
+    /**
+     * CountriesArray constructor.
+     * @param boolean $iso
+     * @author Paul Bönisch - <paul.boenisch@umwerk.net>
+     */
+    public function __construct($iso)
+    {
+        if(!$iso){
+            self::$countries = array_merge(self::$countries, self::$countries_non_iso);
+        }
+    }
+
+    /**
+     * Returns countries array depending on iso flag
+     * @param bool $iso
+     * @return array
+     * @author Paul Bönisch - <paul.boenisch@umwerk.net>
+     */
+    public static function getCountries($iso = true){
+        $result = self::$countries;
+        if(!$iso){
+            $result = array_merge($result, self::$countries_non_iso);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns instance of ContriesArray with $iso property according to $value parameter
+     * @param $value
+     * @return CountriesArray
+     * @author Paul Bönisch - <paul.boenisch@umwerk.net>
+     */
+    public static function iso($value){
+        return new CountriesArray($value);
+    }
 
     /*
      * function get()
@@ -379,15 +423,15 @@ public static function getFromContinent( $keyField = 'alpha2', $requestedField =
                 if ( $continent ) {
                     if ( $country['continent'] == $continent ) {
                         $result[ $country[ $keyField ] ] = $country[ $requestedField ];
-                    }                    
+                    }
                 } else {
                     $result[ $country[ $keyField ] ] = $country[ $requestedField ];
                 }
             } else {
                 if ( $continent ) {
                     if ( $country['continent'] == $continent ) {
                         $result[] = $country[ $requestedField ];
-                    }                    
+                    }
                 } else {
                     $result[] = $country[ $requestedField ];
                 }