From e08d9f9af4803ed86d7b6318abc2973ccf0a1caa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 08:59:16 +0000 Subject: [PATCH 1/2] build(deps): Bump giggsey/libphonenumber-for-php-lite Bumps [giggsey/libphonenumber-for-php-lite](https://github.com/giggsey/libphonenumber-for-php-lite) from 8.13.45 to 8.13.48. - [Release notes](https://github.com/giggsey/libphonenumber-for-php-lite/releases) - [Commits](https://github.com/giggsey/libphonenumber-for-php-lite/compare/8.13.45...8.13.48) --- updated-dependencies: - dependency-name: giggsey/libphonenumber-for-php-lite dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 6bb0564e3..16ee31adf 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "doctrine/dbal": "^3.9.1", "egulias/email-validator": "^4.0.2", "fusonic/opengraph": "^2.3.0", - "giggsey/libphonenumber-for-php-lite": "^8.13.12", + "giggsey/libphonenumber-for-php-lite": "^8.13.48", "guzzlehttp/guzzle": "^7.9.2", "icewind/searchdav": "^3.1.0", "icewind/streams": "^0.7.7", diff --git a/composer.lock b/composer.lock index af26288da..5e7fa0191 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4b990548b353429f7dd25847253a46c8", + "content-hash": "31fce8add59fc8f0d4af48f981bbccdb", "packages": [ { "name": "aws/aws-crt-php", @@ -982,16 +982,16 @@ }, { "name": "giggsey/libphonenumber-for-php-lite", - "version": "8.13.45", + "version": "8.13.48", "source": { "type": "git", "url": "https://github.com/giggsey/libphonenumber-for-php-lite.git", - "reference": "4fe78c7d51e6ea49a7f286bfcc2f6aa6130088d1" + "reference": "76a4df0f53684fa4175d15aee1cee5f1047a17f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/4fe78c7d51e6ea49a7f286bfcc2f6aa6130088d1", - "reference": "4fe78c7d51e6ea49a7f286bfcc2f6aa6130088d1", + "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/76a4df0f53684fa4175d15aee1cee5f1047a17f7", + "reference": "76a4df0f53684fa4175d15aee1cee5f1047a17f7", "shasum": "" }, "require": { @@ -1061,7 +1061,7 @@ "issues": "https://github.com/giggsey/libphonenumber-for-php-lite/issues", "source": "https://github.com/giggsey/libphonenumber-for-php-lite" }, - "time": "2024-09-06T11:22:39+00:00" + "time": "2024-10-22T09:03:14+00:00" }, { "name": "guzzlehttp/guzzle", From 8b1a2cb273d2ac65ccaabf8479f723b3aa542918 Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Wed, 30 Oct 2024 09:54:18 +0000 Subject: [PATCH 2/2] chore(autoloader): Dump autoloader Signed-off-by: nextcloud-command --- composer/installed.json | 12 ++++++------ composer/installed.php | 6 +++--- .../METADATA-VERSION.php | 2 +- .../src/PhoneNumberUtil.php | 8 ++++---- .../src/data/PhoneNumberMetadata_CO.php | 11 ++++------- .../src/data/PhoneNumberMetadata_DE.php | 2 +- .../src/data/PhoneNumberMetadata_GE.php | 2 +- .../src/data/PhoneNumberMetadata_HK.php | 2 +- .../src/data/PhoneNumberMetadata_MG.php | 2 +- .../src/data/PhoneNumberMetadata_MM.php | 7 ++++--- .../src/data/PhoneNumberMetadata_NO.php | 2 +- .../src/data/PhoneNumberMetadata_PA.php | 2 +- .../src/data/PhoneNumberMetadata_PE.php | 2 +- .../src/data/PhoneNumberMetadata_SG.php | 2 +- .../src/data/PhoneNumberMetadata_SJ.php | 2 +- .../src/data/PhoneNumberMetadata_SN.php | 2 +- .../src/data/PhoneNumberMetadata_UA.php | 2 +- .../src/data/PhoneNumberMetadata_UG.php | 2 +- .../src/data/PhoneNumberMetadata_UZ.php | 4 ++-- .../src/data/PhoneNumberMetadata_WF.php | 8 +++++--- .../src/data/ShortNumberMetadata_NO.php | 9 ++++++--- .../src/data/ShortNumberMetadata_SJ.php | 15 ++++++++++++--- .../src/data/ShortNumberMetadata_UY.php | 5 +++-- 23 files changed, 62 insertions(+), 49 deletions(-) diff --git a/composer/installed.json b/composer/installed.json index 3a4f40910..ba494fc7d 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -1018,17 +1018,17 @@ }, { "name": "giggsey/libphonenumber-for-php-lite", - "version": "8.13.45", - "version_normalized": "8.13.45.0", + "version": "8.13.48", + "version_normalized": "8.13.48.0", "source": { "type": "git", "url": "https://github.com/giggsey/libphonenumber-for-php-lite.git", - "reference": "4fe78c7d51e6ea49a7f286bfcc2f6aa6130088d1" + "reference": "76a4df0f53684fa4175d15aee1cee5f1047a17f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/4fe78c7d51e6ea49a7f286bfcc2f6aa6130088d1", - "reference": "4fe78c7d51e6ea49a7f286bfcc2f6aa6130088d1", + "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/76a4df0f53684fa4175d15aee1cee5f1047a17f7", + "reference": "76a4df0f53684fa4175d15aee1cee5f1047a17f7", "shasum": "" }, "require": { @@ -1056,7 +1056,7 @@ "suggest": { "giggsey/libphonenumber-for-php": "Use libphonenumber-for-php for geocoding, carriers, timezones and matching" }, - "time": "2024-09-06T11:22:39+00:00", + "time": "2024-10-22T09:03:14+00:00", "type": "library", "extra": { "branch-alias": { diff --git a/composer/installed.php b/composer/installed.php index 26255d03e..a91f90aa9 100644 --- a/composer/installed.php +++ b/composer/installed.php @@ -137,9 +137,9 @@ 'dev_requirement' => false, ), 'giggsey/libphonenumber-for-php-lite' => array( - 'pretty_version' => '8.13.45', - 'version' => '8.13.45.0', - 'reference' => '4fe78c7d51e6ea49a7f286bfcc2f6aa6130088d1', + 'pretty_version' => '8.13.48', + 'version' => '8.13.48.0', + 'reference' => '76a4df0f53684fa4175d15aee1cee5f1047a17f7', 'type' => 'library', 'install_path' => __DIR__ . '/../giggsey/libphonenumber-for-php-lite', 'aliases' => array(), diff --git a/giggsey/libphonenumber-for-php-lite/METADATA-VERSION.php b/giggsey/libphonenumber-for-php-lite/METADATA-VERSION.php index e0534fc35..f1d1bb043 100644 --- a/giggsey/libphonenumber-for-php-lite/METADATA-VERSION.php +++ b/giggsey/libphonenumber-for-php-lite/METADATA-VERSION.php @@ -5,4 +5,4 @@ * For more information, look at the phing tasks in build.xml * @internal */ -return 'v8.13.45'; +return 'v8.13.48'; diff --git a/giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php b/giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php index d043ce935..d8880db02 100644 --- a/giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php +++ b/giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php @@ -397,9 +397,9 @@ protected function __construct(MetadataSourceInterface $metadataSource, array $c */ public static function getInstance( string $baseFileLocation = self::META_DATA_FILE_PREFIX, - array $countryCallingCodeToRegionCodeMap = null, - MetadataLoaderInterface $metadataLoader = null, - MetadataSourceInterface $metadataSource = null + ?array $countryCallingCodeToRegionCodeMap = null, + ?MetadataLoaderInterface $metadataLoader = null, + ?MetadataSourceInterface $metadataSource = null ): PhoneNumberUtil { if (static::$instance === null) { if ($countryCallingCodeToRegionCodeMap === null) { @@ -2969,7 +2969,7 @@ public function isValidNumberForRegion(PhoneNumber $number, string $regionCode): * and the number is not in international format (does not start * with +) */ - public function parse(string $numberToParse, ?string $defaultRegion = null, PhoneNumber $phoneNumber = null, bool $keepRawInput = false): PhoneNumber + public function parse(string $numberToParse, ?string $defaultRegion = null, ?PhoneNumber $phoneNumber = null, bool $keepRawInput = false): PhoneNumber { if ($phoneNumber === null) { $phoneNumber = new PhoneNumber(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CO.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CO.php index 0fc822791..4b8de98ed 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CO.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CO.php @@ -10,7 +10,7 @@ 'id' => 'CO', 'countryCode' => 57, 'generalDesc' => [ - 'pattern' => '(?:60\\d\\d|9101)\\d{6}|(?:1\\d|3)\\d{9}', + 'pattern' => '60\\d{8}|(?:1\\d|[39])\\d{9}', 'posLength' => [ 10, 11, @@ -44,11 +44,8 @@ ], ], 'premiumRate' => [ - 'pattern' => '19(?:0[01]|4[78])\\d{7}', + 'pattern' => '(?:19(?:0[01]|4[78])|901)\\d{7}', 'example' => '19001234567', - 'posLength' => [ - 11, - ], ], 'sharedCost' => [ 'posLength' => [ @@ -93,7 +90,7 @@ 'pattern' => '(\\d{3})(\\d{7})', 'format' => '$1 $2', 'leadingDigitsPatterns' => [ - '6', + '6|90', ], 'nationalPrefixFormattingRule' => '($1)', 'domesticCarrierCodeFormattingRule' => '0$CC $1', @@ -122,7 +119,7 @@ 'pattern' => '(\\d{3})(\\d{7})', 'format' => '$1 $2', 'leadingDigitsPatterns' => [ - '6', + '6|90', ], 'nationalPrefixFormattingRule' => '($1)', 'domesticCarrierCodeFormattingRule' => '0$CC $1', diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DE.php index de1f0c117..b00e7a3ec 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DE.php @@ -53,7 +53,7 @@ ], ], 'mobile' => [ - 'pattern' => '15310\\d{6}|1(?:6[023]|7[0-57-9])\\d{7,8}|1(?:5[0-25-9]|76)\\d{8}', + 'pattern' => '16[023]\\d{7,8}|1(?:5310|7[0-57-9]\\d)\\d{6}|1(?:5[0-25-9]|76)\\d{8}', 'example' => '15123456789', 'posLength' => [ 10, diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GE.php index 9e44f9c0b..7af4c188e 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GE.php @@ -28,7 +28,7 @@ ], ], 'mobile' => [ - 'pattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|(?:5(?:0(?:0(?:0\\d|11|22|3[0-6]|44|5[05]|77|88|9[09])|111|22[02]|77\\d)|1(?:1(?:[03][01]|[124]\\d)|4\\d\\d)|[23]555|4(?:4\\d\\d|555)|5(?:[0157-9]\\d\\d|200)|6[89]\\d\\d|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|5(?:55|8[89])|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}', + 'pattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}|(?:5(?:0(?:0(?:0\\d|11|22|3[0-6]|44|5[05]|77|88|9[09])|111|22[02]|77\\d)|1(?:1(?:[03][01]|[124]\\d|5[2-6]|7[0-4])|4\\d\\d)|[23]555|4(?:4\\d\\d|555)|5(?:[0157-9]\\d\\d|200)|6[89]\\d\\d|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|5(?:55|8[89])|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}', 'example' => '555123456', ], 'tollFree' => [ diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HK.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HK.php index f3b4a40c4..7ed507f67 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HK.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HK.php @@ -28,7 +28,7 @@ ], ], 'mobile' => [ - 'pattern' => '(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|848[0-35-9]|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|70)|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-39]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', + 'pattern' => '(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4])|74[0-2])|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|7[05])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-49]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', 'example' => '51234567', 'posLength' => [ 8, diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MG.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MG.php index 5105b3473..5bb7d0827 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MG.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MG.php @@ -19,7 +19,7 @@ ], ], 'fixedLine' => [ - 'pattern' => '2072[29]\\d{4}|20(?:2\\d|4[47]|5[3467]|6[279]|7[35]|8[268]|9[245])\\d{5}', + 'pattern' => '2072[29]\\d{4}|20(?:2\\d|4[47]|5[3467]|6[279]|7[356]|8[268]|9[245])\\d{5}', 'example' => '202123456', 'posLengthLocal' => [ 7, diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MM.php index f9eb94a3b..1551a32fc 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MM.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MM.php @@ -23,7 +23,7 @@ ], ], 'fixedLine' => [ - 'pattern' => '(?:1(?:(?:2\\d|3[56]|[89][0-6])\\d|4(?:2[29]|62|7[0-2]|83)|6)|2(?:2(?:00|8[34])|4(?:0\\d|[26]2|7[0-2]|83)|51\\d\\d)|4(?:2(?:2\\d\\d|48[013])|3(?:20\\d|4(?:70|83)|56)|420\\d|5470)|6(?:0(?:[23]|88\\d)|(?:124|[56]2\\d)\\d|2472|3(?:20\\d|470)|4(?:2[04]\\d|472)|7(?:(?:3\\d|8[01459])\\d|4[67]0)))\\d{4}|5(?:2(?:2\\d{5,6}|47[02]\\d{4})|(?:3472|4(?:2(?:1|86)|470)|522\\d|6(?:20\\d|483)|7(?:20\\d|48[01])|8(?:20\\d|47[02])|9(?:20\\d|470))\\d{4})|7(?:(?:0470|4(?:25\\d|470)|5(?:202|470|96\\d))\\d{4}|1(?:20\\d{4,5}|4(?:70|83)\\d{4}))|8(?:1(?:2\\d{5,6}|4(?:10|7[01]\\d)\\d{3})|2(?:2\\d{5,6}|(?:320|490\\d)\\d{3})|(?:3(?:2\\d\\d|470)|4[24-7]|5(?:(?:2\\d|51)\\d|4(?:[1-35-9]\\d|4[0-57-9]))|6[23])\\d{4})|(?:1[2-6]\\d|4(?:2[24-8]|3[2-7]|[46][2-6]|5[3-5])|5(?:[27][2-8]|3[2-68]|4[24-8]|5[23]|6[2-4]|8[24-7]|9[2-7])|6(?:[19]20|42[03-6]|(?:52|7[45])\\d)|7(?:[04][24-8]|[15][2-7]|22|3[2-4])|8(?:1[2-689]|2[2-8]|[35]2\\d))\\d{4}|25\\d{5,6}|(?:2[2-9]|6(?:1[2356]|[24][2-6]|3[24-6]|5[2-4]|6[2-8]|7[235-7]|8[245]|9[24])|8(?:3[24]|5[245]))\\d{4}', + 'pattern' => '(?:1(?:(?:12|[28]\\d|3[56]|7[3-6]|9[0-6])\\d|4(?:2[29]|62|7[0-2]|83)|6)|2(?:2(?:00|8[34])|4(?:0\\d|[26]2|7[0-2]|83)|51\\d\\d)|4(?:2(?:2\\d\\d|48[013])|3(?:20\\d|4(?:70|83)|56)|420\\d|5(?:2\\d|470))|6(?:0(?:[23]|88\\d)|(?:124|[56]2\\d)\\d|2472|3(?:20\\d|470)|4(?:2[04]\\d|472)|7(?:3\\d\\d|4[67]0|8(?:[01459]\\d|8))))\\d{4}|5(?:2(?:2\\d{5,6}|47[02]\\d{4})|(?:3472|4(?:2(?:1|86)|470)|522\\d|6(?:20\\d|483)|7(?:20\\d|48[01])|8(?:20\\d|47[02])|9(?:20\\d|470))\\d{4})|7(?:(?:0470|4(?:25\\d|470)|5(?:202|470|96\\d))\\d{4}|1(?:20\\d{4,5}|4(?:70|83)\\d{4}))|8(?:1(?:2\\d{5,6}|4(?:10|7[01]\\d)\\d{3})|2(?:2\\d{5,6}|(?:320|490\\d)\\d{3})|(?:3(?:2\\d\\d|470)|4[24-7]|5(?:(?:2\\d|51)\\d|4(?:[1-35-9]\\d|4[0-57-9]))|6[23])\\d{4})|(?:1[2-6]\\d|4(?:2[24-8]|3[2-7]|[46][2-6]|5[3-5])|5(?:[27][2-8]|3[2-68]|4[24-8]|5[23]|6[2-4]|8[24-7]|9[2-7])|6(?:[19]20|42[03-6]|(?:52|7[45])\\d)|7(?:[04][24-8]|[15][2-7]|22|3[2-4])|8(?:1[2-689]|2[2-8]|(?:[35]2|64)\\d))\\d{4}|25\\d{5,6}|(?:2[2-9]|6(?:1[2356]|[24][2-6]|3[24-6]|5[2-4]|6[2-8]|7[235-7]|8[245]|9[24])|8(?:3[24]|5[245]))\\d{4}', 'example' => '1234567', 'posLength' => [ 6, @@ -111,7 +111,7 @@ 'pattern' => '(\\d{2})(\\d{2})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => [ - '[45]|6(?:0[23]|[1-689]|7[235-7])|7(?:[0-4]|5[2-7])|8[1-6]', + '4(?:[2-46]|5[3-5])|5|6(?:[1-689]|7[235-7])|7(?:[0-4]|5[2-7])|8[1-5]|(?:60|86)[23]', ], 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -120,7 +120,8 @@ 'pattern' => '(\\d)(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => [ - '[12]', + '[12]|452|678|86', + '[12]|452|6788|86', ], 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NO.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NO.php index 31919e5e4..35c169d7b 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NO.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NO.php @@ -71,7 +71,7 @@ ], ], 'uan' => [ - 'pattern' => '(?:0[2-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}', + 'pattern' => '(?:0[235-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}', 'example' => '02000', ], 'voicemail' => [ diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PA.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PA.php index b7f90dcb0..ad0b7e23b 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PA.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PA.php @@ -19,7 +19,7 @@ ], ], 'fixedLine' => [ - 'pattern' => '(?:1(?:0\\d|1[479]|2[37]|3[0137]|4[17]|5[05]|6[058]|7[0167]|8[2358]|9[1389])|2(?:[0235-79]\\d|1[0-7]|4[013-9]|8[02-9])|3(?:[089]\\d|1[0-7]|2[0-5]|33|4[0-79]|5[0-35]|6[068]|7[0-8])|4(?:00|3[0-579]|4\\d|7[0-57-9])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-26-8]|3[03]|4[04]|5[05-9]|6[0156]|7[0-24-9]|8[5-9]|90)|8(?:09|2[89]|3\\d|4[0-24-689]|5[014]|8[02])|9(?:0[5-9]|1[0135-8]|2[036-9]|3[35-79]|40|5[0457-9]|6[05-9]|7[04-9]|8[35-8]|9\\d))\\d{4}', + 'pattern' => '(?:1(?:0\\d|1[479]|2[37]|3[0137]|4[17]|5[05]|6[058]|7[0167]|8[2358]|9[1389])|2(?:[0235-79]\\d|1[0-7]|4[013-9]|8[02-9])|3(?:[07-9]\\d|1[0-7]|2[0-5]|33|4[0-79]|5[0-35]|6[068])|4(?:00|3[0-579]|4\\d|7[0-57-9])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-26-8]|3[03]|4[04]|5[05-9]|6[0156]|7[0-24-9]|8[5-9]|90)|8(?:09|2[89]|3\\d|4[0-24-689]|5[014]|8[02])|9(?:0[5-9]|1[0135-8]|2[036-9]|3[35-79]|40|5[0457-9]|6[05-9]|7[04-9]|8[35-8]|9\\d))\\d{4}', 'example' => '2001234', 'posLength' => [ 7, diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PE.php index bb25b45f9..8ac9a48b8 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PE.php @@ -21,7 +21,7 @@ ], ], 'fixedLine' => [ - 'pattern' => '(?:(?:4[34]|5[14])[0-8]\\d|7(?:173|3[0-8]\\d)|8(?:10[05689]|6(?:0[06-9]|1[6-9]|29)|7(?:0[569]|[56]0)))\\d{4}|(?:1[0-8]|4[12]|5[236]|6[1-7]|7[246]|8[2-4])\\d{6}', + 'pattern' => '(?:(?:(?:4[34]|5[14])[0-8]|687)\\d|7(?:173|(?:3[0-8]|55)\\d)|8(?:10[05689]|6(?:0[06-9]|1[6-9]|29)|7(?:0[0569]|[56]0)))\\d{4}|(?:1[0-8]|4[12]|5[236]|6[1-7]|7[246]|8[2-4])\\d{6}', 'example' => '11234567', 'posLength' => [ 8, diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SG.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SG.php index 2cc248cad..323ee6681 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SG.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SG.php @@ -25,7 +25,7 @@ ], ], 'mobile' => [ - 'pattern' => '8(?:09[0-689]|95[0-2])\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}', + 'pattern' => '(?:8(?:0(?:[1-8]\\d|9[0-689])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-3]|6[0-2]))|9[0-8]\\d\\d)\\d{4}', 'example' => '81234567', 'posLength' => [ 8, diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SJ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SJ.php index aa75e2bfe..751431293 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SJ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SJ.php @@ -71,7 +71,7 @@ ], ], 'uan' => [ - 'pattern' => '(?:0[2-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}', + 'pattern' => '(?:0[235-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}', 'example' => '02000', ], 'voicemail' => [ diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SN.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SN.php index b9f6acaf1..c884a260f 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SN.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SN.php @@ -20,7 +20,7 @@ 'example' => '301012345', ], 'mobile' => [ - 'pattern' => '7(?:(?:[06-8]\\d|21|90)\\d|5(?:0[01]|[19]0|2[25]|[38]3|[4-7]\\d))\\d{5}', + 'pattern' => '7(?:(?:[06-8]\\d|[19]0|21)\\d|5(?:0[01]|[19]0|2[25]|[38]3|[4-7]\\d))\\d{5}', 'example' => '701234567', ], 'tollFree' => [ diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UA.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UA.php index ff0a6875b..1b9f3ec21 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UA.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UA.php @@ -34,7 +34,7 @@ ], ], 'mobile' => [ - 'pattern' => '(?:39|50|6[36-8]|7[1-357]|9[1-9])\\d{7}', + 'pattern' => '790\\d{6}|(?:39|50|6[36-8]|7[1-357]|9[1-9])\\d{7}', 'example' => '501234567', 'posLength' => [ 9, diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UG.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UG.php index f685187bb..a2a6682f3 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UG.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UG.php @@ -30,7 +30,7 @@ ], ], 'mobile' => [ - 'pattern' => '72(?:[48]0|6[01])\\d{5}|7(?:[015-8]\\d|20|36|4[0-5]|9[89])\\d{6}', + 'pattern' => '72[48]0\\d{5}|7(?:[015-8]\\d|2[067]|36|4[0-6]|9[89])\\d{6}', 'example' => '712345678', ], 'tollFree' => [ diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UZ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UZ.php index 72c25354a..2bfad4644 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UZ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UZ.php @@ -16,11 +16,11 @@ ], ], 'fixedLine' => [ - 'pattern' => '(?:55\\d\\d|6(?:1(?:22|3[124]|4[1-4]|5[1-3578]|64)|2(?:22|3[0-57-9]|41)|5(?:22|3[3-7]|5[024-8])|6\\d\\d|7(?:[23]\\d|7[69])|9(?:22|4[1-8]|6[135]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|(?:1[12]|[68]\\d)\\d|2(?:22|3[13-57-9]|4[1-3579]|5[14])|3(?:2\\d|3[1578]|4[1-35-7]|5[1-57]|61)|4(?:2\\d|3[1-579]|7[1-79])|5(?:22|5[1-9]|6[1457])|9(?:22|5[1-9])))\\d{5}', + 'pattern' => '(?:55\\d\\d|6(?:1(?:22|3[124]|4[1-4]|5[1-3578]|64)|2(?:22|3[0-57-9]|41)|5(?:22|3[3-7]|5[024-8])|[69]\\d\\d|7(?:[23]\\d|7[69]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|(?:1[12]|[68]\\d)\\d|2(?:22|3[13-57-9]|4[1-3579]|5[14])|3(?:2\\d|3[1578]|4[1-35-7]|5[1-57]|61)|4(?:2\\d|3[1-579]|7[1-79])|5(?:22|5[1-9]|6[1457])|9(?:22|5[1-9])))\\d{5}', 'example' => '669050123', ], 'mobile' => [ - 'pattern' => '(?:(?:[25]0|33|88|9[0-57-9])\\d{3}|6(?:1(?:2(?:2[01]|98)|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:(?:11|7\\d)\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4]))|5(?:19[01]|2(?:27|9[26])|(?:30|59|7\\d)\\d)|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|(?:3[79]|9[0-3])\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79]))|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079]))|9(?:2(?:1[1267]|3[01]|5\\d|7[0-4])|(?:5[67]|7\\d)\\d|6(?:2[0-26]|8\\d)))|7(?:[07]\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|(?:33|9[4-6])\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078]))|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0-27]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|9[079]))|9(?:22[128]|3(?:2[0-4]|7\\d)|57[02569]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07]))))\\d{4}', + 'pattern' => '(?:(?:[25]0|33|88|9[0-57-9])\\d{3}|6(?:1(?:2(?:2[01]|98)|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:(?:11|7\\d)\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4]))|5(?:19[01]|2(?:27|9[26])|(?:30|59|7\\d)\\d)|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|(?:3[79]|9[0-3])\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79]))|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079])))|7(?:[07]\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|(?:33|9[4-6])\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078]))|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0-27]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|9[079]))|9(?:22[128]|3(?:2[0-4]|7\\d)|57[02569]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07]))))\\d{4}', 'example' => '912345678', ], 'tollFree' => [ diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_WF.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_WF.php index 48be484fa..1c81f875a 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_WF.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_WF.php @@ -10,7 +10,7 @@ 'id' => 'WF', 'countryCode' => 681, 'generalDesc' => [ - 'pattern' => '(?:40|72)\\d{4}|8\\d{5}(?:\\d{3})?', + 'pattern' => '(?:40|72|8\\d{4})\\d{4}|[89]\\d{5}', 'posLength' => [ 6, 9, @@ -53,8 +53,10 @@ ], ], 'voip' => [ + 'pattern' => '9[23]\\d{4}', + 'example' => '921234', 'posLength' => [ - -1, + 6, ], ], 'pager' => [ @@ -85,7 +87,7 @@ 'pattern' => '(\\d{2})(\\d{2})(\\d{2})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => [ - '[478]', + '[47-9]', ], 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_NO.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_NO.php index d9e71c2b0..14f526c5c 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_NO.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_NO.php @@ -10,10 +10,11 @@ 'id' => 'NO', 'countryCode' => 0, 'generalDesc' => [ - 'pattern' => '1\\d\\d(?:\\d(?:\\d{2})?)?', + 'pattern' => '[01]\\d{2,5}', 'posLength' => [ 3, 4, + 5, 6, ], ], @@ -38,7 +39,7 @@ ], ], 'shortCode' => [ - 'pattern' => '1(?:1(?:[0239]|61(?:1[17]|23))|2[048]|4(?:12|[59])|7[57]|8[5-9]\\d|90)', + 'pattern' => '04\\d{3}|1(?:1(?:[0239]|61(?:1[17]|23))|2[048]|4(?:12|[59])|7[57]|8[5-9]\\d|90)', 'example' => '110', ], 'standardRate' => [ @@ -52,8 +53,10 @@ ], ], 'smsServices' => [ + 'pattern' => '04\\d{3}', + 'example' => '04000', 'posLength' => [ - -1, + 5, ], ], 'internationalPrefix' => '', diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_SJ.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_SJ.php index 2f3052835..12dd2f8b8 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_SJ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_SJ.php @@ -10,14 +10,18 @@ 'id' => 'SJ', 'countryCode' => 0, 'generalDesc' => [ - 'pattern' => '1\\d\\d', + 'pattern' => '[01]\\d\\d(?:\\d{2})?', 'posLength' => [ 3, + 5, ], ], 'tollFree' => [ 'pattern' => '11[023]', 'example' => '110', + 'posLength' => [ + 3, + ], ], 'premiumRate' => [ 'posLength' => [ @@ -27,9 +31,12 @@ 'emergency' => [ 'pattern' => '11[023]', 'example' => '110', + 'posLength' => [ + 3, + ], ], 'shortCode' => [ - 'pattern' => '11[023]', + 'pattern' => '04\\d{3}|11[023]', 'example' => '110', ], 'standardRate' => [ @@ -43,8 +50,10 @@ ], ], 'smsServices' => [ + 'pattern' => '04\\d{3}', + 'example' => '04000', 'posLength' => [ - -1, + 5, ], ], 'internationalPrefix' => '', diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_UY.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_UY.php index 59cc27438..c8475f6ca 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_UY.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_UY.php @@ -10,10 +10,11 @@ 'id' => 'UY', 'countryCode' => 0, 'generalDesc' => [ - 'pattern' => '[19]\\d{2,3}', + 'pattern' => '[129]\\d{2,4}', 'posLength' => [ 3, 4, + 5, ], ], 'tollFree' => [ @@ -36,7 +37,7 @@ ], ], 'shortCode' => [ - 'pattern' => '1(?:0[4-9]|1[2368]|2[0-3568]|787)|911', + 'pattern' => '1(?:0[4-9]|1[2368]|2[0-3568]|787|997\\d?)|21997|911', 'example' => '104', ], 'standardRate' => [