Merge branch 'release/v8.1.1'

.styleci.yml

@@ -6,10 +6,15 @@ enabled:
  - ereg_to_preg
  - no_useless_else
  - mb_str_functions
+ - set_type_to_cast
+ - logical_operators
  - short_list_syntax
  - no_short_echo_tag
  - strict_comparison
+ - no_homoglyph_names
+ - no_useless_sprintf
  - phpdoc_link_to_see
+ - string_line_ending
  - property_separation
  - no_php4_constructor
  - php_unit_namespaced
@@ -20,18 +25,19 @@ enabled:
  - length_ordered_imports
  - modernize_types_casting
  - non_printable_character
- - explicit_string_variable
  - no_unneeded_final_method
+ - ternary_to_elvis_operator
  - blank_line_before_declare
  - combine_consecutive_issets
  - combine_consecutive_unsets
- - explicit_indirect_variable
  - ternary_to_null_coalescing
  - escape_implicit_backslashes
  - fully_qualified_strict_types
  - no_null_property_initialization
+ - no_trailing_whitespace_in_string
  - multiline_comment_opening_closing
  - not_operator_with_successor_space
+ - simple_to_complex_string_variable
  - phpdoc_add_missing_param_annotation
  - php_unit_set_up_tear_down_visibility
 

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 
 
