Update metadata + test from upstream

Incorporates r607 + r608
giggsey · Sep 20, 2013 · 07841bf · 07841bf
1 parent d43e54c
commit 07841bf
Show file tree

Hide file tree

Showing 43 changed files with 895 additions and 507 deletions.
diff --git a/Tests/ShortNumberInfoTest.php b/Tests/ShortNumberInfoTest.php
@@ -126,11 +126,11 @@ public function testGetExampleShortNumberForCost()
             $this->shortInfo->getExampleShortNumberForCost(RegionCode::FR, ShortNumberCost::TOLL_FREE)
         );
         $this->assertEquals(
-            "118777",
+            "1023",
             $this->shortInfo->getExampleShortNumberForCost(RegionCode::FR, ShortNumberCost::STANDARD_RATE)
         );
         $this->assertEquals(
-            "3200",
+            "42000",
             $this->shortInfo->getExampleShortNumberForCost(RegionCode::FR, ShortNumberCost::PREMIUM_RATE)
         );
         $this->assertEquals(

diff --git a/src/libphonenumber/AlternateFormatsCountryCodeSet.php b/src/libphonenumber/AlternateFormatsCountryCodeSet.php
@@ -33,9 +33,10 @@ class AlternateFormatsCountryCodeSet {
   20 => 380,
   21 => 385,
   22 => 595,
-  23 => 855,
-  24 => 971,
-  25 => 972,
+  23 => 675,
+  24 => 855,
+  25 => 971,
+  26 => 972,
 );
 
 }

diff --git a/src/libphonenumber/ShortNumbersRegionCodeSet.php b/src/libphonenumber/ShortNumbersRegionCodeSet.php
@@ -106,138 +106,139 @@ class ShortNumbersRegionCodeSet {
   93 => 'IL',
   94 => 'IM',
   95 => 'IN',
-  96 => 'IR',
-  97 => 'IS',
-  98 => 'IT',
-  99 => 'JE',
-  100 => 'JM',
-  101 => 'JO',
-  102 => 'JP',
-  103 => 'KE',
-  104 => 'KG',
-  105 => 'KH',
-  106 => 'KI',
-  107 => 'KM',
-  108 => 'KN',
-  109 => 'KR',
-  110 => 'KW',
-  111 => 'KY',
-  112 => 'KZ',
-  113 => 'LA',
-  114 => 'LB',
-  115 => 'LC',
-  116 => 'LI',
-  117 => 'LK',
-  118 => 'LR',
-  119 => 'LS',
-  120 => 'LT',
-  121 => 'LU',
-  122 => 'LV',
-  123 => 'LY',
-  124 => 'MA',
-  125 => 'MC',
-  126 => 'MD',
-  127 => 'ME',
-  128 => 'MF',
-  129 => 'MG',
-  130 => 'MH',
-  131 => 'MK',
-  132 => 'ML',
-  133 => 'MM',
-  134 => 'MN',
-  135 => 'MO',
-  136 => 'MP',
-  137 => 'MQ',
-  138 => 'MR',
-  139 => 'MS',
-  140 => 'MT',
-  141 => 'MU',
-  142 => 'MV',
-  143 => 'MW',
-  144 => 'MX',
-  145 => 'MY',
-  146 => 'MZ',
-  147 => 'NA',
-  148 => 'NC',
-  149 => 'NF',
-  150 => 'NG',
-  151 => 'NI',
-  152 => 'NL',
-  153 => 'NO',
-  154 => 'NP',
-  155 => 'NR',
-  156 => 'NU',
-  157 => 'NZ',
-  158 => 'OM',
-  159 => 'PA',
-  160 => 'PE',
-  161 => 'PF',
-  162 => 'PG',
-  163 => 'PH',
-  164 => 'PK',
-  165 => 'PL',
-  166 => 'PM',
-  167 => 'PR',
-  168 => 'PT',
-  169 => 'PW',
-  170 => 'PY',
-  171 => 'QA',
-  172 => 'RE',
-  173 => 'RO',
-  174 => 'RS',
-  175 => 'RU',
-  176 => 'RW',
-  177 => 'SA',
-  178 => 'SB',
-  179 => 'SC',
-  180 => 'SD',
-  181 => 'SE',
-  182 => 'SG',
-  183 => 'SH',
-  184 => 'SI',
-  185 => 'SJ',
-  186 => 'SK',
-  187 => 'SL',
-  188 => 'SM',
-  189 => 'SR',
-  190 => 'ST',
-  191 => 'SV',
-  192 => 'SX',
-  193 => 'SY',
-  194 => 'SZ',
-  195 => 'TC',
-  196 => 'TD',
-  197 => 'TG',
-  198 => 'TH',
-  199 => 'TJ',
-  200 => 'TL',
-  201 => 'TM',
-  202 => 'TN',
-  203 => 'TO',
-  204 => 'TR',
-  205 => 'TT',
-  206 => 'TV',
-  207 => 'TW',
-  208 => 'TZ',
-  209 => 'UA',
-  210 => 'UG',
-  211 => 'US',
-  212 => 'UY',
-  213 => 'UZ',
-  214 => 'VA',
-  215 => 'VC',
-  216 => 'VE',
-  217 => 'VG',
-  218 => 'VI',
-  219 => 'VN',
-  220 => 'VU',
-  221 => 'WF',
-  222 => 'WS',
-  223 => 'YE',
-  224 => 'YT',
-  225 => 'ZA',
-  226 => 'ZM',
-  227 => 'ZW',
+  96 => 'IQ',
+  97 => 'IR',
+  98 => 'IS',
+  99 => 'IT',
+  100 => 'JE',
+  101 => 'JM',
+  102 => 'JO',
+  103 => 'JP',
+  104 => 'KE',
+  105 => 'KG',
+  106 => 'KH',
+  107 => 'KI',
+  108 => 'KM',
+  109 => 'KN',
+  110 => 'KR',
+  111 => 'KW',
+  112 => 'KY',
+  113 => 'KZ',
+  114 => 'LA',
+  115 => 'LB',
+  116 => 'LC',
+  117 => 'LI',
+  118 => 'LK',
+  119 => 'LR',
+  120 => 'LS',
+  121 => 'LT',
+  122 => 'LU',
+  123 => 'LV',
+  124 => 'LY',
+  125 => 'MA',
+  126 => 'MC',
+  127 => 'MD',
+  128 => 'ME',
+  129 => 'MF',
+  130 => 'MG',
+  131 => 'MH',
+  132 => 'MK',
+  133 => 'ML',
+  134 => 'MM',
+  135 => 'MN',
+  136 => 'MO',
+  137 => 'MP',
+  138 => 'MQ',
+  139 => 'MR',
+  140 => 'MS',
+  141 => 'MT',
+  142 => 'MU',
+  143 => 'MV',
+  144 => 'MW',
+  145 => 'MX',
+  146 => 'MY',
+  147 => 'MZ',
+  148 => 'NA',
+  149 => 'NC',
+  150 => 'NF',
+  151 => 'NG',
+  152 => 'NI',
+  153 => 'NL',
+  154 => 'NO',
+  155 => 'NP',
+  156 => 'NR',
+  157 => 'NU',
+  158 => 'NZ',
+  159 => 'OM',
+  160 => 'PA',
+  161 => 'PE',
+  162 => 'PF',
+  163 => 'PG',
+  164 => 'PH',
+  165 => 'PK',
+  166 => 'PL',
+  167 => 'PM',
+  168 => 'PR',
+  169 => 'PT',
+  170 => 'PW',
+  171 => 'PY',
+  172 => 'QA',
+  173 => 'RE',
+  174 => 'RO',
+  175 => 'RS',
+  176 => 'RU',
+  177 => 'RW',
+  178 => 'SA',
+  179 => 'SB',
+  180 => 'SC',
+  181 => 'SD',
+  182 => 'SE',
+  183 => 'SG',
+  184 => 'SH',
+  185 => 'SI',
+  186 => 'SJ',
+  187 => 'SK',
+  188 => 'SL',
+  189 => 'SM',
+  190 => 'SR',
+  191 => 'ST',
+  192 => 'SV',
+  193 => 'SX',
+  194 => 'SY',
+  195 => 'SZ',
+  196 => 'TC',
+  197 => 'TD',
+  198 => 'TG',
+  199 => 'TH',
+  200 => 'TJ',
+  201 => 'TL',
+  202 => 'TM',
+  203 => 'TN',
+  204 => 'TO',
+  205 => 'TR',
+  206 => 'TT',
+  207 => 'TV',
+  208 => 'TW',
+  209 => 'TZ',
+  210 => 'UA',
+  211 => 'UG',
+  212 => 'US',
+  213 => 'UY',
+  214 => 'UZ',
+  215 => 'VA',
+  216 => 'VC',
+  217 => 'VE',
+  218 => 'VG',
+  219 => 'VI',
+  220 => 'VN',
+  221 => 'VU',
+  222 => 'WF',
+  223 => 'WS',
+  224 => 'YE',
+  225 => 'YT',
+  226 => 'ZA',
+  227 => 'ZM',
+  228 => 'ZW',
 );
 
 }

