Merge branch 'hotfix/cs'

Updates the TLD list from IANA sources.
zendframework · Apr 6, 2016 · dbacb36 · dbacb36
2 parents ce4ddf8 + 9d4240b
commit dbacb36
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.7.1 - TBD
+## 2.7.1 - 2016-04-06
 
 ### Added
 
@@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- This release updates the TLD list to the latest version from the IANA.
 
 ## 2.7.0 - 2016-04-06
 

diff --git a/src/Hostname.php b/src/Hostname.php
@@ -67,7 +67,7 @@ class Hostname extends AbstractValidator
 
     /**
      * Array of valid top-level-domains
-     * IanaVersion 2016030200
+     * IanaVersion 2016040501
      *
      * @see ftp://data.iana.org/TLD/tlds-alpha-by-domain.txt  List of all TLDs by domain
      * @see http://www.iana.org/domains/root/db/ Official list of supported TLDs
@@ -106,12 +106,14 @@ class Hostname extends AbstractValidator
         'alibaba',
         'alipay',
         'allfinanz',
+        'ally',
         'alsace',
         'am',
         'amica',
         'amsterdam',
         'analytics',
         'android',
+        'anquan',
         'ao',
         'apartments',
         'app',
@@ -136,7 +138,9 @@ class Hostname extends AbstractValidator
         'author',
         'auto',
         'autos',
+        'avianca',
         'aw',
+        'aws',
         'ax',
         'axa',
         'az',
@@ -149,12 +153,14 @@ class Hostname extends AbstractValidator
         'barcelona',
         'barclaycard',
         'barclays',
+        'barefoot',
         'bargains',
         'bauhaus',
         'bayern',
         'bb',
         'bbc',
         'bbva',
+        'bcg',
         'bcn',
         'bd',
         'be',
@@ -404,6 +410,7 @@ class Hostname extends AbstractValidator
         'expert',
         'exposed',
         'express',
+        'extraspace',
         'fage',
         'fail',
         'fairwinds',
@@ -457,6 +464,7 @@ class Hostname extends AbstractValidator
         'ga',
         'gal',
         'gallery',
+        'gallo',
         'gallup',
         'game',
         'garden',
@@ -484,6 +492,7 @@ class Hostname extends AbstractValidator
         'globo',
         'gm',
         'gmail',
+        'gmbh',
         'gmo',
         'gmx',
         'gn',
@@ -547,6 +556,7 @@ class Hostname extends AbstractValidator
         'hr',
         'hsbc',
         'ht',
+        'htc',
         'hu',
         'hyundai',
         'ibm',
@@ -588,6 +598,7 @@ class Hostname extends AbstractValidator
         'jaguar',
         'java',
         'jcb',
+        'jcp',
         'je',
         'jetzt',
         'jewelry',
@@ -607,6 +618,9 @@ class Hostname extends AbstractValidator
         'kaufen',
         'kddi',
         'ke',
+        'kerryhotels',
+        'kerrylogistics',
+        'kerryproperties',
         'kfh',
         'kg',
         'kh',
@@ -621,10 +635,12 @@ class Hostname extends AbstractValidator
         'koeln',
         'komatsu',
         'kp',
+        'kpmg',
         'kpn',
         'kr',
         'krd',
         'kred',
+        'kuokgroup',
         'kw',
         'ky',
         'kyoto',
@@ -669,6 +685,7 @@ class Hostname extends AbstractValidator
         'lk',
         'loan',
         'loans',
+        'locus',
         'lol',
         'london',
         'lotte',
@@ -748,6 +765,7 @@ class Hostname extends AbstractValidator
         'mtr',
         'mu',
         'museum',
+        'mutual',
         'mutuelle',
         'mv',
         'mw',
@@ -779,6 +797,7 @@ class Hostname extends AbstractValidator
         'nikon',
         'ninja',
         'nissan',
+        'nissay',
         'nl',
         'no',
         'nokia',
@@ -961,13 +980,16 @@ class Hostname extends AbstractValidator
         'sg',
         'sh',
         'sharp',
+        'shaw',
         'shell',
         'shia',
         'shiksha',
         'shoes',
+        'shouji',
         'show',
         'shriram',
         'si',
+        'sina',
         'singles',
         'site',
         'sj',
@@ -1009,6 +1031,7 @@ class Hostname extends AbstractValidator
         'stockholm',
         'storage',
         'store',
+        'stream',
         'studio',
         'study',
         'style',
@@ -1031,6 +1054,7 @@ class Hostname extends AbstractValidator
         'sz',
         'tab',
         'taipei',
+        'talk',
         'taobao',
         'tatamotors',
         'tatar',
@@ -1073,6 +1097,7 @@ class Hostname extends AbstractValidator
         'top',
         'toray',
         'toshiba',
+        'total',
         'tours',
         'town',
         'toyota',
@@ -1171,6 +1196,7 @@ class Hostname extends AbstractValidator
         'wtf',
         'xbox',
         'xerox',
+        'xihuan',
         'xin',
         'कॉम',
         'セール',
@@ -1213,6 +1239,7 @@ class Hostname extends AbstractValidator
         'ポイント',
         '新闻',
         '工行',
+        '家電',
         'كوم',
         '中文网',
         '中信',
@@ -1286,6 +1313,7 @@ class Hostname extends AbstractValidator
         'vermögensberatung',
         '企业',
         '信息',
+        '嘉里大酒店',
         'مصر',
         'قطر',
         '广东',
@@ -1306,8 +1334,10 @@ class Hostname extends AbstractValidator
         'yodobashi',
         'yoga',
         'yokohama',
+        'you',
         'youtube',
         'yt',
+        'yun',
         'za',
         'zara',
         'zero',