From 1327c69c23cc4c38dc8e8296c62410f3fc65ef99 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Wed, 29 May 2019 11:07:46 +0100 Subject: [PATCH 1/2] Upstream metadata changes from Google for v8.10.13 - Updated phone metadata for region code(s): AU, CC, CI, CX, DE, HK - Updated carrier data for country calling code(s): 61 (en), 225 (en) --- METADATA-VERSION.txt | 2 +- src/carrier/data/en/225.php | 1 + src/carrier/data/en/61.php | 1 + src/data/PhoneNumberMetadata_AU.php | 2 +- src/data/PhoneNumberMetadata_CC.php | 2 +- src/data/PhoneNumberMetadata_CI.php | 2 +- src/data/PhoneNumberMetadata_CX.php | 2 +- src/data/PhoneNumberMetadata_DE.php | 20 ++++++++++---------- src/data/PhoneNumberMetadata_HK.php | 2 +- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index 64c6074cd..f63303b28 100644 --- a/METADATA-VERSION.txt +++ b/METADATA-VERSION.txt @@ -2,4 +2,4 @@ # It can be a commit, branch or tag of the https://github.com/googlei18n/libphonenumber project # # For more information, look at the phing tasks in build.xml -v8.10.12 +v8.10.13 diff --git a/src/carrier/data/en/225.php b/src/carrier/data/en/225.php index 44c8d4295..52c3b4d2f 100644 --- a/src/carrier/data/en/225.php +++ b/src/carrier/data/en/225.php @@ -48,6 +48,7 @@ 22567 => 'Orange', 22568 => 'Orange', 22569 => 'Aircom', + 22570 => 'Moov', 22571 => 'Moov', 22572 => 'Moov', 22573 => 'Moov', diff --git a/src/carrier/data/en/61.php b/src/carrier/data/en/61.php index f8b8429a2..0dbf02b43 100644 --- a/src/carrier/data/en/61.php +++ b/src/carrier/data/en/61.php @@ -68,6 +68,7 @@ 61457 => 'Telstra', 61458 => 'Telstra', 61459 => 'Telstra', + 61460 => 'Telstra', 61466 => 'Optus', 61467 => 'Telstra', 61468 => 'Optus', diff --git a/src/data/PhoneNumberMetadata_AU.php b/src/data/PhoneNumberMetadata_AU.php index 49dbde9b1..5d8f1f6bb 100644 --- a/src/data/PhoneNumberMetadata_AU.php +++ b/src/data/PhoneNumberMetadata_AU.php @@ -43,7 +43,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[6-9]|7[02-9]|8[0-2457-9]|9[017-9])\\d{6}', + 'NationalNumberPattern' => '4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[06-9]|7[02-9]|8[0-2457-9]|9[017-9])\\d{6}', 'ExampleNumber' => '412345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_CC.php b/src/data/PhoneNumberMetadata_CC.php index a7fea76d6..849fc2907 100644 --- a/src/data/PhoneNumberMetadata_CC.php +++ b/src/data/PhoneNumberMetadata_CC.php @@ -42,7 +42,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[6-9]|7[02-9]|8[0-2457-9]|9[017-9])\\d{6}', + 'NationalNumberPattern' => '4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[06-9]|7[02-9]|8[0-2457-9]|9[017-9])\\d{6}', 'ExampleNumber' => '412345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_CI.php b/src/data/PhoneNumberMetadata_CI.php index 3365d1626..3653df4d1 100644 --- a/src/data/PhoneNumberMetadata_CI.php +++ b/src/data/PhoneNumberMetadata_CI.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:[07][1-9]|[45]\\d|6[014-9]|8[4-9])\\d{6}', + 'NationalNumberPattern' => '(?:0[1-9]|[457]\\d|6[014-9]|8[4-9])\\d{6}', 'ExampleNumber' => '01234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_CX.php b/src/data/PhoneNumberMetadata_CX.php index c50a2f296..202276f21 100644 --- a/src/data/PhoneNumberMetadata_CX.php +++ b/src/data/PhoneNumberMetadata_CX.php @@ -42,7 +42,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[6-9]|7[02-9]|8[0-2457-9]|9[017-9])\\d{6}', + 'NationalNumberPattern' => '4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[06-9]|7[02-9]|8[0-2457-9]|9[017-9])\\d{6}', 'ExampleNumber' => '412345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_DE.php b/src/data/PhoneNumberMetadata_DE.php index e987e0281..6b1ab67d3 100644 --- a/src/data/PhoneNumberMetadata_DE.php +++ b/src/data/PhoneNumberMetadata_DE.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '[2579]\\d{5,14}|49[67]0\\d{1,4}|49(?:[34]0|69|8\\d)\\d\\d?|49(?:37|49|7[89]|9\\d)\\d{1,3}|49(?:[12]\\d|3[1-689]|7[1-7])\\d{1,8}|49(?:[05]\\d|[46][1-8])\\d{1,9}|(?:1|[368]\\d|4[0-8])\\d{3,13}', + 'NationalNumberPattern' => '[2579]\\d{5,14}|49(?:[05]\\d{10}|[46][1-8]\\d{4,9})|49(?:[0-25]\\d|3[1-689]|7[1-7])\\d{4,8}|49(?:[0-2579]\\d|[34][1-9]|6[0-8])\\d{3}|49\\d{3,4}|(?:1|[368]\\d|4[0-8])\\d{3,13}', 'PossibleLength' => array ( 0 => 4, @@ -38,7 +38,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:2(?:0[1-689]|[1-3569]\\d|4[0-8]|7[1-7]|8[0-7])|5(?:0[2-8]|[124-6]\\d|[38][0-8]|[79][0-7])|6(?:0[02-9]|[1-3589]\\d|[47][0-8]|6[1-9])|7(?:0[2-8]|1[1-9]|[27][0-7]|3\\d|[4-6][0-8]|8[0-5]|9[013-7])|8(?:0[2-9]|1[0-79]|[29]\\d|3[0-46-9]|4[0-6]|5[013-9]|6[1-8]|7[0-8]|8[0-24-6])|9(?:0[6-9]|[1-4]\\d|[589][0-7]|6[0-8]|7[0-467]))\\d{4,12}|3(?:(?:[03569]\\d|4[0-79]|7[1-7]|8[1-8])\\d{4,12}|2\\d{9})|4(?:(?:[02-48]\\d|1[02-9]|5[0-6]|6[0-8]|7[0-79])\\d{4,12}|9(?:[0-37]\\d{4,9}|[4-6]\\d{4,10}))|(?:2(?:0[1-389]|1[124]|2[18]|3[14]|[4-9]1)|5(?:[124-9]1|3[16])|7[1-9]1|9(?:06|[1-9]1))\\d{3}|3(?:0\\d{3,4}|(?:[35-9][15]|4[015])\\d{3})|4(?:0\\d{3,4}|[2-9]1\\d{3})|[68](?:[1-8]1\\d{3}|9\\d{3,4})', + 'NationalNumberPattern' => '(?:32|49[4-6]\\d)\\d{9}|49[0-7]\\d{3,9}|(?:[34]0|[68]9)\\d{3,13}|(?:2(?:0[1-689]|[1-3569]\\d|4[0-8]|7[1-7]|8[0-7])|3(?:[3569]\\d|4[0-79]|7[1-7]|8[1-8])|4(?:1[02-9]|[2-48]\\d|5[0-6]|6[0-8]|7[0-79])|5(?:0[2-8]|[124-6]\\d|[38][0-8]|[79][0-7])|6(?:0[02-9]|[1-358]\\d|[47][0-8]|6[1-9])|7(?:0[2-8]|1[1-9]|[27][0-7]|3\\d|[4-6][0-8]|8[0-5]|9[013-7])|8(?:0[2-9]|1[0-79]|2\\d|3[0-46-9]|4[0-6]|5[013-9]|6[1-8]|7[0-8]|8[0-24-6])|9(?:0[6-9]|[1-4]\\d|[589][0-7]|6[0-8]|7[0-467]))\\d{3,12}', 'ExampleNumber' => '30123456', 'PossibleLength' => array ( @@ -268,11 +268,11 @@ ), 4 => array ( - 'pattern' => '(\\d{3})(\\d{5,11})', + 'pattern' => '(\\d{5})(\\d{2,10})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '181', + 0 => '3', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -280,11 +280,11 @@ ), 5 => array ( - 'pattern' => '(\\d{3})(\\d)(\\d{4,10})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{3})(\\d{5,11})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '1(?:3|80)|9', + 0 => '181', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -292,11 +292,11 @@ ), 6 => array ( - 'pattern' => '(\\d{5})(\\d{3,10})', - 'format' => '$1 $2', + 'pattern' => '(\\d{3})(\\d)(\\d{4,10})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '3', + 0 => '1(?:3|80)|9', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_HK.php b/src/data/PhoneNumberMetadata_HK.php index 6f758cf51..e36069ddc 100644 --- a/src/data/PhoneNumberMetadata_HK.php +++ b/src/data/PhoneNumberMetadata_HK.php @@ -30,7 +30,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:384[014]|58(?:0[1-8]|1[2-9]))\\d{4}|(?:2(?:[13-8]\\d|2[013-9]|9[0-24-9])|3(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69]|89))\\d{5}', + 'NationalNumberPattern' => '(?:384[0-24]|58(?:0[1-8]|1[2-9]))\\d{4}|(?:2(?:[13-8]\\d|2[013-9]|9[0-24-9])|3(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69]|89))\\d{5}', 'ExampleNumber' => '21234567', 'PossibleLength' => array ( From bb75bd9e2fbbc47c8250bb6c28f10a753b578b33 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Thu, 30 May 2019 07:55:40 +0100 Subject: [PATCH 2/2] Attempt to fix Travis CI builds --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e816fc163..28f954714 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,12 @@ sudo: false +dist: trusty + language: php +env: + - COVERAGE_FLAGS="" + matrix: fast_finish: true include: @@ -10,19 +15,14 @@ matrix: env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE_FLAGS="" dist: precise - php: 5.4 - env: COVERAGE_FLAGS="" - php: 5.5 - env: COVERAGE_FLAGS="" - php: 5.6 env: COVERAGE_FLAGS=" --coverage-text --coverage-clover build/logs/clover.xml" - php: 7.0 - env: COVERAGE_FLAGS="" - php: 7.1 - env: COVERAGE_FLAGS="" - php: 7.2 env: COVERAGE_FLAGS=" --coverage-text --coverage-clover build/logs/clover.xml" - php: 7.3 - env: COVERAGE_FLAGS="" before_install: - travis_retry wget https://scrutinizer-ci.com/ocular.phar