+## [v8.1.1] - 2022-05-01
+- Fix currency validator rule to check if the key is 3 capital char string
+- Fix country validator rule to check if the key is 2 lower char string
+- Add country data protection (#217)
+- Rename Belarus country german name from Weißrussland (#214 & #211)
+
 ## [v8.1.0] - 2021-10-05
 - UK is no longer a EU member state (longlist) (#179)
 - Fix letter case for language case (fix #117 & #118)
@@ -163,6 +169,7 @@ This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 ## v1.0.0 - 2016-08-20
 - Tag first release.
 
+[v8.1.1]: https://github.com/rinvex/countries/compare/v8.1.0...v8.1.1
 [v8.1.0]: https://github.com/rinvex/countries/compare/v8.0.0...v8.1.0
 [v8.0.0]: https://github.com/rinvex/countries/compare/v7.3.2...v8.0.0
 [v7.3.2]: https://github.com/rinvex/countries/compare/v7.3.1...v7.3.2

README.md

@@ -160,8 +160,8 @@ $egypt->getDivisions(); $egypt->getTranslation();
 // ['Africa/Cairo'] // ['ar_EG']
 $egypt->getTimezones(); $egypt->getLocales();
 
-// {"ara":{"official":"جمهورية مصر العربية","common":"مصر"}}
-$egypt->getNativeNames();
+// Other // {"ara":{"official":"جمهورية مصر العربية","common":"مصر"}}
+$egypt->getDataProtection() $egypt->getNativeNames();
 
 // {"iso_4217_code":"EGP","iso_4217_numeric":818,"iso_4217_name":"Egyptian Pound","iso_4217_minor_unit":2}
 $egypt->getCurrency();
@@ -175,7 +175,7 @@ $egypt->getTranslations();
 // {"continent":{"AF":"Africa"},"postal_code":true,"latitude":"27 00 N","latitude_dec":"26.756103515625","longitude":"30 00 E","longitude_dec":"29.86229705810547","max_latitude":"31.916667","max_longitude":"36.333333","min_latitude":"20.383333","min_longitude":"24.7","area":1002450,"region":"Africa","subregion":"Northern Africa","world_region":"EMEA","region_code":"002","subregion_code":"015","landlocked":false,"borders":["ISR","LBY","SDN"],"independent":"Yes"}
 $egypt->getGeodata();
 
-// {"geonameid":357994,"edgar":"H2","itu":"EGY","marc":"ua","wmo":"EG","ds":"ET","fifa":"EGY","fips":"EG","gaul":40765,"ioc":"EGY","cowc":"EGY","cown":651,"fao":59,"imf":469,"ar5":"MAF","address_format":"{{recipient}}\n{{street}}\n{{postalcode}} {{city}}\n{{country}}","eu_member":null,"vat_rates":null,"emoji":"🇪🇬"}
+// {"geonameid":357994,"edgar":"H2","itu":"EGY","marc":"ua","wmo":"EG","ds":"ET","fifa":"EGY","fips":"EG","gaul":40765,"ioc":"EGY","cowc":"EGY","cown":651,"fao":59,"imf":469,"ar5":"MAF","address_format":"{{recipient}}\n{{street}}\n{{postalcode}} {{city}}\n{{country}}","eu_member":null,"data_protection":"Other","vat_rates":null,"emoji":"🇪🇬"}
 $egypt->getExtra();
 
 // {"name":"Al Iskandariyah","alt_names":["El Iskandariya","al-Iskandariyah","al-Iskandarīyah","Alexandria","Alexandrie","Alexandria"],"geo":{"latitude":31.2000924,"longitude":29.9187387,"min_latitude":31.1173177,"min_longitude":29.8233701,"max_latitude":31.330904,"max_longitude":30.0864016}}
@@ -264,6 +264,7 @@ $egypt->getDivision("ALX");
  - `ar5` - Fifth Assessment Report (AR5)
  - `address_format` - Address format
  - `eu_member` - European Union Member
+ - `data_protection` - Data Protection
  - `vat_rates` - Value-Added Tax
  - `emoji` - Emoji Flag
 
@@ -339,4 +340,4 @@ Rinvex is a software solutions startup, specialized in integrated enterprise sol
 
 This software is released under [The MIT License (MIT)](LICENSE).
 
-(c) 2016-2021 Rinvex LLC, Some rights reserved.
+(c) 2016-2022 Rinvex LLC, Some rights reserved.

resources/data/ad.json

@@ -1 +1 @@
-{"name":{"common":"Andorra","official":"Principality of Andorra","native":{"cat":{"common":"Andorra","official":"Principat d'Andorra"}}},"demonym":"Andorran","capital":"Andorra la Vella","iso_3166_1_alpha2":"AD","iso_3166_1_alpha3":"AND","iso_3166_1_numeric":"020","currency":{"EUR":{"iso_4217_code":"EUR","iso_4217_numeric":978,"iso_4217_name":"Euro","iso_4217_minor_unit":2}},"tld":[".ad"],"alt_spellings":["AD","Principality of Andorra","Principat d'Andorra"],"languages":{"cat":"Catalan"},"geo":{"continent":{"EU":"Europe"},"postal_code":true,"latitude":"42 30 N","latitude_desc":"42.5506591796875","longitude":"1 30 E","longitude_desc":"1.5762332677841187","max_latitude":"42.65","max_longitude":"1.783333","min_latitude":"42.433333","min_longitude":"1.416667","area":468,"region":"Europe","subregion":"Southern Europe","world_region":"EMEA","region_code":"150","subregion_code":"039","landlocked":true,"borders":["FRA","ESP"],"independent":"Yes"},"dialling":{"calling_code":["376"],"national_prefix":null,"national_number_lengths":[6,7,8,9],"national_destination_code_lengths":[2],"international_prefix":"00"},"extra":{"geonameid":3041565,"edgar":"B6","itu":"AND","marc":"an","wmo":null,"ds":"AND","fifa":"AND","fips":"AN","gaul":7,"ioc":"AND","cowc":"AND","cown":232,"fao":6,"imf":0,"ar5":"OECD1990","address_format":null,"eu_member":null,"vat_rates":null,"emoji":"🇦🇩"}}
+{"name":{"common":"Andorra","official":"Principality of Andorra","native":{"cat":{"common":"Andorra","official":"Principat d'Andorra"}}},"demonym":"Andorran","capital":"Andorra la Vella","iso_3166_1_alpha2":"AD","iso_3166_1_alpha3":"AND","iso_3166_1_numeric":"020","currency":{"EUR":{"iso_4217_code":"EUR","iso_4217_numeric":978,"iso_4217_name":"Euro","iso_4217_minor_unit":2}},"tld":[".ad"],"alt_spellings":["AD","Principality of Andorra","Principat d'Andorra"],"languages":{"cat":"Catalan"},"geo":{"continent":{"EU":"Europe"},"postal_code":true,"latitude":"42 30 N","latitude_desc":"42.5506591796875","longitude":"1 30 E","longitude_desc":"1.5762332677841187","max_latitude":"42.65","max_longitude":"1.783333","min_latitude":"42.433333","min_longitude":"1.416667","area":468,"region":"Europe","subregion":"Southern Europe","world_region":"EMEA","region_code":"150","subregion_code":"039","landlocked":true,"borders":["FRA","ESP"],"independent":"Yes"},"dialling":{"calling_code":["376"],"national_prefix":null,"national_number_lengths":[6,7,8,9],"national_destination_code_lengths":[2],"international_prefix":"00"},"extra":{"geonameid":3041565,"edgar":"B6","itu":"AND","marc":"an","wmo":null,"ds":"AND","fifa":"AND","fips":"AN","gaul":7,"ioc":"AND","cowc":"AND","cown":232,"fao":6,"imf":0,"ar5":"OECD1990","address_format":null,"eu_member":null,"data_protection":"Other","vat_rates":null,"emoji":"🇦🇩"}}

resources/data/ae.json

@@ -1 +1 @@
-{"name":{"common":"United Arab Emirates","official":"United Arab Emirates","native":{"ara":{"common":"دولة الإمارات العربية المتحدة","official":"الإمارات العربية المتحدة"}}},"demonym":"Emirati","capital":"Abu Dhabi","iso_3166_1_alpha2":"AE","iso_3166_1_alpha3":"ARE","iso_3166_1_numeric":"784","currency":{"AED":{"iso_4217_code":"AED","iso_4217_numeric":784,"iso_4217_name":"UAE Dirham","iso_4217_minor_unit":2}},"tld":[".ae","امارات."],"alt_spellings":["AE","UAE","Emirates"],"languages":{"ara":"Arabic"},"geo":{"continent":{"AS":"Asia"},"postal_code":false,"latitude":"24 00 N","latitude_desc":"23.684776306152344","longitude":"54 00 E","longitude_desc":"54.536643981933594","max_latitude":"26.133333","max_longitude":"58","min_latitude":"22.166667","min_longitude":"45","area":83600,"region":"Asia","subregion":"Western Asia","world_region":"EMEA","region_code":"142","subregion_code":"145","landlocked":false,"borders":["OMN","SAU"],"independent":"Yes"},"dialling":{"calling_code":["971"],"national_prefix":"0","national_number_lengths":[7,8,9],"national_destination_code_lengths":[2],"international_prefix":"00"},"extra":{"geonameid":290557,"edgar":"C0","itu":"UAE","marc":"ts","wmo":"ER","ds":null,"fifa":"UAE","fips":"AE","gaul":255,"ioc":"UAE","cowc":"UAE","cown":696,"fao":225,"imf":466,"ar5":"MAF","address_format":"{{recipient}}\n{{street}}\n{{postalcode}} {{city}}\n{{country}}","eu_member":null,"vat_rates":null,"emoji":"🇦🇪"}}
+{"name":{"common":"United Arab Emirates","official":"United Arab Emirates","native":{"ara":{"common":"دولة الإمارات العربية المتحدة","official":"الإمارات العربية المتحدة"}}},"demonym":"Emirati","capital":"Abu Dhabi","iso_3166_1_alpha2":"AE","iso_3166_1_alpha3":"ARE","iso_3166_1_numeric":"784","currency":{"AED":{"iso_4217_code":"AED","iso_4217_numeric":784,"iso_4217_name":"UAE Dirham","iso_4217_minor_unit":2}},"tld":[".ae","امارات."],"alt_spellings":["AE","UAE","Emirates"],"languages":{"ara":"Arabic"},"geo":{"continent":{"AS":"Asia"},"postal_code":false,"latitude":"24 00 N","latitude_desc":"23.684776306152344","longitude":"54 00 E","longitude_desc":"54.536643981933594","max_latitude":"26.133333","max_longitude":"58","min_latitude":"22.166667","min_longitude":"45","area":83600,"region":"Asia","subregion":"Western Asia","world_region":"EMEA","region_code":"142","subregion_code":"145","landlocked":false,"borders":["OMN","SAU"],"independent":"Yes"},"dialling":{"calling_code":["971"],"national_prefix":"0","national_number_lengths":[7,8,9],"national_destination_code_lengths":[2],"international_prefix":"00"},"extra":{"geonameid":290557,"edgar":"C0","itu":"UAE","marc":"ts","wmo":"ER","ds":null,"fifa":"UAE","fips":"AE","gaul":255,"ioc":"UAE","cowc":"UAE","cown":696,"fao":225,"imf":466,"ar5":"MAF","address_format":"{{recipient}}\n{{street}}\n{{postalcode}} {{city}}\n{{country}}","eu_member":null,"data_protection":"Other","vat_rates":null,"emoji":"🇦🇪"}}

resources/data/af.json

@@ -1 +1 @@
-{"name":{"common":"Afghanistan","official":"Islamic Republic of Afghanistan","native":{"prs":{"common":"افغانستان","official":"جمهوری اسلامی افغانستان"},"pus":{"common":"افغانستان","official":"د افغانستان اسلامي جمهوریت"},"tuk":{"common":"Owganystan","official":"Owganystan Yslam Respublikasy"}}},"demonym":"Afghan","capital":"Kabul","iso_3166_1_alpha2":"AF","iso_3166_1_alpha3":"AFG","iso_3166_1_numeric":"004","currency":{"AFN":{"iso_4217_code":"AFN","iso_4217_numeric":971,"iso_4217_name":"Afghani","iso_4217_minor_unit":2}},"tld":[".af"],"alt_spellings":["AF","Afġānistān"],"languages":{"prs":"Dari","pus":"Pashto","tuk":"Turkmen"},"geo":{"continent":{"AS":"Asia"},"postal_code":true,"latitude":"33 00 N","latitude_desc":"33.833248138427734","longitude":"65 00 E","longitude_desc":"66.02528381347656","max_latitude":"38.483611","max_longitude":"74.8868713067","min_latitude":"29.383333","min_longitude":"60.566667","area":652230,"region":"Asia","subregion":"Southern Asia","world_region":"APAC","region_code":"142","subregion_code":"034","landlocked":true,"borders":["IRN","PAK","TKM","UZB","TJK","CHN"],"independent":"Yes"},"dialling":{"calling_code":["93"],"national_prefix":"0","national_number_lengths":[8,9],"national_destination_code_lengths":[2],"international_prefix":"00"},"extra":{"geonameid":1149361,"edgar":"B2","itu":"AFG","marc":"af","wmo":"AF","ds":"AFG","fifa":"AFG","fips":"AF","gaul":1,"ioc":"AFG","cowc":"AFG","cown":700,"fao":2,"imf":512,"ar5":"ASIA","address_format":null,"eu_member":null,"vat_rates":null,"emoji":"🇦🇫"}}
+{"name":{"common":"Afghanistan","official":"Islamic Republic of Afghanistan","native":{"prs":{"common":"افغانستان","official":"جمهوری اسلامی افغانستان"},"pus":{"common":"افغانستان","official":"د افغانستان اسلامي جمهوریت"},"tuk":{"common":"Owganystan","official":"Owganystan Yslam Respublikasy"}}},"demonym":"Afghan","capital":"Kabul","iso_3166_1_alpha2":"AF","iso_3166_1_alpha3":"AFG","iso_3166_1_numeric":"004","currency":{"AFN":{"iso_4217_code":"AFN","iso_4217_numeric":971,"iso_4217_name":"Afghani","iso_4217_minor_unit":2}},"tld":[".af"],"alt_spellings":["AF","Afġānistān"],"languages":{"prs":"Dari","pus":"Pashto","tuk":"Turkmen"},"geo":{"continent":{"AS":"Asia"},"postal_code":true,"latitude":"33 00 N","latitude_desc":"33.833248138427734","longitude":"65 00 E","longitude_desc":"66.02528381347656","max_latitude":"38.483611","max_longitude":"74.8868713067","min_latitude":"29.383333","min_longitude":"60.566667","area":652230,"region":"Asia","subregion":"Southern Asia","world_region":"APAC","region_code":"142","subregion_code":"034","landlocked":true,"borders":["IRN","PAK","TKM","UZB","TJK","CHN"],"independent":"Yes"},"dialling":{"calling_code":["93"],"national_prefix":"0","national_number_lengths":[8,9],"national_destination_code_lengths":[2],"international_prefix":"00"},"extra":{"geonameid":1149361,"edgar":"B2","itu":"AFG","marc":"af","wmo":"AF","ds":"AFG","fifa":"AFG","fips":"AF","gaul":1,"ioc":"AFG","cowc":"AFG","cown":700,"fao":2,"imf":512,"ar5":"ASIA","address_format":null,"eu_member":null,"data_protection":"Other","vat_rates":null,"emoji":"🇦🇫"}}

resources/data/ag.json

@@ -1 +1 @@
-{"name":{"common":"Antigua and Barbuda","official":"Antigua and Barbuda","native":{"eng":{"common":"Antigua and Barbuda","official":"Antigua and Barbuda"}}},"demonym":"Antiguan, Barbudan","capital":"Saint John's","iso_3166_1_alpha2":"AG","iso_3166_1_alpha3":"ATG","iso_3166_1_numeric":"028","currency":{"XCD":{"iso_4217_code":"XCD","iso_4217_numeric":951,"iso_4217_name":"East Caribbean Dollar","iso_4217_minor_unit":2}},"tld":[".ag"],"alt_spellings":["AG"],"languages":{"eng":"English"},"geo":{"continent":{"NA":"North America"},"postal_code":false,"latitude":"17 03 N","latitude_desc":"17.09273910522461","longitude":"61 48 W","longitude_desc":"-61.81040954589844","max_latitude":"17.733333","max_longitude":"-61.666667","min_latitude":"16.916667","min_longitude":"-62.333333","area":442,"region":"Americas","subregion":"Caribbean","world_region":"AMER","region_code":"019","subregion_code":"029","landlocked":false,"borders":[],"independent":"Yes"},"dialling":{"calling_code":["1268"],"national_prefix":"1","national_number_lengths":[10],"national_destination_code_lengths":[3],"international_prefix":"011"},"extra":{"geonameid":3576396,"edgar":"B9","itu":"ATG","marc":"aq","wmo":"AT","ds":null,"fifa":"ATG","fips":"AC","gaul":11,"ioc":"ANT","cowc":"AAB","cown":58,"fao":8,"imf":311,"ar5":"LAM","address_format":null,"eu_member":null,"vat_rates":null,"emoji":"🇦🇬"}}
+{"name":{"common":"Antigua and Barbuda","official":"Antigua and Barbuda","native":{"eng":{"common":"Antigua and Barbuda","official":"Antigua and Barbuda"}}},"demonym":"Antiguan, Barbudan","capital":"Saint John's","iso_3166_1_alpha2":"AG","iso_3166_1_alpha3":"ATG","iso_3166_1_numeric":"028","currency":{"XCD":{"iso_4217_code":"XCD","iso_4217_numeric":951,"iso_4217_name":"East Caribbean Dollar","iso_4217_minor_unit":2}},"tld":[".ag"],"alt_spellings":["AG"],"languages":{"eng":"English"},"geo":{"continent":{"NA":"North America"},"postal_code":false,"latitude":"17 03 N","latitude_desc":"17.09273910522461","longitude":"61 48 W","longitude_desc":"-61.81040954589844","max_latitude":"17.733333","max_longitude":"-61.666667","min_latitude":"16.916667","min_longitude":"-62.333333","area":442,"region":"Americas","subregion":"Caribbean","world_region":"AMER","region_code":"019","subregion_code":"029","landlocked":false,"borders":[],"independent":"Yes"},"dialling":{"calling_code":["1268"],"national_prefix":"1","national_number_lengths":[10],"national_destination_code_lengths":[3],"international_prefix":"011"},"extra":{"geonameid":3576396,"edgar":"B9","itu":"ATG","marc":"aq","wmo":"AT","ds":null,"fifa":"ATG","fips":"AC","gaul":11,"ioc":"ANT","cowc":"AAB","cown":58,"fao":8,"imf":311,"ar5":"LAM","address_format":null,"eu_member":null,"data_protection":"Other","vat_rates":null,"emoji":"🇦🇬"}}

resources/data/ai.json

@@ -1 +1 @@
-{"name":{"common":"Anguilla","official":"Anguilla","native":{"eng":{"common":"Anguilla","official":"Anguilla"}}},"demonym":"Anguillian","capital":"The Valley","iso_3166_1_alpha2":"AI","iso_3166_1_alpha3":"AIA","iso_3166_1_numeric":"660","currency":{"XCD":{"iso_4217_code":"XCD","iso_4217_numeric":951,"iso_4217_name":"East Caribbean Dollar","iso_4217_minor_unit":2}},"tld":[".ai"],"alt_spellings":["AI"],"languages":{"eng":"English"},"geo":{"continent":{"NA":"North America"},"postal_code":true,"latitude":"18 15 N","latitude_desc":"18.22646713256836","longitude":"63 10 W","longitude_desc":"-63.0473518371582","max_latitude":"18.6","max_longitude":"-62.916667","min_latitude":"18.15","min_longitude":"-63.433333","area":91,"region":"Americas","subregion":"Caribbean","world_region":"AMER","region_code":"019","subregion_code":"029","landlocked":false,"borders":[],"independent":"Territory of GB"},"dialling":{"calling_code":["1264"],"national_prefix":"1","national_number_lengths":[10],"national_destination_code_lengths":[3],"international_prefix":"011"},"extra":{"geonameid":3573511,"edgar":"1A","itu":"AIA","marc":"am","wmo":null,"ds":null,"fifa":"AIA","fips":"AV","gaul":9,"ioc":"AIA","cowc":null,"cown":0,"fao":0,"imf":312,"ar5":"LAM","address_format":null,"eu_member":null,"vat_rates":null,"emoji":"🇦🇮"}}
+{"name":{"common":"Anguilla","official":"Anguilla","native":{"eng":{"common":"Anguilla","official":"Anguilla"}}},"demonym":"Anguillian","capital":"The Valley","iso_3166_1_alpha2":"AI","iso_3166_1_alpha3":"AIA","iso_3166_1_numeric":"660","currency":{"XCD":{"iso_4217_code":"XCD","iso_4217_numeric":951,"iso_4217_name":"East Caribbean Dollar","iso_4217_minor_unit":2}},"tld":[".ai"],"alt_spellings":["AI"],"languages":{"eng":"English"},"geo":{"continent":{"NA":"North America"},"postal_code":true,"latitude":"18 15 N","latitude_desc":"18.22646713256836","longitude":"63 10 W","longitude_desc":"-63.0473518371582","max_latitude":"18.6","max_longitude":"-62.916667","min_latitude":"18.15","min_longitude":"-63.433333","area":91,"region":"Americas","subregion":"Caribbean","world_region":"AMER","region_code":"019","subregion_code":"029","landlocked":false,"borders":[],"independent":"Territory of GB"},"dialling":{"calling_code":["1264"],"national_prefix":"1","national_number_lengths":[10],"national_destination_code_lengths":[3],"international_prefix":"011"},"extra":{"geonameid":3573511,"edgar":"1A","itu":"AIA","marc":"am","wmo":null,"ds":null,"fifa":"AIA","fips":"AV","gaul":9,"ioc":"AIA","cowc":null,"cown":0,"fao":0,"imf":312,"ar5":"LAM","address_format":null,"eu_member":null,"data_protection":"GDPR","vat_rates":null,"emoji":"🇦🇮"}}