diff --git a/src/libphonenumber/data/PhoneNumberMetadata_AO.php b/src/libphonenumber/data/PhoneNumberMetadata_AO.php
@@ -24,7 +24,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '9[1-4]\\d{7}',
+    'NationalNumberPattern' => '9[1-49]\\d{7}',
     'PossibleNumberPattern' => '\\d{9}',
     'ExampleNumber' => '923123456',
   ),

diff --git a/src/libphonenumber/data/PhoneNumberMetadata_AU.php b/src/libphonenumber/data/PhoneNumberMetadata_AU.php
@@ -63,14 +63,8 @@
   ),
   'premiumRate' => 
   array (
-    'NationalNumberPattern' => '
-          19(?:
-            0[0126]\\d{6}|
-            [13-5]\\d{3}|
-            [679]\\d{5}
-          )
-        ',
-    'PossibleNumberPattern' => '\\d{6,10}',
+    'NationalNumberPattern' => '190[0126]\\d{6}',
+    'PossibleNumberPattern' => '\\d{10}',
     'ExampleNumber' => '1900123456',
   ),
   'sharedCost' => 

diff --git a/src/libphonenumber/data/PhoneNumberMetadata_BF.php b/src/libphonenumber/data/PhoneNumberMetadata_BF.php
@@ -35,10 +35,9 @@
   array (
     'NationalNumberPattern' => '
           6(?:
-            [0-256]\\d|
+            [0-24-6]\\d|
             8[0-5]|
             3[0-3]|
-            4[0-7]
           )\\d{5}|
           7\\d{7}
         ',

diff --git a/src/libphonenumber/data/PhoneNumberMetadata_BW.php b/src/libphonenumber/data/PhoneNumberMetadata_BW.php
@@ -55,7 +55,7 @@
           7(?:
             [1-35]\\d{6}|
             [46][0-7]\\d{5}|
-            7[01]\\d{5}
+            7[0146]\\d{5}
           )
         ',
     'PossibleNumberPattern' => '\\d{8}',
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,9 +33,10 @@ class AlternateFormatsCountryCodeSet { @@
 => 380,
 => 385,
 => 595,
-=> 855,
-=> 971,
-=> 972,
+=> 675,
+=> 855,
+=> 971,
+=> 972,
     );
     }
@@ Expand Down @@