diff --git a/composer.json b/composer.json index 3677d10f3..4edce99ea 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "firebase/php-jwt": "^7.0", "fusonic/opengraph": "^3.0.0", "gapple/structured-fields": "^2.3", - "giggsey/libphonenumber-for-php-lite": "^9.0.9", + "giggsey/libphonenumber-for-php-lite": "^9.0.36", "guzzlehttp/guzzle": "^7.15.2", "icewind/searchdav": "^3.2.0", "icewind/smb": "^3.8.1", diff --git a/composer.lock b/composer.lock index 87981eb61..595a8a2ce 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": "61e5e26a724caa259b18258e2cb006e8", + "content-hash": "50383feaf23091d84a1812906e3e2779", "packages": [ { "name": "aws/aws-crt-php", @@ -1030,16 +1030,16 @@ }, { "name": "giggsey/libphonenumber-for-php-lite", - "version": "9.0.9", + "version": "9.0.36", "source": { "type": "git", "url": "https://github.com/giggsey/libphonenumber-for-php-lite.git", - "reference": "d7ae8dd1186b54ce1451aec437346dd772321492" + "reference": "f21237b7df458b326cd5b1bac44d64cc7b1dcb2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/d7ae8dd1186b54ce1451aec437346dd772321492", - "reference": "d7ae8dd1186b54ce1451aec437346dd772321492", + "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/f21237b7df458b326cd5b1bac44d64cc7b1dcb2f", + "reference": "f21237b7df458b326cd5b1bac44d64cc7b1dcb2f", "shasum": "" }, "require": { @@ -1052,7 +1052,7 @@ "require-dev": { "ext-dom": "*", "friendsofphp/php-cs-fixer": "^3.71", - "infection/infection": "^0.28.0", + "infection/infection": "^0.29|^0.31.0", "nette/php-generator": "^4.1", "php-coveralls/php-coveralls": "^2.7", "phpstan/extension-installer": "^1.4.3", @@ -1104,7 +1104,7 @@ "issues": "https://github.com/giggsey/libphonenumber-for-php-lite/issues", "source": "https://github.com/giggsey/libphonenumber-for-php-lite" }, - "time": "2025-07-08T08:38:23+00:00" + "time": "2026-08-03T07:53:53+00:00" }, { "name": "guzzlehttp/guzzle", diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php index 2d0b3124c..007302708 100644 --- a/composer/autoload_classmap.php +++ b/composer/autoload_classmap.php @@ -1622,6 +1622,15 @@ 'Pimple\\Psr11\\ServiceLocator' => $vendorDir . '/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php', 'Pimple\\ServiceIterator' => $vendorDir . '/pimple/pimple/src/Pimple/ServiceIterator.php', 'Pimple\\ServiceProviderInterface' => $vendorDir . '/pimple/pimple/src/Pimple/ServiceProviderInterface.php', + 'Pimple\\Tests\\Fixtures\\Invokable' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php', + 'Pimple\\Tests\\Fixtures\\NonInvokable' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php', + 'Pimple\\Tests\\Fixtures\\PimpleServiceProvider' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php', + 'Pimple\\Tests\\Fixtures\\Service' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php', + 'Pimple\\Tests\\PimpleServiceProviderInterfaceTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php', + 'Pimple\\Tests\\PimpleTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/PimpleTest.php', + 'Pimple\\Tests\\Psr11\\ContainerTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php', + 'Pimple\\Tests\\Psr11\\ServiceLocatorTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php', + 'Pimple\\Tests\\ServiceIteratorTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php', 'Predis\\Autoloader' => $vendorDir . '/predis/predis/src/Autoloader.php', 'Predis\\Client' => $vendorDir . '/predis/predis/src/Client.php', 'Predis\\ClientConfiguration' => $vendorDir . '/predis/predis/src/ClientConfiguration.php', @@ -3194,6 +3203,13 @@ 'Symfony\\Component\\DomCrawler\\FormFieldRegistry' => $vendorDir . '/symfony/dom-crawler/FormFieldRegistry.php', 'Symfony\\Component\\DomCrawler\\Image' => $vendorDir . '/symfony/dom-crawler/Image.php', 'Symfony\\Component\\DomCrawler\\Link' => $vendorDir . '/symfony/dom-crawler/Link.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerAnySelectorTextContains' => $vendorDir . '/symfony/dom-crawler/Test/Constraint/CrawlerAnySelectorTextContains.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerAnySelectorTextSame' => $vendorDir . '/symfony/dom-crawler/Test/Constraint/CrawlerAnySelectorTextSame.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerSelectorAttributeValueSame' => $vendorDir . '/symfony/dom-crawler/Test/Constraint/CrawlerSelectorAttributeValueSame.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerSelectorCount' => $vendorDir . '/symfony/dom-crawler/Test/Constraint/CrawlerSelectorCount.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerSelectorExists' => $vendorDir . '/symfony/dom-crawler/Test/Constraint/CrawlerSelectorExists.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerSelectorTextContains' => $vendorDir . '/symfony/dom-crawler/Test/Constraint/CrawlerSelectorTextContains.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerSelectorTextSame' => $vendorDir . '/symfony/dom-crawler/Test/Constraint/CrawlerSelectorTextSame.php', 'Symfony\\Component\\DomCrawler\\UriResolver' => $vendorDir . '/symfony/dom-crawler/UriResolver.php', 'Symfony\\Component\\EventDispatcher\\Attribute\\AsEventListener' => $vendorDir . '/symfony/event-dispatcher/Attribute/AsEventListener.php', 'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcher' => $vendorDir . '/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php', @@ -3315,6 +3331,17 @@ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\SessionStorageInterface' => $vendorDir . '/symfony/http-foundation/Session/Storage/SessionStorageInterface.php', 'Symfony\\Component\\HttpFoundation\\StreamedJsonResponse' => $vendorDir . '/symfony/http-foundation/StreamedJsonResponse.php', 'Symfony\\Component\\HttpFoundation\\StreamedResponse' => $vendorDir . '/symfony/http-foundation/StreamedResponse.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\RequestAttributeValueSame' => $vendorDir . '/symfony/http-foundation/Test/Constraint/RequestAttributeValueSame.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseCookieValueSame' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseCookieValueSame.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseFormatSame' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseFormatSame.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHasCookie' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseHasCookie.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHasHeader' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseHasHeader.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHeaderLocationSame' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseHeaderLocationSame.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHeaderSame' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseHeaderSame.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseIsRedirected' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseIsRedirected.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseIsSuccessful' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseIsSuccessful.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseIsUnprocessable' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseIsUnprocessable.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseStatusCodeSame' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseStatusCodeSame.php', 'Symfony\\Component\\HttpFoundation\\UriSigner' => $vendorDir . '/symfony/http-foundation/UriSigner.php', 'Symfony\\Component\\HttpFoundation\\UrlHelper' => $vendorDir . '/symfony/http-foundation/UrlHelper.php', 'Symfony\\Component\\Mailer\\Command\\MailerTestCommand' => $vendorDir . '/symfony/mailer/Command/MailerTestCommand.php', @@ -3350,6 +3377,11 @@ 'Symfony\\Component\\Mailer\\Messenger\\MessageHandler' => $vendorDir . '/symfony/mailer/Messenger/MessageHandler.php', 'Symfony\\Component\\Mailer\\Messenger\\SendEmailMessage' => $vendorDir . '/symfony/mailer/Messenger/SendEmailMessage.php', 'Symfony\\Component\\Mailer\\SentMessage' => $vendorDir . '/symfony/mailer/SentMessage.php', + 'Symfony\\Component\\Mailer\\Test\\AbstractTransportFactoryTestCase' => $vendorDir . '/symfony/mailer/Test/AbstractTransportFactoryTestCase.php', + 'Symfony\\Component\\Mailer\\Test\\Constraint\\EmailCount' => $vendorDir . '/symfony/mailer/Test/Constraint/EmailCount.php', + 'Symfony\\Component\\Mailer\\Test\\Constraint\\EmailIsQueued' => $vendorDir . '/symfony/mailer/Test/Constraint/EmailIsQueued.php', + 'Symfony\\Component\\Mailer\\Test\\IncompleteDsnTestTrait' => $vendorDir . '/symfony/mailer/Test/IncompleteDsnTestTrait.php', + 'Symfony\\Component\\Mailer\\Test\\TransportFactoryTestCase' => $vendorDir . '/symfony/mailer/Test/TransportFactoryTestCase.php', 'Symfony\\Component\\Mailer\\Transport' => $vendorDir . '/symfony/mailer/Transport.php', 'Symfony\\Component\\Mailer\\Transport\\AbstractApiTransport' => $vendorDir . '/symfony/mailer/Transport/AbstractApiTransport.php', 'Symfony\\Component\\Mailer\\Transport\\AbstractHttpTransport' => $vendorDir . '/symfony/mailer/Transport/AbstractHttpTransport.php', @@ -3440,6 +3472,13 @@ 'Symfony\\Component\\Mime\\Part\\SMimePart' => $vendorDir . '/symfony/mime/Part/SMimePart.php', 'Symfony\\Component\\Mime\\Part\\TextPart' => $vendorDir . '/symfony/mime/Part/TextPart.php', 'Symfony\\Component\\Mime\\RawMessage' => $vendorDir . '/symfony/mime/RawMessage.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailAddressContains' => $vendorDir . '/symfony/mime/Test/Constraint/EmailAddressContains.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailAttachmentCount' => $vendorDir . '/symfony/mime/Test/Constraint/EmailAttachmentCount.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailHasHeader' => $vendorDir . '/symfony/mime/Test/Constraint/EmailHasHeader.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailHeaderSame' => $vendorDir . '/symfony/mime/Test/Constraint/EmailHeaderSame.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailHtmlBodyContains' => $vendorDir . '/symfony/mime/Test/Constraint/EmailHtmlBodyContains.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailSubjectContains' => $vendorDir . '/symfony/mime/Test/Constraint/EmailSubjectContains.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailTextBodyContains' => $vendorDir . '/symfony/mime/Test/Constraint/EmailTextBodyContains.php', 'Symfony\\Component\\Process\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/process/Exception/ExceptionInterface.php', 'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/process/Exception/InvalidArgumentException.php', 'Symfony\\Component\\Process\\Exception\\LogicException' => $vendorDir . '/symfony/process/Exception/LogicException.php', @@ -3635,6 +3674,8 @@ 'Symfony\\Component\\Translation\\PseudoLocalizationTranslator' => $vendorDir . '/symfony/translation/PseudoLocalizationTranslator.php', 'Symfony\\Component\\Translation\\Reader\\TranslationReader' => $vendorDir . '/symfony/translation/Reader/TranslationReader.php', 'Symfony\\Component\\Translation\\Reader\\TranslationReaderInterface' => $vendorDir . '/symfony/translation/Reader/TranslationReaderInterface.php', + 'Symfony\\Component\\Translation\\Test\\ProviderFactoryTestCase' => $vendorDir . '/symfony/translation/Test/ProviderFactoryTestCase.php', + 'Symfony\\Component\\Translation\\Test\\ProviderTestCase' => $vendorDir . '/symfony/translation/Test/ProviderTestCase.php', 'Symfony\\Component\\Translation\\TranslatableMessage' => $vendorDir . '/symfony/translation/TranslatableMessage.php', 'Symfony\\Component\\Translation\\Translator' => $vendorDir . '/symfony/translation/Translator.php', 'Symfony\\Component\\Translation\\TranslatorBag' => $vendorDir . '/symfony/translation/TranslatorBag.php', diff --git a/composer/autoload_static.php b/composer/autoload_static.php index a75415bdf..86591b947 100644 --- a/composer/autoload_static.php +++ b/composer/autoload_static.php @@ -2177,6 +2177,15 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'Pimple\\Psr11\\ServiceLocator' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php', 'Pimple\\ServiceIterator' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/ServiceIterator.php', 'Pimple\\ServiceProviderInterface' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/ServiceProviderInterface.php', + 'Pimple\\Tests\\Fixtures\\Invokable' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php', + 'Pimple\\Tests\\Fixtures\\NonInvokable' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php', + 'Pimple\\Tests\\Fixtures\\PimpleServiceProvider' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php', + 'Pimple\\Tests\\Fixtures\\Service' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php', + 'Pimple\\Tests\\PimpleServiceProviderInterfaceTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php', + 'Pimple\\Tests\\PimpleTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/PimpleTest.php', + 'Pimple\\Tests\\Psr11\\ContainerTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php', + 'Pimple\\Tests\\Psr11\\ServiceLocatorTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php', + 'Pimple\\Tests\\ServiceIteratorTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php', 'Predis\\Autoloader' => __DIR__ . '/..' . '/predis/predis/src/Autoloader.php', 'Predis\\Client' => __DIR__ . '/..' . '/predis/predis/src/Client.php', 'Predis\\ClientConfiguration' => __DIR__ . '/..' . '/predis/predis/src/ClientConfiguration.php', @@ -3749,6 +3758,13 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'Symfony\\Component\\DomCrawler\\FormFieldRegistry' => __DIR__ . '/..' . '/symfony/dom-crawler/FormFieldRegistry.php', 'Symfony\\Component\\DomCrawler\\Image' => __DIR__ . '/..' . '/symfony/dom-crawler/Image.php', 'Symfony\\Component\\DomCrawler\\Link' => __DIR__ . '/..' . '/symfony/dom-crawler/Link.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerAnySelectorTextContains' => __DIR__ . '/..' . '/symfony/dom-crawler/Test/Constraint/CrawlerAnySelectorTextContains.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerAnySelectorTextSame' => __DIR__ . '/..' . '/symfony/dom-crawler/Test/Constraint/CrawlerAnySelectorTextSame.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerSelectorAttributeValueSame' => __DIR__ . '/..' . '/symfony/dom-crawler/Test/Constraint/CrawlerSelectorAttributeValueSame.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerSelectorCount' => __DIR__ . '/..' . '/symfony/dom-crawler/Test/Constraint/CrawlerSelectorCount.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerSelectorExists' => __DIR__ . '/..' . '/symfony/dom-crawler/Test/Constraint/CrawlerSelectorExists.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerSelectorTextContains' => __DIR__ . '/..' . '/symfony/dom-crawler/Test/Constraint/CrawlerSelectorTextContains.php', + 'Symfony\\Component\\DomCrawler\\Test\\Constraint\\CrawlerSelectorTextSame' => __DIR__ . '/..' . '/symfony/dom-crawler/Test/Constraint/CrawlerSelectorTextSame.php', 'Symfony\\Component\\DomCrawler\\UriResolver' => __DIR__ . '/..' . '/symfony/dom-crawler/UriResolver.php', 'Symfony\\Component\\EventDispatcher\\Attribute\\AsEventListener' => __DIR__ . '/..' . '/symfony/event-dispatcher/Attribute/AsEventListener.php', 'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcher' => __DIR__ . '/..' . '/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php', @@ -3870,6 +3886,17 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\SessionStorageInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/SessionStorageInterface.php', 'Symfony\\Component\\HttpFoundation\\StreamedJsonResponse' => __DIR__ . '/..' . '/symfony/http-foundation/StreamedJsonResponse.php', 'Symfony\\Component\\HttpFoundation\\StreamedResponse' => __DIR__ . '/..' . '/symfony/http-foundation/StreamedResponse.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\RequestAttributeValueSame' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/RequestAttributeValueSame.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseCookieValueSame' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseCookieValueSame.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseFormatSame' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseFormatSame.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHasCookie' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseHasCookie.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHasHeader' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseHasHeader.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHeaderLocationSame' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseHeaderLocationSame.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHeaderSame' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseHeaderSame.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseIsRedirected' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseIsRedirected.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseIsSuccessful' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseIsSuccessful.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseIsUnprocessable' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseIsUnprocessable.php', + 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseStatusCodeSame' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseStatusCodeSame.php', 'Symfony\\Component\\HttpFoundation\\UriSigner' => __DIR__ . '/..' . '/symfony/http-foundation/UriSigner.php', 'Symfony\\Component\\HttpFoundation\\UrlHelper' => __DIR__ . '/..' . '/symfony/http-foundation/UrlHelper.php', 'Symfony\\Component\\Mailer\\Command\\MailerTestCommand' => __DIR__ . '/..' . '/symfony/mailer/Command/MailerTestCommand.php', @@ -3905,6 +3932,11 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'Symfony\\Component\\Mailer\\Messenger\\MessageHandler' => __DIR__ . '/..' . '/symfony/mailer/Messenger/MessageHandler.php', 'Symfony\\Component\\Mailer\\Messenger\\SendEmailMessage' => __DIR__ . '/..' . '/symfony/mailer/Messenger/SendEmailMessage.php', 'Symfony\\Component\\Mailer\\SentMessage' => __DIR__ . '/..' . '/symfony/mailer/SentMessage.php', + 'Symfony\\Component\\Mailer\\Test\\AbstractTransportFactoryTestCase' => __DIR__ . '/..' . '/symfony/mailer/Test/AbstractTransportFactoryTestCase.php', + 'Symfony\\Component\\Mailer\\Test\\Constraint\\EmailCount' => __DIR__ . '/..' . '/symfony/mailer/Test/Constraint/EmailCount.php', + 'Symfony\\Component\\Mailer\\Test\\Constraint\\EmailIsQueued' => __DIR__ . '/..' . '/symfony/mailer/Test/Constraint/EmailIsQueued.php', + 'Symfony\\Component\\Mailer\\Test\\IncompleteDsnTestTrait' => __DIR__ . '/..' . '/symfony/mailer/Test/IncompleteDsnTestTrait.php', + 'Symfony\\Component\\Mailer\\Test\\TransportFactoryTestCase' => __DIR__ . '/..' . '/symfony/mailer/Test/TransportFactoryTestCase.php', 'Symfony\\Component\\Mailer\\Transport' => __DIR__ . '/..' . '/symfony/mailer/Transport.php', 'Symfony\\Component\\Mailer\\Transport\\AbstractApiTransport' => __DIR__ . '/..' . '/symfony/mailer/Transport/AbstractApiTransport.php', 'Symfony\\Component\\Mailer\\Transport\\AbstractHttpTransport' => __DIR__ . '/..' . '/symfony/mailer/Transport/AbstractHttpTransport.php', @@ -3995,6 +4027,13 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'Symfony\\Component\\Mime\\Part\\SMimePart' => __DIR__ . '/..' . '/symfony/mime/Part/SMimePart.php', 'Symfony\\Component\\Mime\\Part\\TextPart' => __DIR__ . '/..' . '/symfony/mime/Part/TextPart.php', 'Symfony\\Component\\Mime\\RawMessage' => __DIR__ . '/..' . '/symfony/mime/RawMessage.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailAddressContains' => __DIR__ . '/..' . '/symfony/mime/Test/Constraint/EmailAddressContains.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailAttachmentCount' => __DIR__ . '/..' . '/symfony/mime/Test/Constraint/EmailAttachmentCount.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailHasHeader' => __DIR__ . '/..' . '/symfony/mime/Test/Constraint/EmailHasHeader.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailHeaderSame' => __DIR__ . '/..' . '/symfony/mime/Test/Constraint/EmailHeaderSame.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailHtmlBodyContains' => __DIR__ . '/..' . '/symfony/mime/Test/Constraint/EmailHtmlBodyContains.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailSubjectContains' => __DIR__ . '/..' . '/symfony/mime/Test/Constraint/EmailSubjectContains.php', + 'Symfony\\Component\\Mime\\Test\\Constraint\\EmailTextBodyContains' => __DIR__ . '/..' . '/symfony/mime/Test/Constraint/EmailTextBodyContains.php', 'Symfony\\Component\\Process\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/process/Exception/ExceptionInterface.php', 'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/process/Exception/InvalidArgumentException.php', 'Symfony\\Component\\Process\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/process/Exception/LogicException.php', @@ -4190,6 +4229,8 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'Symfony\\Component\\Translation\\PseudoLocalizationTranslator' => __DIR__ . '/..' . '/symfony/translation/PseudoLocalizationTranslator.php', 'Symfony\\Component\\Translation\\Reader\\TranslationReader' => __DIR__ . '/..' . '/symfony/translation/Reader/TranslationReader.php', 'Symfony\\Component\\Translation\\Reader\\TranslationReaderInterface' => __DIR__ . '/..' . '/symfony/translation/Reader/TranslationReaderInterface.php', + 'Symfony\\Component\\Translation\\Test\\ProviderFactoryTestCase' => __DIR__ . '/..' . '/symfony/translation/Test/ProviderFactoryTestCase.php', + 'Symfony\\Component\\Translation\\Test\\ProviderTestCase' => __DIR__ . '/..' . '/symfony/translation/Test/ProviderTestCase.php', 'Symfony\\Component\\Translation\\TranslatableMessage' => __DIR__ . '/..' . '/symfony/translation/TranslatableMessage.php', 'Symfony\\Component\\Translation\\Translator' => __DIR__ . '/..' . '/symfony/translation/Translator.php', 'Symfony\\Component\\Translation\\TranslatorBag' => __DIR__ . '/..' . '/symfony/translation/TranslatorBag.php', diff --git a/composer/installed.json b/composer/installed.json index b27c78441..83d651949 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -1069,17 +1069,17 @@ }, { "name": "giggsey/libphonenumber-for-php-lite", - "version": "9.0.9", - "version_normalized": "9.0.9.0", + "version": "9.0.36", + "version_normalized": "9.0.36.0", "source": { "type": "git", "url": "https://github.com/giggsey/libphonenumber-for-php-lite.git", - "reference": "d7ae8dd1186b54ce1451aec437346dd772321492" + "reference": "f21237b7df458b326cd5b1bac44d64cc7b1dcb2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/d7ae8dd1186b54ce1451aec437346dd772321492", - "reference": "d7ae8dd1186b54ce1451aec437346dd772321492", + "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/f21237b7df458b326cd5b1bac44d64cc7b1dcb2f", + "reference": "f21237b7df458b326cd5b1bac44d64cc7b1dcb2f", "shasum": "" }, "require": { @@ -1092,7 +1092,7 @@ "require-dev": { "ext-dom": "*", "friendsofphp/php-cs-fixer": "^3.71", - "infection/infection": "^0.28.0", + "infection/infection": "^0.29|^0.31.0", "nette/php-generator": "^4.1", "php-coveralls/php-coveralls": "^2.7", "phpstan/extension-installer": "^1.4.3", @@ -1108,7 +1108,7 @@ "suggest": { "giggsey/libphonenumber-for-php": "Use libphonenumber-for-php for geocoding, carriers, timezones and matching" }, - "time": "2025-07-08T08:38:23+00:00", + "time": "2026-08-03T07:53:53+00:00", "type": "library", "extra": { "branch-alias": { diff --git a/composer/installed.php b/composer/installed.php index 4f9cd04f3..6442050e6 100644 --- a/composer/installed.php +++ b/composer/installed.php @@ -146,9 +146,9 @@ 'dev_requirement' => false, ), 'giggsey/libphonenumber-for-php-lite' => array( - 'pretty_version' => '9.0.9', - 'version' => '9.0.9.0', - 'reference' => 'd7ae8dd1186b54ce1451aec437346dd772321492', + 'pretty_version' => '9.0.36', + 'version' => '9.0.36.0', + 'reference' => 'f21237b7df458b326cd5b1bac44d64cc7b1dcb2f', '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 21d44fbc1..e3a396d0d 100644 --- a/giggsey/libphonenumber-for-php-lite/METADATA-VERSION.php +++ b/giggsey/libphonenumber-for-php-lite/METADATA-VERSION.php @@ -8,4 +8,4 @@ * For more information, look at the phing tasks in build.xml * @internal */ -return 'v9.0.9'; +return 'v9.0.36'; diff --git a/giggsey/libphonenumber-for-php-lite/qodana.yaml b/giggsey/libphonenumber-for-php-lite/qodana.yaml new file mode 100644 index 000000000..8678310c1 --- /dev/null +++ b/giggsey/libphonenumber-for-php-lite/qodana.yaml @@ -0,0 +1,10 @@ +#################################################################################################################### +# WARNING: Do not store sensitive information in this file, as its contents will be included in the Qodana report. # +#################################################################################################################### + +version: "1.0" +linter: qodana-php +profile: + name: qodana.recommended +include: + - name: CheckDependencyLicenses \ No newline at end of file diff --git a/giggsey/libphonenumber-for-php-lite/src/PhoneNumber.php b/giggsey/libphonenumber-for-php-lite/src/PhoneNumber.php index 0d5de5d3c..008bcd95a 100644 --- a/giggsey/libphonenumber-for-php-lite/src/PhoneNumber.php +++ b/giggsey/libphonenumber-for-php-lite/src/PhoneNumber.php @@ -381,7 +381,7 @@ public function unserialize($data): void } /** - * @param array{int,string,string,bool|null,int,string|null,CountryCodeSource|null,string|null} $data + * @param array{int,string,string,bool|null,int,string|null,CountryCodeSource|int|null,string|null} $data */ public function __unserialize(array $data): void { diff --git a/giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php b/giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php index fab9c93c3..707a2c59b 100644 --- a/giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php +++ b/giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php @@ -114,7 +114,7 @@ class PhoneNumberUtil protected const UNWANTED_END_CHAR_PATTERN = '[^' . self::DIGITS . self::VALID_ALPHA . '#]+$'; protected const DIALLABLE_CHAR_MAPPINGS = self::ASCII_DIGIT_MAPPINGS + [self::PLUS_SIGN => self::PLUS_SIGN] - + ['*' => '*', '#' => '#']; + + ['*' => '*', '#' => '#']; protected static ?PhoneNumberUtil $instance; @@ -841,6 +841,11 @@ protected function isValidRegionCode(?string $regionCode): bool public function getRegionCodeForNumber(PhoneNumber $number): ?string { $countryCode = $number->getCountryCode(); + + if ($countryCode === null) { + return null; + } + if (!isset($this->countryCallingCodeToRegionCodeMap[$countryCode])) { return null; } @@ -890,9 +895,11 @@ protected function getRegionCodeForNumberFromRegionList(PhoneNumber $number, arr public function getNationalSignificantNumber(PhoneNumber $number): string { // If leading zero(s) have been set, we prefix this now. Note this is not a national prefix. + // Defensively cap the number of leading zeros to avoid OOM from malicious input. $nationalNumber = ''; if ($number->isItalianLeadingZero() && $number->getNumberOfLeadingZeros() > 0) { - $zeros = str_repeat('0', $number->getNumberOfLeadingZeros()); + $numberOfLeadingZeros = min($number->getNumberOfLeadingZeros(), 10); + $zeros = str_repeat('0', $numberOfLeadingZeros); $nationalNumber .= $zeros; } $nationalNumber .= $number->getNationalNumber(); @@ -1112,13 +1119,17 @@ public function getLengthOfNationalDestinationCode(PhoneNumber $number): int public function format(PhoneNumber $number, PhoneNumberFormat $numberFormat): string { if ($number->getNationalNumber() === '0' && $number->hasRawInput()) { - // Unparseable numbers that kept their raw input just use that. - // This is the only case where a number can be formatted as E164 without a - // leading '+' symbol (but the original number wasn't parseable anyway). - // TODO: Consider removing the 'if' above so that unparseable - // strings without raw input format to the empty string instead of "+00" + // Unparseable numbers that kept their raw input just use that, unless default country was + // specified and the format is E164. In that case, we prepend the raw input with the country + // code $rawInput = $number->getRawInput(); - if ($rawInput !== '') { + + if ($rawInput !== '' && $number->hasCountryCode() && $number->getCountryCodeSource() === CountryCodeSource::FROM_DEFAULT_COUNTRY && $numberFormat === PhoneNumberFormat::E164) { + $countryCallingCode = $number->getCountryCode(); + $formattedNumber = $rawInput; + $this->prefixNumberWithCountryCallingCode($countryCallingCode, $numberFormat, $formattedNumber); + return $formattedNumber; + } elseif ($rawInput !== '' || !$number->hasCountryCode()) { return $rawInput; } } @@ -1322,6 +1333,30 @@ public static function getCountryMobileToken(int $countryCallingCode): string return static::MOBILE_TOKEN_MAPPINGS[$countryCallingCode] ?? ''; } + /** + * Checks whether the supplied string contains at least three ASCII letters. + */ + private function hasAtLeastThreeAlphaChars(string $number): bool + { + $alphaCount = 0; + $length = strlen($number); + + for ($i = 0; $i < $length; $i++) { + $character = ord($number[$i]); + + if ( + ($character >= 65 && $character <= 90) + || ($character >= 97 && $character <= 122) + ) { + if (++$alphaCount >= 3) { + return true; + } + } + } + + return false; + } + /** * Checks if the number is a valid vanity (alpha) number such as 800 MICROSOFT. A valid vanity * number will start with at least 3 digits and will have three or more alpha characters. This @@ -1334,12 +1369,18 @@ public static function getCountryMobileToken(int $countryCallingCode): string */ public function isAlphaNumber(string $number): bool { + if (strlen($number) > static::MAX_INPUT_STRING_LENGTH) { + return false; + } + if (!static::isViablePhoneNumber($number)) { - // Number is too short, or doesn't match the basic phone number pattern. + // Number is too short, or doesn't match the basic phone-number pattern. return false; } + $this->maybeStripExtension($number); - return preg_match('/' . static::VALID_ALPHA_PHONE_PATTERN . '/' . static::REGEX_FLAGS, $number) === 1; + + return $this->hasAtLeastThreeAlphaChars($number); } /** @@ -2682,7 +2723,9 @@ public function isNANPACountry(string $regionCode): bool */ public function formatInOriginalFormat(PhoneNumber $number, string $regionCallingFrom): string { - if ($number->hasRawInput() && !$this->hasFormattingPatternForNumber($number)) { + $formatRule = $this->getFormattingPatternForNumber($number); + + if ($number->hasRawInput() && $formatRule === null) { // We check if we have the formatting pattern because without that, we might format the number // as a group without national prefix. return $number->getRawInput(); @@ -2726,11 +2769,6 @@ public function formatInOriginalFormat(PhoneNumber $number, string $regionCallin $formattedNumber = $nationalFormat; break; } - // Metadata cannot be null here because getNddPrefixForRegion() (above) returns null if - // there is no metadata for the region. - $metadata = $this->getMetadataForRegion($regionCode); - $nationalNumber = $this->getNationalSignificantNumber($number); - $formatRule = $this->chooseFormattingPatternForNumber($metadata->numberFormats(), $nationalNumber); // The format rule could still be null here if the national number was 0 and there was no // raw input (this should not be possible for numbers generated by the phonenumber library // as they would also not have a country calling code and we would have exited earlier). @@ -2777,17 +2815,19 @@ public function formatInOriginalFormat(PhoneNumber $number, string $regionCallin return $formattedNumber; } - protected function hasFormattingPatternForNumber(PhoneNumber $number): bool + /** + * Called chooseFormattingPatternForNumber in libphonenumber + */ + protected function getFormattingPatternForNumber(PhoneNumber $number): ?NumberFormat { $countryCallingCode = $number->getCountryCode(); $phoneNumberRegion = $this->getRegionCodeForCountryCode($countryCallingCode); $metadata = $this->getMetadataForRegionOrCallingCode($countryCallingCode, $phoneNumberRegion); if ($metadata === null) { - return false; + return null; } $nationalNumber = $this->getNationalSignificantNumber($number); - $formatRule = $this->chooseFormattingPatternForNumber($metadata->numberFormats(), $nationalNumber); - return $formatRule !== null; + return $this->chooseFormattingPatternForNumber($metadata->numberFormats(), $nationalNumber); } /** diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_882.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_882.php index 6d5b64ddf..4617e59e2 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_882.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_882.php @@ -31,7 +31,7 @@ public function __construct() ->setNationalNumberPattern('[13]\d{6}(?:\d{2,5})?|[19]\d{7}|(?:[25]\d\d|4)\d{7}(?:\d{2})?') ->setPossibleLength([7, 8, 9, 10, 11, 12]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('342\d{4}|(?:337|49)\d{6}|(?:3(?:2|47|7\d{3})|50\d{3})\d{7}') + ->setNationalNumberPattern('342\d{4}|(?:337|49)\d{6}|(?:3(?:2|47|7\d{3})|5(?:0\d{3}|2[0-2]))\d{7}') ->setExampleNumber('3421234') ->setPossibleLength([7, 8, 9, 10, 12]); $this->premiumRate = PhoneNumberDesc::empty(); @@ -65,7 +65,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{4})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['10|23|3(?:[15]|4[57])|4|51']) + ->setLeadingDigitsPattern(['10|23|3(?:[15]|4[57])|4|5[12]']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{3})(\d{4})(\d{4})') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AC.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AC.php index f5de2bff9..3100307da 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AC.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AC.php @@ -27,15 +27,15 @@ class PhoneNumberMetadata_AC extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[01589]\d|[46])\d{4}') + ->setNationalNumberPattern('(?:[01589]\d|[2-467])\d{4}') ->setPossibleLength([5, 6]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('4\d{4}') + ->setNationalNumberPattern('[2-47]\d{4}') ->setExampleNumber('40123') ->setPossibleLength([5]); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('6[2-467]\d{3}') + ->setNationalNumberPattern('6\d{4}') ->setExampleNumber('62889') ->setPossibleLength([5]); $this->tollFree = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AE.php index ff8bfe1c4..580504aee 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AE.php @@ -33,7 +33,7 @@ public function __construct() ->setNationalNumberPattern('(?:[4-7]\d|9[0-689])\d{7}|800\d{2,9}|[2-4679]\d{7}') ->setPossibleLength([5, 6, 7, 8, 9, 10, 11, 12]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('5[024-68]\d{7}') + ->setNationalNumberPattern('5[02-68]\d{7}') ->setExampleNumber('501234567') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AG.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AG.php index edc916533..b45d288ec 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AG.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AG.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = (new PhoneNumberDesc()) ->setNationalNumberPattern('26848[01]\d{4}') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AI.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AI.php index 0ba008c4d..a1b0dc4b5 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AI.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AI.php @@ -36,7 +36,7 @@ public function __construct() ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('264(?:235|4(?:69|76)|5(?:3[6-9]|8[1-4])|7(?:29|72))\d{4}') + ->setNationalNumberPattern('264(?:235|4(?:69|7[67])|5(?:3[6-9]|8[1-4])|7(?:29|72))\d{4}') ->setExampleNumber('2642351234') ->setPossibleLengthLocalOnly([7]); $this->premiumRate = (new PhoneNumberDesc()) @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AS.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AS.php index 10012d018..8040e4077 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AS.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AS.php @@ -35,14 +35,14 @@ public function __construct() ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('684(?:2(?:48|5[2468]|7[26])|7(?:3[13]|70|82))\d{4}') + ->setNationalNumberPattern('684(?:2(?:48|5[2468]|7[246])|7(?:3[13]|70|82))\d{4}') ->setExampleNumber('6847331234') ->setPossibleLengthLocalOnly([7]); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('900[2-9]\d{6}') ->setExampleNumber('9002123456'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('6846(?:22|33|44|55|77|88|9[19])\d{4}') + ->setNationalNumberPattern('684(?:274|6(?:22|33|44|55|77|88|9[19]))\d{4}') ->setExampleNumber('6846221234') ->setPossibleLengthLocalOnly([7]); $this->tollFree = (new PhoneNumberDesc()) @@ -50,7 +50,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AU.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AU.php index 788d46f5d..62ede54a3 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AU.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AU.php @@ -36,7 +36,7 @@ public function __construct() ->setNationalNumberPattern('1(?:[0-79]\d{7}(?:\d(?:\d{2})?)?|8[0-24-9]\d{7})|[2-478]\d{8}|1\d{4,7}') ->setPossibleLength([5, 6, 7, 8, 9, 10, 12]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('4(?:79[01]|83[0-389]|94[0-478])\d{5}|4(?:[0-36]\d|4[047-9]|5[0-25-9]|7[02-8]|8[0-24-9]|9[0-37-9])\d{6}') + ->setNationalNumberPattern('4(?:79[01]|83[0-36-9]|95[0-3])\d{5}|4(?:[0-36]\d|4[047-9]|[58][0-24-9]|7[02-8]|9[0-47-9])\d{6}') ->setExampleNumber('412345678') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) @@ -44,7 +44,7 @@ public function __construct() ->setExampleNumber('1900123456') ->setPossibleLength([10]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:(?:2(?:(?:[0-26-9]\d|3[0-8]|5[0135-9])\d|4(?:[02-9]\d|10))|3(?:(?:[0-3589]\d|6[1-9]|7[0-35-9])\d|4(?:[0-578]\d|90))|7(?:[013-57-9]\d|2[0-8])\d)\d\d|8(?:51(?:0(?:0[03-9]|[12479]\d|3[2-9]|5[0-8]|6[1-9]|8[0-7])|1(?:[0235689]\d|1[0-69]|4[0-589]|7[0-47-9])|2(?:0[0-79]|[18][13579]|2[14-9]|3[0-46-9]|[4-6]\d|7[89]|9[0-4])|[34]\d\d)|(?:6[0-8]|[78]\d)\d{3}|9(?:[02-9]\d{3}|1(?:(?:[0-58]\d|6[0135-9])\d|7(?:0[0-24-9]|[1-9]\d)|9(?:[0-46-9]\d|5[0-79])))))\d{3}') + ->setNationalNumberPattern('(?:(?:241|349)0\d\d|8(?:51(?:0(?:0[03-9]|[12479]\d|3[2-9]|5[0-8]|6[1-9]|8[0-7])|1(?:[0235689]\d|1[0-69]|4[0-589]|7[0-47-9])|2(?:0[0-79]|[18][13579]|2[14-9]|3[0-46-9]|[4-6]\d|7[89]|9[0-4])|[34]\d\d)|91(?:(?:[0-58]\d|6[0135-9])\d|7(?:0[0-24-9]|[1-9]\d)|9(?:[0-46-9]\d|5[0-79]))))\d{3}|(?:2(?:[0-26-9]\d|3[0-8]|4[02-9]|5[0135-9])|3(?:[0-3589]\d|4[0-578]|6[1-9]|7[0-35-9])|7(?:[013-57-9]\d|2[0-8])|8(?:55|6[0-8]|[78]\d|9[02-9]))\d{6}') ->setExampleNumber('212345678') ->setPossibleLengthLocalOnly([8]) ->setPossibleLength([9]); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BB.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BB.php index 2fefbc446..7a7a04826 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BB.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BB.php @@ -52,7 +52,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = (new PhoneNumberDesc()) ->setNationalNumberPattern('24631\d{5}') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BD.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BD.php index 164b799a0..7063ff204 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BD.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BD.php @@ -75,7 +75,7 @@ public function __construct() $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = PhoneNumberDesc::empty(); $this->voip = (new PhoneNumberDesc()) - ->setNationalNumberPattern('96(?:0[469]|1[0-47]|3[389]|43|6[69]|7[78])\d{6}') + ->setNationalNumberPattern('96(?:0[1-69]|1[0-479]|2[278]|3[13-9]|4[013]|54|6[69]|7[78]|88)\d{6}') ->setExampleNumber('9604123456') ->setPossibleLength([10]); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BE.php index 61e6799df..567f66513 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BE.php @@ -35,7 +35,7 @@ public function __construct() ->setPossibleLength([8, 9]); $this->mobile = (new PhoneNumberDesc()) ->setNationalNumberPattern('4[5-9]\d{7}') - ->setExampleNumber('470123456') + ->setExampleNumber('450001234') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('(?:70(?:2[0-57]|3[04-7]|44|6[04-69]|7[0579])|90\d\d)\d{4}') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BF.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BF.php index d0d24058e..ba90a980b 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BF.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BF.php @@ -28,14 +28,14 @@ class PhoneNumberMetadata_BF extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[025-7]\d|44)\d{6}') + ->setNationalNumberPattern('[024-7]\d{7}') ->setPossibleLength([8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:0[1-7]|44|5[0-8]|[67]\d)\d{6}') + ->setNationalNumberPattern('(?:0[1-7]|4[4-6]|5[0-8]|[67]\d)\d{6}') ->setExampleNumber('70123456'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('2(?:0(?:49|5[23]|6[5-7]|9[016-9])|4(?:4[569]|5[4-6]|6[5-7]|7[0179])|5(?:[34]\d|50|6[5-7]))\d{4}') + ->setNationalNumberPattern('2(?:0(?:49|5[23]|6[5-7]|9[016-9])|4(?:4[569]|5[4-6]|6[5-7]|7[0179])|5(?:[34]\d|50|6[5-8]))\d{4}') ->setExampleNumber('20491234'); $this->numberFormat = [ (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BI.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BI.php index 1c5f3eacd..a0095eef0 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BI.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BI.php @@ -31,7 +31,7 @@ public function __construct() ->setNationalNumberPattern('(?:[267]\d|31)\d{6}') ->setPossibleLength([8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:29|6[124-9]|7[125-9])\d{6}') + ->setNationalNumberPattern('(?:29|6[1-9]|7[125-9])\d{6}') ->setExampleNumber('79561234'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BJ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BJ.php index e9eec2c4e..69f61dd47 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BJ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BJ.php @@ -29,20 +29,22 @@ class PhoneNumberMetadata_BJ extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:01\d|[24-689])\d{7}') + ->setNationalNumberPattern('(?:01\d|8)\d{7}') ->setPossibleLength([8, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:01(?:2[5-9]|[4-69]\d)|4[0-8]|[56]\d|9[013-9])\d{6}') - ->setExampleNumber('0195123456'); + ->setNationalNumberPattern('01(?:2[5-9]|[4-69]\d)\d{6}') + ->setExampleNumber('0195123456') + ->setPossibleLength([10]); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('2090\d{4}|(?:012\d\d|2(?:02|1[037]|2[45]|3[68]|4\d))\d{5}') - ->setExampleNumber('0120211234'); + ->setNationalNumberPattern('012\d{7}') + ->setExampleNumber('0120211234') + ->setPossibleLength([10]); $this->numberFormat = [ (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['[24-689]']) + ->setLeadingDigitsPattern(['8']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BL.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BL.php index 34612cbad..b11dc14fd 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BL.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BL.php @@ -30,14 +30,16 @@ class PhoneNumberMetadata_BL extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:590\d|7090)\d{5}|(?:69|80|9\d)\d{7}') + ->setNationalNumberPattern('7090\d{5}|(?:[56]9|[89]\d)\d{7}') ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:69(?:0\d\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\d)|6(?:1[016-9]|5[0-4]|[67]\d))|7090[0-4])\d{4}') + ->setNationalNumberPattern('(?:69(?:0\d\d|1(?:2[2-9]|3[0-5]))|7090[0-4])\d{4}') ->setExampleNumber('690001234'); - $this->premiumRate = PhoneNumberDesc::empty(); + $this->premiumRate = (new PhoneNumberDesc()) + ->setNationalNumberPattern('8[129]\d{7}') + ->setExampleNumber('810123456'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('590(?:2[7-9]|3[3-7]|5[12]|87)\d{4}') + ->setNationalNumberPattern('(?:59(?:0(?:2[7-9]|3[3-7]|5[12]|87)|87\d)|80[6-9]\d\d)\d{4}') ->setExampleNumber('590271234'); $this->tollFree = (new PhoneNumberDesc()) ->setNationalNumberPattern('80[0-5]\d{6}') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BM.php index 59465e157..475efab36 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BM.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BM.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BO.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BO.php index 9179b4a99..ccdbf989a 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BO.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BO.php @@ -30,11 +30,11 @@ class PhoneNumberMetadata_BO extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('8001\d{5}|(?:[2-467]\d|50)\d{6}') + ->setNationalNumberPattern('(?:[2-7]\d\d|8001)\d{5}') ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([8, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[67]\d{7}') + ->setNationalNumberPattern('(?:57|[67]\d)\d{6}') ->setExampleNumber('71234567') ->setPossibleLength([8]); $this->premiumRate = PhoneNumberDesc::empty(); @@ -47,13 +47,13 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d)(\d{7})') ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['[235]|4[46]']) + ->setLeadingDigitsPattern(['[23]|4[46]|50']) ->setDomesticCarrierCodeFormattingRule('0$CC $1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{8})') ->setFormat('$1') - ->setLeadingDigitsPattern(['[67]']) + ->setLeadingDigitsPattern(['[5-7]']) ->setDomesticCarrierCodeFormattingRule('0$CC $1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BS.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BS.php index cc2eea9c6..0aa573f4e 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BS.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BS.php @@ -52,7 +52,7 @@ public function __construct() ->setPossibleLengthLocalOnly([7]); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BT.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BT.php index 473ef4ff6..9c4d64d45 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BT.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BT.php @@ -28,11 +28,11 @@ class PhoneNumberMetadata_BT extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[17]\d{7}|[2-8]\d{6}') + ->setNationalNumberPattern('[178]\d{7}|[2-8]\d{6}') ->setPossibleLengthLocalOnly([6]) ->setPossibleLength([7, 8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:1[67]|77)\d{6}') + ->setNationalNumberPattern('(?:1[67]|[78]7)\d{6}') ->setExampleNumber('17123456') ->setPossibleLength([8]); $this->premiumRate = PhoneNumberDesc::empty(); @@ -50,12 +50,12 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d)(\d{3})(\d{3})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[2-68]|7[246]']) + ->setLeadingDigitsPattern(['[2-6]|7[246]|8[2-4]']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['1[67]|7']) + ->setLeadingDigitsPattern(['1[67]|[78]']) ->setNationalPrefixOptionalWhenFormatting(false), ]; $this->tollFree = PhoneNumberDesc::empty(); @@ -70,12 +70,12 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d)(\d{3})(\d{3})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[2-68]|7[246]']) + ->setLeadingDigitsPattern(['[2-6]|7[246]|8[2-4]']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['1[67]|7']) + ->setLeadingDigitsPattern(['1[67]|[78]']) ->setNationalPrefixOptionalWhenFormatting(false), ]; } diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BW.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BW.php index d1bc837dd..a5483e113 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BW.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BW.php @@ -31,7 +31,7 @@ public function __construct() ->setNationalNumberPattern('(?:0800|(?:[37]|800)\d)\d{6}|(?:[2-6]\d|90)\d{5}') ->setPossibleLength([7, 8, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:321|7[1-8]\d)\d{5}') + ->setNationalNumberPattern('(?:321|7(?:[1-8]\d|9[03]))\d{5}') ->setExampleNumber('71123456') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CA.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CA.php index f8bf10c8f..42965cd5d 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CA.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CA.php @@ -53,7 +53,7 @@ public function __construct() ->setPossibleLength([10]); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|(?:5(?:2[125-9]|33|44|66|77|88)|6(?:22|33))[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|(?:5(?:2[125-9]|3[23]|44|66|77|88)|6(?:22|33))[2-9]\d{6}') ->setExampleNumber('5219023456') ->setPossibleLength([10]); $this->voip = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CC.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CC.php index 5a314df6e..7b2de25ea 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CC.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CC.php @@ -34,7 +34,7 @@ public function __construct() ->setNationalNumberPattern('1(?:[0-79]\d{8}(?:\d{2})?|8[0-24-9]\d{7})|[148]\d{8}|1\d{5,7}') ->setPossibleLength([6, 7, 8, 9, 10, 12]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('4(?:79[01]|83[0-389]|94[0-478])\d{5}|4(?:[0-36]\d|4[047-9]|5[0-25-9]|7[02-8]|8[0-24-9]|9[0-37-9])\d{6}') + ->setNationalNumberPattern('4(?:79[01]|83[0-36-9]|95[0-3])\d{5}|4(?:[0-36]\d|4[047-9]|[58][0-24-9]|7[02-8]|9[0-47-9])\d{6}') ->setExampleNumber('412345678') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CD.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CD.php index b85ba7dc5..91c509504 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CD.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CD.php @@ -33,7 +33,7 @@ public function __construct() ->setNationalNumberPattern('(?:(?:[189]|5\d)\d|2)\d{7}|[1-68]\d{6}') ->setPossibleLength([7, 8, 9, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('88\d{5}|(?:8[0-69]|9[017-9])\d{7}') + ->setNationalNumberPattern('88\d{5}|(?:8[0-69]|9[016-9])\d{7}') ->setExampleNumber('991234567') ->setPossibleLength([7, 9]); $this->premiumRate = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CF.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CF.php index dbbc36051..f47f3d507 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CF.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CF.php @@ -28,22 +28,22 @@ class PhoneNumberMetadata_CF extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[27]\d{3}|8776)\d{4}') + ->setNationalNumberPattern('8776\d{4}|(?:[27]\d|61)\d{6}') ->setPossibleLength([8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('7[024-7]\d{6}') + ->setNationalNumberPattern('7[02-7]\d{6}') ->setExampleNumber('70012345'); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('8776\d{4}') ->setExampleNumber('87761234'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('2[12]\d{6}') + ->setNationalNumberPattern('(?:2[12]|61)\d{6}') ->setExampleNumber('21612345'); $this->numberFormat = [ (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['[278]']) + ->setLeadingDigitsPattern(['[26-8]']) ->setNationalPrefixOptionalWhenFormatting(false), ]; $this->tollFree = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CL.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CL.php index fb7afd88c..4479e6d7a 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CL.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CL.php @@ -25,7 +25,6 @@ class PhoneNumberMetadata_CL extends PhoneMetadata protected ?string $internationalPrefix = '(?:0|1(?:1[0-69]|2[02-5]|5[13-58]|69|7[0167]|8[018]))0'; protected bool $mobileNumberPortableRegion = true; - protected bool $sameMobileAndFixedLinePattern = true; public function __construct() { @@ -33,13 +32,13 @@ public function __construct() ->setNationalNumberPattern('12300\d{6}|6\d{9,10}|[2-9]\d{8}') ->setPossibleLength([9, 10, 11]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('2(?:1982[0-6]|3314[05-9])\d{3}|(?:2(?:1(?:160|962)|3(?:2\d\d|3(?:[03467]\d|1[0-35-9]|2[1-9]|5[0-24-9]|8[0-3])|600)|646[59])|80[1-9]\d\d|9(?:3(?:[0-57-9]\d\d|6(?:0[02-9]|[1-9]\d))|6(?:[0-8]\d\d|9(?:[02-79]\d|1[05-9]))|7[1-9]\d\d|9(?:[03-9]\d\d|1(?:[0235-9]\d|4[0-24-9])|2(?:[0-79]\d|8[0-46-9]))))\d{4}|(?:22|3[2-5]|[47][1-35]|5[1-3578]|6[13-57]|8[1-9]|9[2458])\d{7}') + ->setNationalNumberPattern('2(?:1982[0-6]|3314[05-9])\d{3}|(?:2(?:1(?:160|962)|3(?:(?:[24]\d|50)\d|3(?:[034679]\d|1[0-35-9]|2[1-9]|5[0-24-9]|8[0-389])|600)|646[59])|80[1-8]\d\d|9(?:(?:10[0-2]|7[1-9]\d)\d|3(?:[0-57-9]\d\d|6(?:0[02-9]|[1-9]\d))|6(?:[0-8]\d\d|9(?:[02-79]\d|1[05-9]))|9(?:[03-9]\d\d|1(?:[0235-9]\d|4[0-24-9])|2(?:[0-79]\d|8[0-46-9]))))\d{4}|(?:22|3[2-5]|[47][1-35]|5[1-3578]|6[13-57]|8[1-9]|9[2458])\d{7}') ->setExampleNumber('221234567') ->setPossibleLength([9]); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('2(?:1982[0-6]|3314[05-9])\d{3}|(?:2(?:1(?:160|962)|3(?:2\d\d|3(?:[03467]\d|1[0-35-9]|2[1-9]|5[0-24-9]|8[0-3])|600)|646[59])|80[1-9]\d\d|9(?:3(?:[0-57-9]\d\d|6(?:0[02-9]|[1-9]\d))|6(?:[0-8]\d\d|9(?:[02-79]\d|1[05-9]))|7[1-9]\d\d|9(?:[03-9]\d\d|1(?:[0235-9]\d|4[0-24-9])|2(?:[0-79]\d|8[0-46-9]))))\d{4}|(?:22|3[2-5]|[47][1-35]|5[1-3578]|6[13-57]|8[1-9]|9[2458])\d{7}') - ->setExampleNumber('221234567') + ->setNationalNumberPattern('2(?:1982[0-6]|3314[05-9])\d{3}|(?:2(?:1(?:160|962)|3(?:(?:[24]\d|50)\d|3(?:[034679]\d|1[0-35-9]|2[1-9]|5[0-24-9]|8[0-389])|600)|646[59])|(?:600|80[1-9])\d\d|9(?:(?:10[0-2]|7[1-9]\d)\d|3(?:[0-57-9]\d\d|6(?:0[02-9]|[1-9]\d))|6(?:[0-8]\d\d|9(?:[02-79]\d|1[05-9]))|9(?:[03-9]\d\d|1(?:[0235-9]\d|4[0-24-9])|2(?:[0-79]\d|8[0-46-9]))))\d{4}|(?:22|3[2-5]|[47][1-35]|5[1-3578]|6[13-57]|8[1-9]|9[2458])\d{7}') + ->setExampleNumber('600123456') ->setPossibleLength([9]); $this->numberFormat = [ (new NumberFormat()) @@ -53,6 +52,11 @@ public function __construct() ->setLeadingDigitsPattern(['219', '2196']) ->setNationalPrefixFormattingRule('($1)') ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{3})(\d{3})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['60|809']) + ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{4})') ->setFormat('$1 $2 $3') @@ -67,12 +71,12 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d)(\d{4})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['9[2-9]']) + ->setLeadingDigitsPattern(['9(?:10|[2-9])']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['3[2-5]|[47]|5[1-3578]|6[13-57]|8(?:0[1-9]|[1-9])']) + ->setLeadingDigitsPattern(['3[2-5]|[47]|5[1-3578]|6[13-57]|8(?:0[1-8]|[1-9])']) ->setNationalPrefixFormattingRule('($1)') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) @@ -117,6 +121,11 @@ public function __construct() ->setLeadingDigitsPattern(['219', '2196']) ->setNationalPrefixFormattingRule('($1)') ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{3})(\d{3})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['60|809']) + ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{4})') ->setFormat('$1 $2 $3') @@ -131,12 +140,12 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d)(\d{4})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['9[2-9]']) + ->setLeadingDigitsPattern(['9(?:10|[2-9])']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['3[2-5]|[47]|5[1-3578]|6[13-57]|8(?:0[1-9]|[1-9])']) + ->setLeadingDigitsPattern(['3[2-5]|[47]|5[1-3578]|6[13-57]|8(?:0[1-8]|[1-9])']) ->setNationalPrefixFormattingRule('($1)') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CM.php index 0f22cec28..566a27790 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CM.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CM.php @@ -32,7 +32,7 @@ public function __construct() ->setNationalNumberPattern('[26]\d{8}|88\d{6,7}') ->setPossibleLength([8, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:24[23]|6(?:[25-9]\d|40))\d{6}') + ->setNationalNumberPattern('(?:24[23]|6(?:[25-9]\d|4[0-2]))\d{6}') ->setExampleNumber('671234567') ->setPossibleLength([9]); $this->premiumRate = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CN.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CN.php index a6089d65d..7bf41dfd9 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CN.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CN.php @@ -35,7 +35,7 @@ public function __construct() ->setPossibleLengthLocalOnly([5, 6]) ->setPossibleLength([7, 8, 9, 10, 11, 12]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1740[0-5]\d{6}|1(?:[38]\d|4[57]|[59][0-35-9]|6[25-7]|7[0-35-8])\d{8}') + ->setNationalNumberPattern('1(?:610\d|740[0-5])\d{6}|1(?:[38]\d|4[57]|[59][0-35-9]|6[25-7]|7[0-35-8])\d{8}') ->setExampleNumber('13123456789') ->setPossibleLength([11]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CX.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CX.php index eab94d4ac..533232ace 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CX.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CX.php @@ -34,7 +34,7 @@ public function __construct() ->setNationalNumberPattern('1(?:[0-79]\d{8}(?:\d{2})?|8[0-24-9]\d{7})|[148]\d{8}|1\d{5,7}') ->setPossibleLength([6, 7, 8, 9, 10, 12]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('4(?:79[01]|83[0-389]|94[0-478])\d{5}|4(?:[0-36]\d|4[047-9]|5[0-25-9]|7[02-8]|8[0-24-9]|9[0-37-9])\d{6}') + ->setNationalNumberPattern('4(?:79[01]|83[0-36-9]|95[0-3])\d{5}|4(?:[0-36]\d|4[047-9]|[58][0-24-9]|7[02-8]|9[0-47-9])\d{6}') ->setExampleNumber('412345678') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CZ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CZ.php index e68c16d38..10dd5eb3b 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CZ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CZ.php @@ -32,7 +32,7 @@ public function __construct() ->setNationalNumberPattern('(?:[2-578]\d|60)\d{7}|9\d{8,11}') ->setPossibleLength([9, 10, 11, 12]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:60[1-8]\d|7(?:0(?:[2-5]\d|60)|19[0-4]|[2379]\d\d))\d{5}') + ->setNationalNumberPattern('7060\d{5}|(?:60[1-8]|7(?:0[2-5]|19|[2379]\d))\d{6}') ->setExampleNumber('601123456') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) 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 142346ed1..e6ae52be5 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DE.php @@ -35,7 +35,7 @@ public function __construct() ->setPossibleLengthLocalOnly([2, 3]) ->setPossibleLength([4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('15310\d{6}|1(?:5[0-25-9]\d|7[013-5])\d{7}|1(?:6[023]|7[26-9])\d{7,8}') + ->setNationalNumberPattern('1(?:6[023]|7\d)\d{7,8}|15(?:[0-25-9]\d\d|3(?:10|33))\d{6}') ->setExampleNumber('15123456789') ->setPossibleLength([10, 11]); $this->premiumRate = (new PhoneNumberDesc()) @@ -54,6 +54,11 @@ public function __construct() ->setLeadingDigitsPattern(['3[02]|40|[68]9']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{6})') + ->setFormat('$1') + ->setLeadingDigitsPattern(['227', '2277']) + ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{3})(\d{3,12})') ->setFormat('$1 $2') @@ -135,7 +140,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{5})(\d{6})') ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['15[03568]', '15(?:[0568]|31)']) + ->setLeadingDigitsPattern(['15[03568]', '15(?:[0568]|3[13])']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) @@ -189,5 +194,121 @@ public function __construct() ->setExampleNumber('177991234567') ->setPossibleLength([12, 13]); $this->noInternationalDialling = PhoneNumberDesc::empty(); + $this->intlNumberFormat = [ + (new NumberFormat()) + ->setPattern('(\d{2})(\d{3,13})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['3[02]|40|[68]9']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{3,12})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern([ + '2(?:0[1-389]|1[124]|2[18]|3[14])|3(?:[35-9][15]|4[015])|906|(?:2[4-9]|4[2-9]|[579][1-9]|[68][1-8])1', + '2(?:0[1-389]|12[0-8])|3(?:[35-9][15]|4[015])|906|2(?:[13][14]|2[18])|(?:2[4-9]|4[2-9]|[579][1-9]|[68][1-8])1', + ]) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{4})(\d{2,11})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern([ + '[24-6]|3(?:[3569][02-46-9]|4[2-4679]|7[2-467]|8[2-46-8])|70[2-8]|8(?:0[2-9]|[1-8])|90[7-9]|[79][1-9]', + '[24-6]|3(?:3(?:0[1-467]|2[127-9]|3[124578]|7[1257-9]|8[1256]|9[145])|4(?:2[135]|4[13578]|9[1346])|5(?:0[14]|2[1-3589]|6[1-4]|7[13468]|8[13568])|6(?:2[1-489]|3[124-6]|6[13]|7[12579]|8[1-356]|9[135])|7(?:2[1-7]|4[145]|6[1-5]|7[1-4])|8(?:21|3[1468]|6|7[1467]|8[136])|9(?:0[12479]|2[1358]|4[134679]|6[1-9]|7[136]|8[147]|9[1468]))|70[2-8]|8(?:0[2-9]|[1-8])|90[7-9]|[79][1-9]|3[68]4[1347]|3(?:47|60)[1356]|3(?:3[46]|46|5[49])[1246]|3[4579]3[1357]', + ]) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{4})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['138']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{5})(\d{2,10})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['3']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{5,11})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['181']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d)(\d{4,10})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['1(?:3|80)|9']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{7,8})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['1[67]']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{7,12})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['8']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{5})(\d{6})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['185', '1850', '18500']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{4})(\d{4})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['7']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{4})(\d{7})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['18[68]']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{4})(\d{7})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['15[1279]']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{5})(\d{6})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['15[03568]', '15(?:[0568]|3[13])']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{8})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['18']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{2})(\d{7,8})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['1(?:6[023]|7)']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{4})(\d{2})(\d{7})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['15[279]']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{2})(\d{8})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['15']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + ]; } } diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DM.php index 58f2cc880..a6d023dc2 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DM.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DM.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DO.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DO.php index 52d76a27a..282b23ae0 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DO.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DO.php @@ -46,11 +46,11 @@ public function __construct() ->setExampleNumber('8092345678') ->setPossibleLengthLocalOnly([7]); $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('8(?:00(?:14|[2-9]\d)|(?:33|44|55|66|77|88)[2-9]\d)\d{5}') + ->setNationalNumberPattern('800(?:14|[2-9]\d)\d{5}|8[024]9[01]\d{6}|8(?:33|44|55|66|77|88)[2-9]\d{6}') ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DZ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DZ.php index 8eeb938a0..2260ab74f 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DZ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DZ.php @@ -33,7 +33,7 @@ public function __construct() ->setNationalNumberPattern('(?:[1-4]|[5-79]\d|80)\d{7}') ->setPossibleLength([8, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:5(?:4[0-29]|5\d|6[0-3])|6(?:[569]\d|7[0-6])|7[7-9]\d)\d{6}') + ->setNationalNumberPattern('5(?:4[0-29]|6[0-4])\d{6}|(?:55|6\d|7[7-9])\d{7}') ->setExampleNumber('551234567') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) @@ -41,7 +41,7 @@ public function __construct() ->setExampleNumber('808123456') ->setPossibleLength([9]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('9619\d{5}|(?:1\d|2[013-79]|3[0-8]|4[013-689])\d{6}') + ->setNationalNumberPattern('9619\d{5}|(?:[1-3]\d|4[013-689])\d{6}') ->setExampleNumber('12345678'); $this->numberFormat = [ (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_EE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_EE.php index 5da790264..30aacbb67 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_EE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_EE.php @@ -32,7 +32,7 @@ public function __construct() ->setNationalNumberPattern('8\d{9}|[4578]\d{7}|(?:[3-8]\d|90)\d{5}') ->setPossibleLength([7, 8, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:5\d{5}|8(?:1(?:0(?:0(?:00|[178]\d)|[3-9]\d\d)|(?:1(?:0[2-6]|1\d)|(?:2[0-59]|[3-79]\d)\d)\d)|2(?:0(?:0(?:00|4\d)|(?:19|[2-7]\d)\d)|(?:(?:[124-69]\d|3[5-9])\d|7(?:[0-79]\d|8[13-9])|8(?:[2-6]\d|7[01]))\d)|[349]\d{4}))\d\d|5(?:(?:[02]\d|5[0-478])\d|1(?:[0-8]\d|95)|6(?:4[0-4]|5[1-589]))\d{3}') + ->setNationalNumberPattern('(?:5\d{5}|8(?:1(?:0(?:0(?:00|[178]\d)|[3-9]\d\d)|(?:1(?:0[2-6]|1\d)|[2-79]\d\d)\d)|2(?:0(?:0(?:00|4\d)|(?:19|[2-7]\d)\d)|(?:(?:[124-69]\d|3[5-9])\d|7(?:[0-79]\d|8[013-9])|8(?:[2-6]\d|7[01]))\d)|[349]\d{4}))\d\d|5(?:(?:[02]\d|5[0-478])\d|1(?:[0-8]\d|95)|6(?:4[0-4]|5[1-589]))\d{3}') ->setExampleNumber('51234567') ->setPossibleLength([7, 8]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_EH.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_EH.php index bcfa92891..6a3a067e7 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_EH.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_EH.php @@ -21,7 +21,6 @@ class PhoneNumberMetadata_EH extends PhoneMetadata { protected const ID = 'EH'; protected const COUNTRY_CODE = 212; - protected const LEADING_DIGITS = '528[89]'; protected const NATIONAL_PREFIX = '0'; protected ?string $nationalPrefixForParsing = '0'; @@ -33,7 +32,7 @@ public function __construct() ->setNationalNumberPattern('[5-8]\d{8}') ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:6(?:[0-79]\d|8[0-247-9])|7(?:[0167]\d|2[0-8]|5[0-3]|8[0-7]))\d{6}') + ->setNationalNumberPattern('(?:6(?:[0-79]\d|8[0-247-9])|7(?:[016-8]\d|2[0-8]|3[01]|5[0-5]))\d{6}') ->setExampleNumber('650123456'); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('89\d{7}') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ES.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ES.php index 4624fd01e..c99fedc1b 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ES.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ES.php @@ -29,16 +29,16 @@ class PhoneNumberMetadata_ES extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[5-9]\d{8}') + ->setNationalNumberPattern('(?:400|[5-9]\d\d)\d{6}') ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:590[16]00\d|9(?:6906(?:09|10)|7390\d\d))\d\d|(?:6\d|7[1-48])\d{7}') + ->setNationalNumberPattern('96906(?:09|10)\d\d|(?:590(?:10[0-2]|600)|97390\d)\d{3}|(?:6\d|7[1-48])\d{7}') ->setExampleNumber('612345678'); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('80[367]\d{6}') ->setExampleNumber('803123456'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('96906(?:0[0-8]|1[1-9]|[2-9]\d)\d\d|9(?:69(?:0[0-57-9]|[1-9]\d)|73(?:[0-8]\d|9[1-9]))\d{4}|(?:8(?:[1356]\d|[28][0-8]|[47][1-9])|9(?:[135]\d|[268][0-8]|4[1-9]|7[124-9]))\d{6}') + ->setNationalNumberPattern('96906(?:0[0-8]|1[1-9]|[2-9]\d)\d\d|9(?:69(?:0[0-57-9]|[1-9]\d)|73(?:[0-8]\d|9[1-9]))\d{4}|(?:400|8(?:[1356]\d|[28][0-8]|[47][1-9])|9(?:[135]\d|[268][0-8]|4[1-9]|7[124-9]))\d{6}') ->setExampleNumber('810123456'); $this->numberFormat = [ (new NumberFormat()) @@ -59,7 +59,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{3})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['[5-9]']) + ->setLeadingDigitsPattern(['[4-9]']) ->setNationalPrefixOptionalWhenFormatting(false), ]; $this->tollFree = (new PhoneNumberDesc()) @@ -87,7 +87,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{3})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['[5-9]']) + ->setLeadingDigitsPattern(['[4-9]']) ->setNationalPrefixOptionalWhenFormatting(false), ]; } diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ET.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ET.php index 701ad1e4b..249c726de 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ET.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ET.php @@ -30,22 +30,22 @@ class PhoneNumberMetadata_ET extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:11|[2-579]\d)\d{7}') + ->setNationalNumberPattern('(?:11|[2-57-9]\d)\d{7}') ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('700[1-9]\d{5}|(?:7(?:0[1-9]|1[0-8]|22|77|86|99)|9\d\d)\d{6}') + ->setNationalNumberPattern('700[1-9]\d{5}|(?:7(?:0[1-9]|1[0-8]|2[1-35-79]|3\d|77|86|99)|(?:8[01]|9\d)\d)\d{6}') ->setExampleNumber('911234567'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('11667[01]\d{3}|(?:11(?:1(?:1[124]|2[2-7]|3[1-5]|5[5-8]|8[6-8])|2(?:13|3[6-8]|5[89]|7[05-9]|8[2-6])|3(?:2[01]|3[0-289]|4[1289]|7[1-4]|87)|4(?:1[69]|3[2-49]|4[0-3]|6[5-8]|7\d)|5(?:1[578]|44|5[0-4])|6(?:1[578]|2[69]|39|4[5-7]|5[0-5]|6[0-59]|8[015-8]))|2(?:2(?:11[1-9]|22[0-7]|33\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|(?:22|55)[0-6]|33[0134689]|44[04]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:119|22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:(?:11|22)[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\d)))\d{4}') + ->setNationalNumberPattern('(?:11(?:[124]\d\d|3(?:[0-79]\d|8[0-7])|5(?:[02-9]\d|1[0-57-9])|6(?:[02-79]\d|1[0-57-9]|8[0-8]))|2(?:2(?:11[1-9]|22[0-7]|33\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|(?:22|55)[0-6]|33[0134689]|44[04]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:119|22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:(?:11|22)[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\d)))\d{4}') ->setExampleNumber('111112345') ->setPossibleLengthLocalOnly([7]); $this->numberFormat = [ (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[1-579]']) + ->setLeadingDigitsPattern(['[1-57-9]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), ]; diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_FO.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_FO.php index 21a99d75c..6f49e19b3 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_FO.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_FO.php @@ -42,8 +42,8 @@ public function __construct() ->setExampleNumber('201234'); $this->numberFormat = [ (new NumberFormat()) - ->setPattern('(\d{6})') - ->setFormat('$1') + ->setPattern('(\d{2})(\d{2})(\d{2})') + ->setFormat('$1 $2 $3') ->setLeadingDigitsPattern(['[2-9]']) ->setDomesticCarrierCodeFormattingRule('$CC $1') ->setNationalPrefixOptionalWhenFormatting(false), @@ -54,7 +54,7 @@ public function __construct() $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = PhoneNumberDesc::empty(); $this->voip = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:6[0-36]|88)\d{4}') + ->setNationalNumberPattern('6[0-36]\d{4}') ->setExampleNumber('601234'); $this->pager = PhoneNumberDesc::empty(); $this->uan = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GB.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GB.php index 235947a81..d86d5f2e0 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GB.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GB.php @@ -24,7 +24,7 @@ class PhoneNumberMetadata_GB extends PhoneMetadata protected const COUNTRY_CODE = 44; protected const NATIONAL_PREFIX = '0'; - protected ?string $nationalPrefixForParsing = '0'; + protected ?string $nationalPrefixForParsing = '0|180020'; protected ?string $internationalPrefix = '00'; protected ?string $preferredExtnPrefix = ' x'; protected bool $mainCountryForCode = true; @@ -45,7 +45,7 @@ public function __construct() ->setExampleNumber('9012345678') ->setPossibleLength([7, 10]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:1(?:1(?:3(?:[0-58]\d\d|73[0-35])|4(?:(?:[0-5]\d|70)\d|69[7-9])|(?:(?:5[0-26-9]|[78][0-49])\d|6(?:[0-4]\d|50))\d)|(?:2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\d)\d|1(?:[0-7]\d|8[0-3]))|(?:3(?:0\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\d)\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\d{3})\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\d)|76\d)|6(?:26[06-9]|686))|6(?:06(?:4\d|7[4-79])|295[5-7]|35[34]\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\d{3}') + ->setNationalNumberPattern('(?:1(?:1(?:3(?:[0-58]\d\d|73[0-5])|4(?:(?:[0-5]\d|70)\d|69[7-9])|(?:(?:5[0-26-9]|[78][0-49])\d|6(?:[0-4]\d|5[01]))\d)|(?:2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\d)\d|1(?:[0-7]\d|8[0-3]))|(?:3(?:0\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\d)\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\d{3})\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\d)|76\d)|6(?:26[06-9]|686))|6(?:06(?:4\d|7[4-79])|295[5-7]|35[34]\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\d{3}') ->setExampleNumber('1212345678') ->setPossibleLengthLocalOnly([4, 5, 6, 7, 8]) ->setPossibleLength([9, 10]); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GD.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GD.php index 4866112e1..d1bccd48a 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GD.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GD.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); 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 2dd0265ab..1077a5449 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GE.php @@ -35,7 +35,7 @@ public function __construct() ->setPossibleLengthLocalOnly([6, 7]) ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('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])|(?:[14]\d|77)\d|22[02])|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|333|444)|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}') + ->setNationalNumberPattern('5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\d|22252[0-4])\d\d|5(?:0(?:0(?:1[09]|70)|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|4(?:0[04]0|411)|5222|9000)[0-4]\d{3}|(?:5(?:0(?:0(?:0\d|1[12]|2[02]|3[0-6]|4[04]|5[05]|77|88|9[09])|(?:[14]\d|77)\d|22[02])|1(?:1(?:[03][01]|[124]\d|5[02-6]|7[0-6])|4\d\d)|2(?:228|555)|3555|4(?:4(?:[02-9]\d|14)|555)|5(?:[0157-9]\d\d|200|333|4(?:44|55))|6[89]\d\d|7(?:(?:[0147-9]\d|22)\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}') ->setExampleNumber('555123456'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GF.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GF.php index 9b0d0e705..4c2ad02f0 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GF.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GF.php @@ -31,20 +31,22 @@ class PhoneNumberMetadata_GF extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[56]94\d|7093)\d{5}|(?:80|9\d)\d{7}') + ->setNationalNumberPattern('(?:694\d|7093)\d{5}|(?:59|[89]\d)\d{7}') ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) ->setNationalNumberPattern('(?:694(?:[0-249]\d|3[0-8])|7093[0-3])\d{4}') ->setExampleNumber('694201234'); - $this->premiumRate = PhoneNumberDesc::empty(); + $this->premiumRate = (new PhoneNumberDesc()) + ->setNationalNumberPattern('8[129]\d{7}') + ->setExampleNumber('890123456'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('594(?:[02-49]\d|1[0-5]|5[6-9]|6[0-3]|80)\d{4}') + ->setNationalNumberPattern('(?:59(?:4(?:[02-49]\d|1[0-5]|5[6-9]|6[0-3]|80)|88\d)|80[6-9]\d\d)\d{4}') ->setExampleNumber('594101234'); $this->numberFormat = [ (new NumberFormat()) ->setPattern('(\d{3})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['[5-7]|9[47]']) + ->setLeadingDigitsPattern(['[5-7]|80[6-9]|9[47]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GG.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GG.php index 67cbe6124..aa7ade637 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GG.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GG.php @@ -23,7 +23,7 @@ class PhoneNumberMetadata_GG extends PhoneMetadata protected const COUNTRY_CODE = 44; protected const NATIONAL_PREFIX = '0'; - protected ?string $nationalPrefixForParsing = '([25-9]\d{5})$|0'; + protected ?string $nationalPrefixForParsing = '([25-9]\d{5})$|0|180020'; protected ?string $internationalPrefix = '00'; protected ?string $nationalPrefixTransformRule = '1481$1'; diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GH.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GH.php index 24c508d33..2ff6aa801 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GH.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GH.php @@ -31,7 +31,7 @@ class PhoneNumberMetadata_GH extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[235]\d{3}|800)\d{5}') + ->setNationalNumberPattern('[235]\d{8}|800\d{5,6}') ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([8, 9]); $this->mobile = (new PhoneNumberDesc()) @@ -59,14 +59,13 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[235]']) + ->setLeadingDigitsPattern(['[2358]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), ]; $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('800\d{5}') - ->setExampleNumber('80012345') - ->setPossibleLength([8]); + ->setNationalNumberPattern('800\d{5,6}') + ->setExampleNumber('80012345'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = PhoneNumberDesc::empty(); $this->voip = PhoneNumberDesc::empty(); @@ -74,8 +73,7 @@ public function __construct() $this->uan = PhoneNumberDesc::empty(); $this->voicemail = PhoneNumberDesc::empty(); $this->noInternationalDialling = (new PhoneNumberDesc()) - ->setNationalNumberPattern('800\d{5}') - ->setPossibleLength([8]); + ->setNationalNumberPattern('800\d{5,6}'); $this->intlNumberFormat = [ (new NumberFormat()) ->setPattern('(\d{3})(\d{5})') @@ -86,7 +84,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[235]']) + ->setLeadingDigitsPattern(['[2358]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), ]; diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GM.php index d33fa65ae..712cab83f 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GM.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GM.php @@ -31,11 +31,11 @@ public function __construct() ->setNationalNumberPattern('[2-9]\d{6}') ->setPossibleLength([7]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('556\d{4}|(?:[23679]\d|4[015]|5[0-489])\d{5}') + ->setNationalNumberPattern('556\d{4}|(?:[23679]\d|4[015]|5[0-489]|8[4-7])\d{5}') ->setExampleNumber('3012345'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:4(?:[23]\d\d|4(?:1[024679]|[6-9]\d))|5(?:5(?:3\d|4[0-7])|6[67]\d|7(?:1[04]|2[035]|3[58]|48))|8\d{3})\d{3}') + ->setNationalNumberPattern('(?:4(?:[23]\d\d|4(?:1[024679]|[6-9]\d))|5(?:5(?:3\d|4[0-7])|6[67]\d|7(?:1[04]|2[035]|3[58]|48))|8[0-389]\d\d)\d{3}') ->setExampleNumber('5661234'); $this->numberFormat = [ (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GP.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GP.php index fbeb05542..c53c6a10a 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GP.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GP.php @@ -32,20 +32,22 @@ class PhoneNumberMetadata_GP extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:590\d|7090)\d{5}|(?:69|80|9\d)\d{7}') + ->setNationalNumberPattern('7090\d{5}|(?:[56]9|[89]\d)\d{7}') ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:69(?:0\d\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\d)|6(?:1[016-9]|5[0-4]|[67]\d))|7090[0-4])\d{4}') + ->setNationalNumberPattern('(?:69(?:0\d\d|1(?:2[2-9]|3[0-5]))|7090[0-4])\d{4}') ->setExampleNumber('690001234'); - $this->premiumRate = PhoneNumberDesc::empty(); + $this->premiumRate = (new PhoneNumberDesc()) + ->setNationalNumberPattern('8[129]\d{7}') + ->setExampleNumber('810123456'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('590(?:0[1-68]|[14][0-24-9]|2[0-68]|3[1-9]|5[3-579]|[68][0-689]|7[08]|9\d)\d{4}') + ->setNationalNumberPattern('(?:59(?:0(?:0[1-68]|[14][0-24-9]|2[0-68]|3[1-9]|5[3-579]|[68][0-689]|7[08]|9\d)|87\d)|80[6-9]\d\d)\d{4}') ->setExampleNumber('590201234'); $this->numberFormat = [ (new NumberFormat()) ->setPattern('(\d{3})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['[5-79]']) + ->setLeadingDigitsPattern(['[5-79]|80[6-9]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GU.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GU.php index a3690fdd6..bccd15ecf 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GU.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GU.php @@ -36,14 +36,14 @@ public function __construct() ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('671(?:2\d\d|3(?:00|3[39]|4[349]|55|6[26])|4(?:00|56|7[1-9]|8[02-9])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[235-9])|7(?:[0479]7|2[0167]|3[45]|8[7-9])|8(?:[2-57-9]8|6[478])|9(?:2[29]|6[79]|7[1279]|8[7-9]|9[78]))\d{4}') + ->setNationalNumberPattern('671(?:2\d\d|3(?:00|3[39]|4[349]|55|6[26])|4(?:00|56|7[1-9]|8[02-9])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[235-9])|7(?:[0479]7|2[0167]|3[45]|8[7-9])|8(?:[2-57-9]8|6[478])|9(?:2[29]|6[79]|7[1279]|8[7-9]|9[16-9]))\d{4}') ->setExampleNumber('6713001234') ->setPossibleLengthLocalOnly([7]); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('900[2-9]\d{6}') ->setExampleNumber('9002123456'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('671(?:2\d\d|3(?:00|3[39]|4[349]|55|6[26])|4(?:00|56|7[1-9]|8[02-9])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[235-9])|7(?:[0479]7|2[0167]|3[45]|8[7-9])|8(?:[2-57-9]8|6[478])|9(?:2[29]|6[79]|7[1279]|8[7-9]|9[78]))\d{4}') + ->setNationalNumberPattern('671(?:2\d\d|3(?:00|3[39]|4[349]|55|6[26])|4(?:00|56|7[1-9]|8[02-9])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[235-9])|7(?:[0479]7|2[0167]|3[45]|8[7-9])|8(?:[2-57-9]8|6[478])|9(?:2[29]|6[79]|7[1279]|8[7-9]|9[16-9]))\d{4}') ->setExampleNumber('6713001234') ->setPossibleLengthLocalOnly([7]); $this->tollFree = (new PhoneNumberDesc()) @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GY.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GY.php index beee9a487..5dad2a34c 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GY.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GY.php @@ -31,7 +31,7 @@ public function __construct() ->setNationalNumberPattern('(?:[2-8]\d{3}|9008)\d{3}') ->setPossibleLength([7]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:510|6\d\d|7(?:[0-5]\d|6[019]|70))\d{4}') + ->setNationalNumberPattern('(?:51[01]|6\d\d|7(?:[0-5]\d|6[0-79]|[78]0))\d{4}') ->setExampleNumber('6091234'); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('9008\d{3}') 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 ef6d7cf46..189fa1e10 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HK.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HK.php @@ -33,7 +33,7 @@ public function __construct() ->setNationalNumberPattern('8[0-46-9]\d{6,7}|9\d{4,7}|(?:[2-7]|9\d{3})\d{7}') ->setPossibleLength([5, 6, 7, 8, 9, 11]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:4(?:44[0-35-9]|6(?:4[0-57-9]|6[0-4])|7(?:3[0-4]|4[0-48]|6[0-5]))|5(?:35[4-8]|73[0-6]|95[0-8])|6(?:26[013-8]|(?:66|78)[0-5])|70(?:7[1-8]|8[0-8])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[014-9]|59[0-4]|899))\d{4}|(?:4(?:4[0-35-9]|6[0-357-9]|7[0-25])|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-59]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\d))\d{5}') + ->setNationalNumberPattern('(?:4(?:(?:09|24)[3-6]|44[0-35-9]|6(?:4[0-57-9]|6[0-6])|7(?:4[0-48]|6[0-5]))|5(?:25[3-7]|35[4-8]|73[0-6]|95[0-8])|6(?:26[013-8]|(?:66|78)[0-5])|70(?:7[1-8]|8[0-8])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[014-9]|59[0-467]|899))\d{4}|(?:4(?:4[0-35-9]|6[0-357-9]|7[0-35])|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-59]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\d))\d{5}') ->setExampleNumber('51234567') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HN.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HN.php index e9d8a0d0b..2fa5b3a32 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HN.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HN.php @@ -36,7 +36,7 @@ public function __construct() ->setPossibleLength([8]); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('2(?:2(?:0[0-59]|1[1-9]|[23]\d|4[02-7]|5[57]|6[245]|7[0135689]|8[01346-9]|9[0-2])|4(?:0[578]|2[3-59]|3[13-9]|4[0-68]|5[1-3589])|5(?:0[2357-9]|1[1-356]|4[03-5]|5\d|6[014-69]|7[04]|80)|6(?:[056]\d|17|2[067]|3[047]|4[0-378]|[78][0-8]|9[01])|7(?:0[5-79]|6[46-9]|7[02-9]|8[034]|91)|8(?:79|8[0-357-9]|9[1-57-9]))\d{4}') + ->setNationalNumberPattern('2(?:2(?:0[0-59]|1[1-9]|[23]\d|4[02-8]|5[57]|6[2458]|7[0135689]|8[01346-9]|9[0-2])|4(?:0[578]|2[3-59]|3[13-9]|4[0-68]|5[1-3589]|80)|5(?:0[2357-9]|1[1-6]|4[03-58]|5\d|6[014-69]|7[04]|80)|6(?:[056]\d|17|2[067]|3[047]|4[0-378]|[78][0-8]|9[01])|7(?:0[5-79]|2[01]|6[46-9]|7[02-9]|8[034]|91)|8(?:79|8[0-357-9]|9[1-57-9]))\d{4}') ->setExampleNumber('22123456') ->setPossibleLength([8]); $this->numberFormat = [ diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HT.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HT.php index 067ff2abc..ca0d64e39 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HT.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HT.php @@ -31,7 +31,7 @@ public function __construct() ->setNationalNumberPattern('[2-589]\d{7}') ->setPossibleLength([8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[34]\d|5[56])\d{6}') + ->setNationalNumberPattern('(?:[34]\d|5[568])\d{6}') ->setExampleNumber('34101234'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IL.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IL.php index af8e8fca3..3087167fb 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IL.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IL.php @@ -34,11 +34,11 @@ public function __construct() ->setNationalNumberPattern('1\d{6}(?:\d{3,5})?|[57]\d{8}|[1-489]\d{7}') ->setPossibleLength([7, 8, 9, 10, 11, 12]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('55(?:4(?:[01]0|5[0-2])|57[0-289])\d{4}|5(?:(?:[0-2][02-9]|[36]\d|[49][2-9]|8[3-7])\d|5(?:01|2\d|3[0-3]|4[34]|5[0-25689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\d{5}') + ->setNationalNumberPattern('55(?:4(?:0[0-3]|10|6[015-9])|57[0-289]|8[06][0-2])\d{4}|5(?:(?:[0-2][02-9]|[36]\d|[49][2-9]|8[3-7])\d|5(?:01|2\d|3[0-3]|4[3-5]|5[0-25689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\d{5}') ->setExampleNumber('502345678') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1212\d{4}|1(?:200|9(?:0[0-2]|19))\d{6}') + ->setNationalNumberPattern('1212\d{4}|1(?:200|9(?:0[0-2]|19|9\d))\d{6}') ->setExampleNumber('1919123456') ->setPossibleLength([8, 10]); $this->fixedLine = (new PhoneNumberDesc()) @@ -100,7 +100,7 @@ public function __construct() ->setPossibleLength([10]); $this->personalNumber = PhoneNumberDesc::empty(); $this->voip = (new PhoneNumberDesc()) - ->setNationalNumberPattern('7(?:38(?:[05]\d|8[08])|8(?:33|55|77|81)\d)\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\d|82|9[2-9])\d{6}') + ->setNationalNumberPattern('7(?:280[01]|38(?:[05]\d|8[01358])|8(?:33|55|77|81)\d)\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\d|82|9[2-9])\d{6}') ->setExampleNumber('771234567') ->setPossibleLength([9]); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IM.php index b5f9a67eb..301c6b08f 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IM.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IM.php @@ -24,7 +24,7 @@ class PhoneNumberMetadata_IM extends PhoneMetadata protected const LEADING_DIGITS = '74576|(?:16|7[56])24'; protected const NATIONAL_PREFIX = '0'; - protected ?string $nationalPrefixForParsing = '([25-8]\d{5})$|0'; + protected ?string $nationalPrefixForParsing = '([25-8]\d{5})$|0|180020'; protected ?string $internationalPrefix = '00'; protected ?string $nationalPrefixTransformRule = '1624$1'; diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IN.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IN.php index d6d63a70e..13ded5474 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IN.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IN.php @@ -35,7 +35,7 @@ public function __construct() ->setPossibleLengthLocalOnly([6, 7]) ->setPossibleLength([8, 9, 10, 11, 12, 13]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:61279|7(?:887[02-9]|9(?:313|79[07-9]))|8(?:079[04-9]|(?:84|91)7[02-8]))\d{5}|(?:6(?:12|[2-47]1|5[17]|6[13]|80)[0189]|7(?:1(?:2[0189]|9[0-5])|2(?:[14][017-9]|8[0-59])|3(?:2[5-8]|[34][017-9]|9[016-9])|4(?:1[015-9]|[29][89]|39|8[389])|5(?:[15][017-9]|2[04-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589])|70[0289]|88[089]|97[02-8])|8(?:0(?:6[67]|7[02-8])|70[017-9]|84[01489]|91[0-289]))\d{6}|(?:7(?:31|4[47])|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[0189]\d|7[02-8])\d{5}|(?:6(?:[09]\d|1[04679]|2[03689]|3[05-9]|4[0489]|50|6[069]|7[07]|8[7-9])|7(?:0\d|2[0235-79]|3[05-8]|40|5[0346-8]|6[6-9]|7[1-9]|8[0-79]|9[089])|8(?:0[01589]|1[0-57-9]|2[235-9]|3[03-57-9]|[45]\d|6[02457-9]|7[1-69]|8[0-25-9]|9[02-9])|9\d\d)\d{7}|(?:6(?:(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|8[124-6])\d|7(?:[235689]\d|4[0189]))|7(?:1(?:[013-8]\d|9[6-9])|28[6-8]|3(?:2[0-49]|9[2-5])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]\d|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\d|5[0-367])|70[13-7]|881))[0189]\d{5}') + ->setNationalNumberPattern('(?:6(?:1279|828[01489])|7(?:887[02-9]|9(?:313|79[07-9]))|8(?:079[04-9]|(?:84|91)7[02-8]))\d{5}|(?:160[01]|6(?:(?:12|[2-4]1|5[17]|6[13]|80)[0189]|7(?:1[0189]|86))|7(?:1(?:2[0189]|9[0-5])|3(?:2[5-8]|[34][017-9]|9[016-9])|5(?:[15][017-9]|2[04-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589])|70[0289]|88[089]|97[02-8])|8(?:0(?:6[67]|7[02-8])|70[017-9]|84[01489]|91[0-289]))\d{6}|(?:731|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[0189]\d|7[02-8])\d{5}|(?:6(?:(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578])\d|7(?:[23569]\d|4[0189]|8[0-57-9])|8(?:[14-6]\d|2[0-79]))|7(?:1(?:[013-8]\d|9[6-9])|3(?:2[0-49]|9[2-5])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\d|5[0-367])|70[13-7]|881))[0189]\d{5}|(?:6(?:[09]\d|1[04679]|2[03689]|3[05-9]|4[0489]|50|6[069]|7[07]|8[7-9])|7(?:[024]\d|3[05-8]|5[0346-8]|6[6-9]|7[1-9]|8[0-79]|9[089])|8(?:0[01589]|1[0-57-9]|2[235-9]|3[03-57-9]|[45]\d|6[02457-9]|7[1-69]|8[0-25-9]|9[02-9])|9\d\d)\d{7}') ->setExampleNumber('8123456789') ->setPossibleLength([10]); $this->premiumRate = (new PhoneNumberDesc()) @@ -43,7 +43,7 @@ public function __construct() ->setExampleNumber('1861123456789') ->setPossibleLength([13]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('2717(?:[2-7]\d|95)\d{4}|(?:271[0-689]|782[0-6])[2-7]\d{5}|(?:170[24]|2(?:(?:[02][2-79]|90)\d|80[13468])|(?:3(?:23|80)|683|79[1-7])\d|4(?:20[24]|72[2-8])|552[1-7])\d{6}|(?:11|33|4[04]|80)[2-7]\d{7}|(?:342|674|788)(?:[0189][2-7]|[2-7]\d)\d{5}|(?:1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6[014]|7[1257]|8[01346])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[13]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[014-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91))[2-7]\d{6}|(?:1(?:2[35-8]|3[346-9]|4[236-9]|[59][0235-9]|6[235-9]|7[34689]|8[257-9])|2(?:1[134689]|3[24-8]|4[2-8]|5[25689]|6[2-4679]|7[3-79]|8[2-479]|9[235-9])|3(?:01|1[79]|2[1245]|4[5-8]|5[125689]|6[235-7]|7[157-9]|8[2-46-8])|4(?:1[14578]|2[5689]|3[2-467]|5[4-7]|6[35]|73|8[2689]|9[2389])|5(?:[16][146-9]|2[14-8]|3[1346]|4[14-69]|5[46]|7[2-4]|8[2-8]|9[246])|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[124-6])|7(?:1[013-9]|2[0235-9]|3[2679]|4[1-35689]|5[2-46-9]|[67][02-9]|8[013-7]|9[089])|8(?:1[1357-9]|2[235-8]|3[03-57-9]|4[0-24-9]|5\d|6[2457-9]|7[1-6]|8[1256]|9[2-4]))\d[2-7]\d{5}') + ->setNationalNumberPattern('(?:2717(?:[2-7]\d|95)|6828[235-7]\d)\d{4}|(?:170[24]|280[13468]|4(?:20[24]|72[2-8])|552[1-7])\d{6}|(?:271[0-689]|682[0-79]|782[0-6])[2-7]\d{5}|(?:2(?:[02][2-79]|90)|3(?:23|80)|683|79[1-7])\d{7}|(?:11|33|4[04]|80)[2-7]\d{7}|(?:342|674|788)(?:[0189][2-7]|[2-7]\d)\d{5}|(?:1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6[014]|7[1257]|8[01346])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[13]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[014-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91))[2-7]\d{6}|(?:1(?:2[35-8]|3[346-9]|4[236-9]|[59][0235-9]|6[235-9]|7[34689]|8[257-9])|2(?:1[134689]|3[24-8]|4[2-8]|5[25689]|6[2-4679]|7[3-79]|8[2-479]|9[235-9])|3(?:01|1[79]|2[1245]|4[5-8]|5[125689]|6[235-7]|7[157-9]|8[2-46-8])|4(?:1[14578]|2[5689]|3[2-467]|5[4-7]|6[35]|73|8[2689]|9[2389])|5(?:[16][146-9]|2[14-8]|3[1346]|4[14-69]|5[46]|7[2-4]|8[2-8]|9[246])|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[14-6])|7(?:1[013-9]|2[0235-9]|3[2679]|4[1-35689]|5[2-46-9]|[67][02-9]|8[013-7]|9[089])|8(?:1[1357-9]|2[235-8]|3[03-57-9]|4[0-24-9]|5\d|6[2457-9]|7[1-6]|8[1256]|9[2-4]))\d[2-7]\d{5}') ->setExampleNumber('7410410123') ->setPossibleLengthLocalOnly([6, 7, 8]) ->setPossibleLength([10]); @@ -86,9 +86,9 @@ public function __construct() ->setPattern('(\d{3})(\d{3})(\d{4})') ->setFormat('$1 $2 $3') ->setLeadingDigitsPattern([ - '1(?:2[0-249]|3[0-25]|4[145]|[68]|7[1257])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1)|6(?:12|[2-4]1|5[17]|6[13]|80)|7(?:12|3[134]|4[47]|61|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)|(?:43|59|75)[15]|(?:1[59]|29|67|72)[14]', - '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|674|7(?:(?:2[14]|3[34]|5[15])[2-6]|61[346]|88[0-8])|8(?:70[2-6]|84[235-7]|91[3-7])|(?:1(?:29|60|8[06])|261|552|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|31|4[47])|8(?:16|2[014]|3[126]|6[136]|7[78]|83))[2-7]', - '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12(?:[2-6]|7[0-8])|74[2-7])|7(?:(?:2[14]|5[15])[2-6]|3171|61[346]|88(?:[2-7]|82))|8(?:70[2-6]|84(?:[2356]|7[19])|91(?:[3-6]|7[19]))|73[134][2-6]|(?:74[47]|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[2-6]|7[19])|(?:1(?:29|60|8[06])|261|552|6(?:[2-4]1|5[17]|6[13]|7(?:1|4[0189])|80)|7(?:12|88[01]))[2-7]', + '1(?:2[0-249]|3[0-25]|4[145]|[68]|7[1257])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1)|6(?:12|[2-4]1|5[17]|6[13]|80)|7(?:12|3[134]|61|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)|(?:43|59|75)[15]|(?:1[59]|29|67)[14]', + '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|674|7(?:(?:3[34]|5[15])[2-6]|61[346]|88[0-8])|8(?:70[2-6]|84[235-7]|91[3-7])|(?:1(?:29|60|8[06])|261|552|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|31)|8(?:16|2[014]|3[126]|6[136]|7[78]|83))[2-7]', + '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12(?:[2-6]|7[0-8])|74[2-7])|7(?:3171|5[15][2-6]|61[346]|88(?:[2-7]|82))|8(?:70[2-6]|84(?:[2356]|7[19])|91(?:[3-6]|7[19]))|73[134][2-6]|8(?:16|2[014]|3[126]|6[136]|7[78]|83)(?:[2-6]|7[19])|(?:1(?:29|60|8[06])|261|552|6(?:[2-4]1|5[17]|6[13]|7(?:1|4[0189])|80)|7(?:12|88[01]))[2-7]', ]) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), @@ -96,22 +96,22 @@ public function __construct() ->setPattern('(\d{4})(\d{3})(\d{3})') ->setFormat('$1 $2 $3') ->setLeadingDigitsPattern([ - '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2[2457-9]|3[2-5]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1[013-9]|28|3[129]|4[1-35689]|5[29]|6[02-5]|70)|807', - '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2(?:[2457]|84|95)|3(?:[2-4]|55)|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1(?:[013-8]|9[6-9])|28[6-8]|3(?:17|2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4|5[0-367])|70[13-7])|807[19]', - '1(?:[2-479]|5(?:[0236-9]|5[013-9]))|[2-5]|6(?:2(?:84|95)|355|83)|73179|807(?:1|9[1-3])|(?:1552|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[124-6])\d|7(?:1(?:[013-8]\d|9[6-9])|28[6-8]|3(?:2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]\d|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\d|5[0-367])|70[13-7]))[2-7]', + '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2[2457-9]|3[2-5]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1[013-9]|3[129]|5[29]|6[02-5]|70)|807', + '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2(?:[2457]|84|95)|3(?:[2-4]|55)|4[235-7]|5[2-689]|6[24578]|7(?:[23569]|8[0-57-9])|8[1-6])|7(?:1(?:[013-8]|9[6-9])|3(?:17|2[0-49]|9[2-57])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4|5[0-367])|70[13-7])|807[19]', + '1(?:[2-479]|5(?:[0236-9]|5[013-9]))|[2-5]|6(?:2(?:84|95)|355|8(?:28[235-7]|3))|73179|807(?:1|9[1-3])|(?:1552|6(?:(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578])\d|7(?:[23569]\d|8[0-57-9])|8(?:[14-6]\d|2[0-79]))|7(?:1(?:[013-8]\d|9[6-9])|3(?:2[0-49]|9[2-57])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\d|5[0-367])|70[13-7]))[2-7]', ]) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) ->setPattern('(\d{5})(\d{5})') ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['[6-9]']) + ->setLeadingDigitsPattern(['16|[6-9]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) ->setPattern('(\d{4})(\d{2,4})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['1(?:6|8[06])', '1(?:6|8[06]0)']) + ->setLeadingDigitsPattern(['18[06]', '18[06]0']) ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) ->setPattern('(\d{3})(\d{3})(\d{3})(\d{4})') @@ -125,7 +125,7 @@ public function __construct() ->setNationalPrefixOptionalWhenFormatting(true), ]; $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('000800\d{7}|1(?:600\d{6}|80(?:0\d{4,9}|3\d{9}))') + ->setNationalNumberPattern('000800\d{7}|180(?:0\d{4,9}|3\d{9})') ->setExampleNumber('1800123456'); $this->sharedCost = (new PhoneNumberDesc()) ->setNationalNumberPattern('1860\d{7}') @@ -140,7 +140,7 @@ public function __construct() ->setPossibleLength([10]); $this->voicemail = PhoneNumberDesc::empty(); $this->noInternationalDialling = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:600\d{6}|800\d{4,9})|(?:000800|18(?:03\d\d|6(?:0|[12]\d\d)))\d{7}'); + ->setNationalNumberPattern('1800\d{4,9}|(?:000800|18(?:03\d\d|6(?:0|[12]\d\d)))\d{7}'); $this->intlNumberFormat = [ (new NumberFormat()) ->setPattern('(\d{8})') @@ -175,9 +175,9 @@ public function __construct() ->setPattern('(\d{3})(\d{3})(\d{4})') ->setFormat('$1 $2 $3') ->setLeadingDigitsPattern([ - '1(?:2[0-249]|3[0-25]|4[145]|[68]|7[1257])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1)|6(?:12|[2-4]1|5[17]|6[13]|80)|7(?:12|3[134]|4[47]|61|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)|(?:43|59|75)[15]|(?:1[59]|29|67|72)[14]', - '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|674|7(?:(?:2[14]|3[34]|5[15])[2-6]|61[346]|88[0-8])|8(?:70[2-6]|84[235-7]|91[3-7])|(?:1(?:29|60|8[06])|261|552|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|31|4[47])|8(?:16|2[014]|3[126]|6[136]|7[78]|83))[2-7]', - '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12(?:[2-6]|7[0-8])|74[2-7])|7(?:(?:2[14]|5[15])[2-6]|3171|61[346]|88(?:[2-7]|82))|8(?:70[2-6]|84(?:[2356]|7[19])|91(?:[3-6]|7[19]))|73[134][2-6]|(?:74[47]|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[2-6]|7[19])|(?:1(?:29|60|8[06])|261|552|6(?:[2-4]1|5[17]|6[13]|7(?:1|4[0189])|80)|7(?:12|88[01]))[2-7]', + '1(?:2[0-249]|3[0-25]|4[145]|[68]|7[1257])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1)|6(?:12|[2-4]1|5[17]|6[13]|80)|7(?:12|3[134]|61|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)|(?:43|59|75)[15]|(?:1[59]|29|67)[14]', + '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|674|7(?:(?:3[34]|5[15])[2-6]|61[346]|88[0-8])|8(?:70[2-6]|84[235-7]|91[3-7])|(?:1(?:29|60|8[06])|261|552|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|31)|8(?:16|2[014]|3[126]|6[136]|7[78]|83))[2-7]', + '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12(?:[2-6]|7[0-8])|74[2-7])|7(?:3171|5[15][2-6]|61[346]|88(?:[2-7]|82))|8(?:70[2-6]|84(?:[2356]|7[19])|91(?:[3-6]|7[19]))|73[134][2-6]|8(?:16|2[014]|3[126]|6[136]|7[78]|83)(?:[2-6]|7[19])|(?:1(?:29|60|8[06])|261|552|6(?:[2-4]1|5[17]|6[13]|7(?:1|4[0189])|80)|7(?:12|88[01]))[2-7]', ]) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), @@ -185,22 +185,22 @@ public function __construct() ->setPattern('(\d{4})(\d{3})(\d{3})') ->setFormat('$1 $2 $3') ->setLeadingDigitsPattern([ - '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2[2457-9]|3[2-5]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1[013-9]|28|3[129]|4[1-35689]|5[29]|6[02-5]|70)|807', - '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2(?:[2457]|84|95)|3(?:[2-4]|55)|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1(?:[013-8]|9[6-9])|28[6-8]|3(?:17|2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4|5[0-367])|70[13-7])|807[19]', - '1(?:[2-479]|5(?:[0236-9]|5[013-9]))|[2-5]|6(?:2(?:84|95)|355|83)|73179|807(?:1|9[1-3])|(?:1552|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[124-6])\d|7(?:1(?:[013-8]\d|9[6-9])|28[6-8]|3(?:2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]\d|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\d|5[0-367])|70[13-7]))[2-7]', + '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2[2457-9]|3[2-5]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1[013-9]|3[129]|5[29]|6[02-5]|70)|807', + '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2(?:[2457]|84|95)|3(?:[2-4]|55)|4[235-7]|5[2-689]|6[24578]|7(?:[23569]|8[0-57-9])|8[1-6])|7(?:1(?:[013-8]|9[6-9])|3(?:17|2[0-49]|9[2-57])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4|5[0-367])|70[13-7])|807[19]', + '1(?:[2-479]|5(?:[0236-9]|5[013-9]))|[2-5]|6(?:2(?:84|95)|355|8(?:28[235-7]|3))|73179|807(?:1|9[1-3])|(?:1552|6(?:(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578])\d|7(?:[23569]\d|8[0-57-9])|8(?:[14-6]\d|2[0-79]))|7(?:1(?:[013-8]\d|9[6-9])|3(?:2[0-49]|9[2-57])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\d|5[0-367])|70[13-7]))[2-7]', ]) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) ->setPattern('(\d{5})(\d{5})') ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['[6-9]']) + ->setLeadingDigitsPattern(['16|[6-9]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) ->setPattern('(\d{4})(\d{2,4})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['1(?:6|8[06])', '1(?:6|8[06]0)']) + ->setLeadingDigitsPattern(['18[06]', '18[06]0']) ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) ->setPattern('(\d{4})(\d{3})(\d{3})(\d{3})') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IR.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IR.php index eed47d445..6d6288c6c 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IR.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IR.php @@ -35,12 +35,12 @@ public function __construct() ->setPossibleLengthLocalOnly([8]) ->setPossibleLength([4, 5, 6, 7, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('9(?:(?:0[0-5]|[13]\d|2[0-3])\d\d|9(?:[0-46]\d\d|5(?:10|5\d)|8(?:[12]\d|88)|9(?:0[0-3]|[19]\d|21|69|77|8[7-9])))\d{5}') + ->setNationalNumberPattern('9(?:(?:0[0-5]|[13]\d|2[0-3])\d\d|9(?:[0-46]\d\d|5(?:10|5\d)|8(?:[12]\d|3[0-2]|88)|9(?:[01359]\d|21|69|77|8[7-9])))\d{5}') ->setExampleNumber('9123456789') ->setPossibleLength([10]); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:1[137]|2[13-68]|3[1458]|4[145]|5[1468]|6[16]|7[1467]|8[13467])(?:[03-57]\d{7}|[16]\d{3}(?:\d{4})?|[289]\d{3}(?:\d(?:\d{3})?)?)|94(?:000[09]|(?:12\d|30[0-2])\d|2(?:121|[2689]0\d)|4(?:111|40\d))\d{4}') + ->setNationalNumberPattern('(?:1[137]|2[13-68]|3[1458]|4[145]|5[1468]|6[16]|7[1467]|8[13467])(?:[03-57]\d{7}|[16]\d{3}(?:\d{4})?|[289]\d{3}(?:\d(?:\d{3})?)?)|94(?:000[09]|(?:12\d|30[0-2])\d|2(?:[02689]0\d|121)|4(?:111|40\d))\d{4}') ->setExampleNumber('2123456789') ->setPossibleLengthLocalOnly([4, 5, 8]) ->setPossibleLength([6, 7, 10]); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IT.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IT.php index 238c28053..2a5db22a2 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IT.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IT.php @@ -30,7 +30,7 @@ class PhoneNumberMetadata_IT extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('0\d{5,10}|1\d{8,10}|3(?:[0-8]\d{7,10}|9\d{7,8})|(?:43|55|70)\d{8}|8\d{5}(?:\d{2,4})?') + ->setNationalNumberPattern('0\d{5,11}|1\d{8,10}|3(?:[0-8]\d{7,10}|9\d{7,8})|(?:43|55|70)\d{8}|8\d{5}(?:\d{2,4})?') ->setPossibleLength([6, 7, 8, 9, 10, 11, 12]); $this->mobile = (new PhoneNumberDesc()) ->setNationalNumberPattern('3[2-9]\d{7,8}|(?:31|43)\d{8}') @@ -41,9 +41,8 @@ public function __construct() ->setExampleNumber('899123456') ->setPossibleLength([6, 8, 9, 10]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('0669[0-79]\d{1,6}|0(?:1(?:[0159]\d|[27][1-5]|31|4[1-4]|6[1356]|8[2-57])|2\d\d|3(?:[0159]\d|2[1-4]|3[12]|[48][1-6]|6[2-59]|7[1-7])|4(?:[0159]\d|[23][1-9]|4[245]|6[1-5]|7[1-4]|81)|5(?:[0159]\d|2[1-5]|3[2-6]|4[1-79]|6[4-6]|7[1-578]|8[3-8])|6(?:[0-57-9]\d|6[0-8])|7(?:[0159]\d|2[12]|3[1-7]|4[2-46]|6[13569]|7[13-6]|8[1-59])|8(?:[0159]\d|2[3-578]|3[1-356]|[6-8][1-5])|9(?:[0159]\d|[238][1-5]|4[12]|6[1-8]|7[1-6]))\d{2,7}') - ->setExampleNumber('0212345678') - ->setPossibleLength([6, 7, 8, 9, 10, 11]); + ->setNationalNumberPattern('0(?:669[0-79]\d{1,6}|831\d{2,8})|0(?:1(?:[0159]\d|[27][1-5]|31|4[1-4]|6[1356]|8[2-57])|2\d\d|3(?:[0159]\d|2[1-4]|3[12]|[48][1-6]|6[2-59]|7[1-7])|4(?:[0159]\d|[23][1-9]|4[245]|6[1-5]|7[1-4]|81)|5(?:[0159]\d|2[1-5]|3[2-6]|4[1-79]|6[4-6]|7[1-578]|8[3-8])|6(?:[0-57-9]\d|6[0-8])|7(?:[0159]\d|2[12]|3[1-7]|4[2-46]|6[13569]|7[13-6]|8[1-59])|8(?:[0159]\d|2[3-578]|3[2356]|[6-8][1-5])|9(?:[0159]\d|[238][1-5]|4[12]|6[1-8]|7[1-6]))\d{2,7}') + ->setExampleNumber('0212345678'); $this->numberFormat = [ (new NumberFormat()) ->setPattern('(\d{4,5})') @@ -103,7 +102,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{3})(\d{4})(\d{4,5})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['3']) + ->setLeadingDigitsPattern(['[03]']) ->setNationalPrefixOptionalWhenFormatting(false), ]; $this->tollFree = (new PhoneNumberDesc()) @@ -180,7 +179,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{3})(\d{4})(\d{4,5})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['3']) + ->setLeadingDigitsPattern(['[03]']) ->setNationalPrefixOptionalWhenFormatting(false), ]; } diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JE.php index 25169716d..d80f3ad14 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JE.php @@ -23,7 +23,7 @@ class PhoneNumberMetadata_JE extends PhoneMetadata protected const COUNTRY_CODE = 44; protected const NATIONAL_PREFIX = '0'; - protected ?string $nationalPrefixForParsing = '([0-24-8]\d{5})$|0'; + protected ?string $nationalPrefixForParsing = '([0-24-8]\d{5})$|0|180020'; protected ?string $internationalPrefix = '00'; protected ?string $nationalPrefixTransformRule = '1534$1'; diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JM.php index 8d4d540db..fa1fdc3f2 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JM.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JM.php @@ -35,14 +35,14 @@ public function __construct() ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:658295|876(?:2(?:0[1-9]|[13-9]\d|2[013-9])|[348]\d\d|5(?:0[1-9]|[1-9]\d)|6(?:4[89]|6[67])|7(?:0[07]|7\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579])))\d{4}') + ->setNationalNumberPattern('(?:6582(?:[0-4]\d|95)|876(?:2(?:0[1-9]|[13-9]\d|2[013-9])|[348]\d\d|5(?:0[1-9]|[1-9]\d)|6(?:4[89]|6[67])|7(?:0[07]|7\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579])))\d{4}') ->setExampleNumber('8762101234') ->setPossibleLengthLocalOnly([7]); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('900[2-9]\d{6}') ->setExampleNumber('9002123456'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('8766060\d{3}|(?:658(?:2(?:[0-8]\d|9[0-46-9])|[3-9]\d\d)|876(?:52[35]|6(?:0[1-3579]|1[0235-9]|[23]\d|40|5[06]|6[2-589]|7[0-25-9]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\d|9[2-468])))\d{4}') + ->setNationalNumberPattern('8766060\d{3}|(?:658(?:2(?:[5-8]\d|9[0-46-9])|[3-9]\d\d)|876(?:52[35]|6(?:0[1-3579]|1[0235-9]|[23]\d|40|5[06]|6[2-589]|7[0-25-9]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\d|9[2-468])))\d{4}') ->setExampleNumber('8765230123') ->setPossibleLengthLocalOnly([7]); $this->tollFree = (new PhoneNumberDesc()) @@ -50,7 +50,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JO.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JO.php index ef34f2015..d918a26fa 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JO.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JO.php @@ -31,10 +31,10 @@ class PhoneNumberMetadata_JO extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:(?:[2689]|7\d)\d|32|53)\d{6}') + ->setNationalNumberPattern('(?:(?:[2689]|7\d)\d|32|427|53)\d{6}') ->setPossibleLength([8, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('7(?:[78][0-25-9]|9\d)\d{6}') + ->setNationalNumberPattern('(?:427|7(?:[78][0-25-9]|9\d))\d{6}') ->setExampleNumber('790123456') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) @@ -67,7 +67,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d)(\d{4})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['7']) + ->setLeadingDigitsPattern(['[47]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), ]; diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JP.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JP.php index 7c111c39b..a9ea9db4a 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JP.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JP.php @@ -24,7 +24,7 @@ class PhoneNumberMetadata_JP extends PhoneMetadata protected const COUNTRY_CODE = 81; protected const NATIONAL_PREFIX = '0'; - protected ?string $nationalPrefixForParsing = '(000[259]\d{6})$|(?:(?:003768)0?)|0'; + protected ?string $nationalPrefixForParsing = '(000[2569]\d{4,6})$|(?:(?:003768)0?)|0'; protected ?string $internationalPrefix = '010'; protected ?string $nationalPrefixTransformRule = '$1'; protected bool $mobileNumberPortableRegion = true; @@ -32,10 +32,10 @@ class PhoneNumberMetadata_JP extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('00[1-9]\d{6,14}|[257-9]\d{9}|(?:00|[1-9]\d\d)\d{6}') + ->setNationalNumberPattern('00[1-9]\d{6,14}|[25-9]\d{9}|(?:00|[1-9]\d\d)\d{6}') ->setPossibleLength([8, 9, 10, 11, 12, 13, 14, 15, 16, 17]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[7-9]0[1-9]\d{7}') + ->setNationalNumberPattern('[6-9]0[1-9]\d{7}') ->setExampleNumber('9012345678') ->setPossibleLength([10]); $this->premiumRate = (new PhoneNumberDesc()) @@ -52,6 +52,11 @@ public function __construct() ->setFormat('$1-$2') ->setLeadingDigitsPattern(['007', '0077', '00777', '00777[01]']) ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{8,10})') + ->setFormat('$1') + ->setLeadingDigitsPattern(['000']) + ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{3})(\d{3})(\d{3})') ->setFormat('$1-$2-$3') @@ -77,7 +82,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d)(\d{4})(\d{4})') ->setFormat('$1-$2-$3') - ->setLeadingDigitsPattern(['[36]|4(?:2[09]|7[01])', '[36]|4(?:2(?:0|9[02-69])|7(?:0[019]|1))']) + ->setLeadingDigitsPattern(['3|4(?:2[09]|7[01])|6[1-9]', '3|4(?:2(?:0|9[02-69])|7(?:0[019]|1))|6[1-9]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) @@ -115,7 +120,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{4})(\d{4})') ->setFormat('$1-$2-$3') - ->setLeadingDigitsPattern(['[257-9]']) + ->setLeadingDigitsPattern(['[25-9]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) @@ -188,7 +193,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d)(\d{4})(\d{4})') ->setFormat('$1-$2-$3') - ->setLeadingDigitsPattern(['[36]|4(?:2[09]|7[01])', '[36]|4(?:2(?:0|9[02-69])|7(?:0[019]|1))']) + ->setLeadingDigitsPattern(['3|4(?:2[09]|7[01])|6[1-9]', '3|4(?:2(?:0|9[02-69])|7(?:0[019]|1))|6[1-9]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) @@ -216,7 +221,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{4})(\d{4})') ->setFormat('$1-$2-$3') - ->setLeadingDigitsPattern(['[257-9]']) + ->setLeadingDigitsPattern(['[25-9]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), ]; diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KE.php index 0c57d5abb..da4b66219 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KE.php @@ -34,7 +34,7 @@ public function __construct() ->setNationalNumberPattern('(?:[17]\d\d|900)\d{6}|(?:2|80)0\d{6,7}|[4-6]\d{6,8}') ->setPossibleLength([7, 8, 9, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:1(?:0[0-8]|1[0-7]|2[014]|30)|7\d\d)\d{6}') + ->setNationalNumberPattern('(?:1(?:0[0-8]|[18]\d|2[014]|30|4[0-5])|7\d\d)\d{6}') ->setExampleNumber('712123456') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KN.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KN.php index 38d921e4f..586746ea1 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KN.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KN.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KY.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KY.php index 05004d821..9948b7743 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KY.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KY.php @@ -36,7 +36,7 @@ public function __construct() ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('345(?:32[1-9]|42[0-4]|5(?:1[67]|2[5-79]|4[6-9]|50|76)|649|82[56]|9(?:1[679]|2[2-9]|3[06-9]|90))\d{4}') + ->setNationalNumberPattern('345(?:32[1-9]|4(?:1[2-6]|2[0-4])|5(?:1[67]|2[5-79]|4[6-9]|50|76)|649|82[56]|9(?:1[679]|2[2-9]|3[06-9]|90))\d{4}') ->setExampleNumber('3453231234') ->setPossibleLengthLocalOnly([7]); $this->premiumRate = (new PhoneNumberDesc()) @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002345678'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KZ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KZ.php index 89f99d1ba..f1b852753 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KZ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KZ.php @@ -21,7 +21,7 @@ class PhoneNumberMetadata_KZ extends PhoneMetadata { protected const ID = 'KZ'; protected const COUNTRY_CODE = 7; - protected const LEADING_DIGITS = '33622|7'; + protected const LEADING_DIGITS = '7'; protected const NATIONAL_PREFIX = '8'; protected ?string $nationalPrefixForParsing = '8'; @@ -32,7 +32,7 @@ class PhoneNumberMetadata_KZ extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:33622|8\d{8})\d{5}|[78]\d{9}') + ->setNationalNumberPattern('8\d{13}|[78]\d{9}') ->setPossibleLengthLocalOnly([5, 6, 7]) ->setPossibleLength([10, 14]); $this->mobile = (new PhoneNumberDesc()) @@ -44,7 +44,7 @@ public function __construct() ->setExampleNumber('8091234567') ->setPossibleLength([10]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:33622|7(?:1(?:0(?:[23]\d|4[0-3]|59|63)|1(?:[23]\d|4[0-79]|59)|2(?:[23]\d|59)|3(?:2\d|3[0-79]|4[0-35-9]|59)|4(?:[24]\d|3[013-9]|5[1-9]|97)|5(?:2\d|3[1-9]|4[0-7]|59)|6(?:[2-4]\d|5[19]|61)|72\d|8(?:[27]\d|3[1-46-9]|4[0-5]|59))|2(?:1(?:[23]\d|4[46-9]|5[3469])|2(?:2\d|3[0679]|46|5[12679])|3(?:[2-4]\d|5[139])|4(?:2\d|3[1-35-9]|59)|5(?:[23]\d|4[0-8]|59|61)|6(?:2\d|3[1-9]|4[0-4]|59)|7(?:[2379]\d|40|5[279])|8(?:[23]\d|4[0-3]|59)|9(?:2\d|3[124578]|59))))\d{5}') + ->setNationalNumberPattern('7(?:1(?:0(?:[23]\d|4[0-3]|59|63)|1(?:[23]\d|4[0-79]|59)|2(?:[23]\d|59)|3(?:2\d|3[0-79]|4[0-35-9]|59)|4(?:[24]\d|3[013-9]|5[1-9]|97)|5(?:2\d|3[1-9]|4[0-7]|59)|6(?:[2-4]\d|5[19]|61)|72\d|8(?:[27]\d|3[1-46-9]|4[0-5]|59))|2(?:1(?:[23]\d|4[46-9]|5[3469])|2(?:2\d|3[0679]|46|5[12679])|3(?:[2-4]\d|5[139])|4(?:2\d|3[1-35-9]|59)|5(?:[23]\d|4[0-8]|59|61)|6(?:2\d|3[1-9]|4[0-4]|59)|7(?:[2379]\d|40|5[279])|8(?:[23]\d|4[0-3]|59)|9(?:2\d|3[124578]|59)))\d{5}') ->setExampleNumber('7123456789') ->setPossibleLengthLocalOnly([5, 6, 7]) ->setPossibleLength([10]); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LB.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LB.php index ed85e572a..e930016c3 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LB.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LB.php @@ -33,7 +33,7 @@ public function __construct() ->setNationalNumberPattern('[27-9]\d{7}|[13-9]\d{6}') ->setPossibleLength([7, 8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:(?:3|81)\d|7(?:[01]\d|6[013-9]|8[7-9]|9[1-3]))\d{5}') + ->setNationalNumberPattern('(?:(?:3|81)\d|7(?:[01]\d|6[013-9]|8[7-9]|9[0-4]))\d{5}') ->setExampleNumber('71123456'); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('9[01]\d{6}') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LC.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LC.php index f67b6f48e..a6107ade9 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LC.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LC.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LI.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LI.php index e6af528c3..750e7ca8f 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LI.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LI.php @@ -33,7 +33,7 @@ public function __construct() ->setNationalNumberPattern('[68]\d{8}|(?:[2378]\d|90)\d{5}') ->setPossibleLength([7, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:6(?:(?:4[5-9]|5[0-46-9])\d|6(?:[024-6]\d|[17]0|3[7-9]))\d|7(?:[37-9]\d|42|56))\d{4}') + ->setNationalNumberPattern('(?:6(?:(?:4[5-9]|5\d)\d|6(?:[024-68]\d|1[01]|3[7-9]|7[02]))\d|7(?:[37-9]\d|42|56))\d{4}') ->setExampleNumber('660234567'); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('90(?:02[258]|1(?:23|3[14])|66[136])\d\d') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LU.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LU.php index 73d812da1..2fa38440e 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LU.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LU.php @@ -33,7 +33,7 @@ public function __construct() ->setNationalNumberPattern('35[013-9]\d{4,8}|6\d{8}|35\d{2,4}|(?:[2457-9]\d|3[0-46-9])\d{2,9}') ->setPossibleLength([4, 5, 6, 7, 8, 9, 10, 11]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('6(?:[269][18]|5[1568]|7[189]|81)\d{6}') + ->setNationalNumberPattern('6(?:[26][18]|5[1568]|7[189]|81|9[128])\d{6}') ->setExampleNumber('628123456') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) @@ -65,7 +65,13 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{2})(\d{1,2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['2(?:[0367]|4[3-8])']) + ->setLeadingDigitsPattern(['20']) + ->setDomesticCarrierCodeFormattingRule('$CC $1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{2})(\d{2})(\d{2})(\d{1,5})') + ->setFormat('$1 $2 $3 $4') + ->setLeadingDigitsPattern(['[3-57]|8[13-9]|9(?:0[89]|[2-579])|(?:2|80)[2-9]']) ->setDomesticCarrierCodeFormattingRule('$CC $1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) @@ -89,13 +95,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{2})(\d{2})(\d{1,2})') ->setFormat('$1 $2 $3 $4 $5') - ->setLeadingDigitsPattern(['2(?:[0367]|4[3-8])']) - ->setDomesticCarrierCodeFormattingRule('$CC $1') - ->setNationalPrefixOptionalWhenFormatting(false), - (new NumberFormat()) - ->setPattern('(\d{2})(\d{2})(\d{2})(\d{1,5})') - ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['[3-57]|8[13-9]|9(?:0[89]|[2-579])|(?:2|80)[2-9]']) + ->setLeadingDigitsPattern(['20']) ->setDomesticCarrierCodeFormattingRule('$CC $1') ->setNationalPrefixOptionalWhenFormatting(false), ]; diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LV.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LV.php index 982b10fb2..09f49dd56 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LV.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LV.php @@ -29,7 +29,7 @@ class PhoneNumberMetadata_LV extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[268]\d|90)\d{6}') + ->setNationalNumberPattern('(?:[268]\d|78|90)\d{6}') ->setPossibleLength([8]); $this->mobile = (new PhoneNumberDesc()) ->setNationalNumberPattern('2333[0-8]\d{3}|2(?:[0-24-9]\d\d|3(?:0[07]|[14-9]\d|2[02-9]|3[0-24-9]))\d{4}') @@ -44,7 +44,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{3})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[269]|8[01]']) + ->setLeadingDigitsPattern(['[2679]|8[01]']) ->setNationalPrefixOptionalWhenFormatting(false), ]; $this->tollFree = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MA.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MA.php index ebfc2c2a2..f4fa83e56 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MA.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MA.php @@ -22,6 +22,7 @@ class PhoneNumberMetadata_MA extends PhoneMetadata { protected const ID = 'MA'; protected const COUNTRY_CODE = 212; + protected const LEADING_DIGITS = '[5-8]'; protected const NATIONAL_PREFIX = '0'; protected ?string $nationalPrefixForParsing = '0'; @@ -35,37 +36,31 @@ public function __construct() ->setNationalNumberPattern('[5-8]\d{8}') ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:6(?:[0-79]\d|8[0-247-9])|7(?:[0167]\d|2[0-8]|5[0-3]|8[0-7]))\d{6}') + ->setNationalNumberPattern('(?:6(?:[0-79]\d|8[0-247-9])|7(?:[016-8]\d|2[0-8]|3[01]|5[0-5]))\d{6}') ->setExampleNumber('650123456'); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('89\d{7}') ->setExampleNumber('891234567'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('5(?:2(?:[0-25-79]\d|3[1-578]|4[02-46-8]|8[0235-7])|3(?:[0-47]\d|5[02-9]|6[02-8]|8[014-9]|9[3-9])|(?:4[067]|5[03])\d)\d{5}') + ->setNationalNumberPattern('5(?:(?:18|4[0679]|5[03])\d|2(?:[0-25-79]\d|3[1-578]|4[02-46-8]|8[0235-9])|3(?:[0-47]\d|5[02-9]|6[02-8]|8[014-9]|9[3-9]))\d{5}') ->setExampleNumber('520123456'); $this->numberFormat = [ - (new NumberFormat()) - ->setPattern('(\d{3})(\d{2})(\d{2})(\d{2})') - ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['5[45]']) - ->setNationalPrefixFormattingRule('0$1') - ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{4})(\d{5})') ->setFormat('$1-$2') - ->setLeadingDigitsPattern(['5(?:2[2-46-9]|3[3-9]|9)|8(?:0[89]|92)']) + ->setLeadingDigitsPattern(['892']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{7})') ->setFormat('$1-$2') - ->setLeadingDigitsPattern(['8']) + ->setLeadingDigitsPattern(['8(?:0[0-7]|9)']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) - ->setPattern('(\d{3})(\d{6})') - ->setFormat('$1-$2') - ->setLeadingDigitsPattern(['[5-7]']) + ->setPattern('(\d)(\d{2})(\d{2})(\d{2})(\d{2})') + ->setFormat('$1 $2 $3 $4 $5') + ->setLeadingDigitsPattern(['[5-8]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), ]; diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MC.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MC.php index ce2c1d9f7..2537e5acd 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MC.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MC.php @@ -30,10 +30,10 @@ class PhoneNumberMetadata_MC extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[3489]|6\d)\d{7}') + ->setNationalNumberPattern('(?:[3489]|[67]\d)\d{7}') ->setPossibleLength([8, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('4(?:[469]\d|5[1-9])\d{5}|(?:3|6\d)\d{7}') + ->setNationalNumberPattern('4(?:[46]\d|5[1-9])\d{5}|(?:3|[67]\d)\d{7}') ->setExampleNumber('612345678'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) @@ -60,7 +60,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d)(\d{2})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4 $5') - ->setLeadingDigitsPattern(['6']) + ->setLeadingDigitsPattern(['[67]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), ]; @@ -92,7 +92,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d)(\d{2})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4 $5') - ->setLeadingDigitsPattern(['6']) + ->setLeadingDigitsPattern(['[67]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), ]; diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ME.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ME.php index dbac0760c..7436d2727 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ME.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ME.php @@ -35,7 +35,7 @@ public function __construct() ->setPossibleLength([8, 9]); $this->mobile = (new PhoneNumberDesc()) ->setNationalNumberPattern('6(?:[07-9]\d|3[024]|6[0-25])\d{5}') - ->setExampleNumber('67622901') + ->setExampleNumber('60123456') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('9(?:4[1568]|5[178])\d{5}') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MF.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MF.php index 931ba6a17..42078b11d 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MF.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MF.php @@ -30,14 +30,16 @@ class PhoneNumberMetadata_MF extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:590\d|7090)\d{5}|(?:69|80|9\d)\d{7}') + ->setNationalNumberPattern('7090\d{5}|(?:[56]9|[89]\d)\d{7}') ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:69(?:0\d\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\d)|6(?:1[016-9]|5[0-4]|[67]\d))|7090[0-4])\d{4}') + ->setNationalNumberPattern('(?:69(?:0\d\d|1(?:2[2-9]|3[0-5]))|7090[0-4])\d{4}') ->setExampleNumber('690001234'); - $this->premiumRate = PhoneNumberDesc::empty(); + $this->premiumRate = (new PhoneNumberDesc()) + ->setNationalNumberPattern('8[129]\d{7}') + ->setExampleNumber('810123456'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('590(?:0[079]|[14]3|[27][79]|3[03-7]|5[0-268]|87)\d{4}') + ->setNationalNumberPattern('(?:59(?:0(?:0[079]|[14]3|[27][79]|3[03-7]|5[0-268]|87)|87\d)|80[6-9]\d\d)\d{4}') ->setExampleNumber('590271234'); $this->tollFree = (new PhoneNumberDesc()) ->setNationalNumberPattern('80[0-5]\d{6}') 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 902b2ffda..9ec96ec4e 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MG.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MG.php @@ -35,7 +35,7 @@ public function __construct() ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('3[2-47-9]\d{7}') + ->setNationalNumberPattern('3[2-9]\d{7}') ->setExampleNumber('321234567'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ML.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ML.php index e1a3f0e82..526f14829 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ML.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ML.php @@ -35,7 +35,7 @@ public function __construct() ->setExampleNumber('65012345'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('2(?:07[0-8]|12[67])\d{4}|(?:2(?:02|1[4-689])|4(?:0[0-4]|4[1-59]))\d{5}') + ->setNationalNumberPattern('2(?:07[0-8]|12[67])\d{4}|(?:2(?:02|1[4-689])|4(?:0[0-4]|4[1-69]))\d{5}') ->setExampleNumber('20212345'); $this->numberFormat = [ (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MN.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MN.php index 757659ff8..ef0924aeb 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MN.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MN.php @@ -34,19 +34,19 @@ public function __construct() ->setPossibleLengthLocalOnly([4, 5, 6]) ->setPossibleLength([8, 9, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:83[01]|92[0139])\d{5}|(?:5[05]|6[069]|72|8[015689]|9[013-9])\d{6}') + ->setNationalNumberPattern('(?:87[01]|92[0139])\d{5}|(?:5[05]|6[069]|7[28]|8[0135689]|9[013-9])\d{6}') ->setExampleNumber('88123456') ->setPossibleLength([8]); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[12]2[1-3]\d{5,6}|(?:(?:[12](?:1|27)|5[368])\d\d|7(?:0(?:[0-5]\d|7[078]|80)|128))\d{4}|[12](?:3[2-8]|4[2-68]|5[1-4689])\d{6,7}') + ->setNationalNumberPattern('[12](?:2[1-3]|(?:3[2-8]|4[2-68]|5[1-4689])\d)\d{5,6}|7(?:0(?:[0-5]\d|7[078]|80)|128)\d{4}|[12]27\d{6}|(?:11|2[16]|5[368])\d{6}') ->setExampleNumber('53123456') ->setPossibleLengthLocalOnly([4, 5, 6]); $this->numberFormat = [ (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[12]1']) + ->setLeadingDigitsPattern(['11|2[16]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) @@ -77,7 +77,7 @@ public function __construct() $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = PhoneNumberDesc::empty(); $this->voip = (new PhoneNumberDesc()) - ->setNationalNumberPattern('712[0-79]\d{4}|7(?:1[013-9]|[5-9]\d)\d{5}') + ->setNationalNumberPattern('712[0-79]\d{4}|7(?:1[013-9]|[5-79]\d)\d{5}') ->setExampleNumber('75123456') ->setPossibleLength([8]); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MP.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MP.php index ec1f2c40c..abe96fcd9 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MP.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MP.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MQ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MQ.php index e50ecbaa9..6512c499c 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MQ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MQ.php @@ -31,7 +31,7 @@ class PhoneNumberMetadata_MQ extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:596\d|7091)\d{5}|(?:69|[89]\d)\d{7}') + ->setNationalNumberPattern('7091\d{5}|(?:[56]9|[89]\d)\d{7}') ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) ->setNationalNumberPattern('(?:69[67]\d\d|7091[0-3])\d{4}') @@ -40,7 +40,7 @@ public function __construct() ->setNationalNumberPattern('8[129]\d{7}') ->setExampleNumber('810123456'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:596(?:[03-7]\d|1[05]|2[7-9]|8[0-39]|9[04-9])|80[6-9]\d\d|9(?:477[6-9]|767[4589]))\d{4}') + ->setNationalNumberPattern('(?:59(?:6(?:[03-7]\d|1[05]|2[7-9]|8[0-39]|9[04-9])|89\d)|80[6-9]\d\d|9(?:477[6-9]|767[4589]))\d{4}') ->setExampleNumber('596301234'); $this->numberFormat = [ (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MS.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MS.php index f5aacffaa..40736afec 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MS.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MS.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MU.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MU.php index 4ee607cb2..a780b77d5 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MU.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MU.php @@ -32,7 +32,7 @@ public function __construct() ->setNationalNumberPattern('(?:[57]|8\d\d)\d{7}|[2-468]\d{6}') ->setPossibleLength([7, 8, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('5(?:4(?:2[1-389]|7[1-9])|87[15-8])\d{4}|(?:5(?:2[5-9]|4[3-689]|[57]\d|8[0-689]|9[0-8])|7(?:0[0-6]|3[013]))\d{5}') + ->setNationalNumberPattern('5(?:4(?:2[1-389]|7[1-9])|87[15-8])\d{4}|(?:5(?:2[5-9]|4[3-689]|[57]\d|8[0-689]|9[0-8])|7(?:0[0-7]|3[013]))\d{5}') ->setExampleNumber('52512345') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) @@ -40,7 +40,7 @@ public function __construct() ->setExampleNumber('3012345') ->setPossibleLength([7]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:2(?:[0346-8]\d|1[0-8])|4(?:[013568]\d|2[4-8]|71|90)|54(?:[3-5]\d|71)|6\d\d|8(?:14|3[129]))\d{4}') + ->setNationalNumberPattern('(?:2(?:[0346-8]\d|1[0-8])|4(?:[013568]\d|2[0-24-8]|71|90)|54(?:[3-5]\d|71)|6\d\d|8(?:14|3[129]))\d{4}') ->setExampleNumber('54480123') ->setPossibleLength([7, 8]); $this->numberFormat = [ diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MW.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MW.php index 3db73e459..2e8db35b1 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MW.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MW.php @@ -33,13 +33,14 @@ public function __construct() ->setNationalNumberPattern('(?:[1289]\d|31|77)\d{7}|1\d{6}') ->setPossibleLength([7, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('111\d{6}|(?:31|77|[89][89])\d{7}') + ->setNationalNumberPattern('111\d{6}|(?:2[12]|31|77|[89][89])\d{7}') ->setExampleNumber('991234567') ->setPossibleLength([9]); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:1[2-9]|2[12]\d\d)\d{5}') - ->setExampleNumber('1234567'); + ->setNationalNumberPattern('1[2-9]\d{5}') + ->setExampleNumber('1234567') + ->setPossibleLength([7]); $this->numberFormat = [ (new NumberFormat()) ->setPattern('(\d)(\d{3})(\d{3})') @@ -47,16 +48,10 @@ public function __construct() ->setLeadingDigitsPattern(['1[2-9]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), - (new NumberFormat()) - ->setPattern('(\d{3})(\d{3})(\d{3})') - ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['2']) - ->setNationalPrefixFormattingRule('0$1') - ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{3})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['[137-9]']) + ->setLeadingDigitsPattern(['[1-37-9]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), ]; diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MY.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MY.php index 40a175add..0fca51270 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MY.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MY.php @@ -35,7 +35,7 @@ public function __construct() ->setPossibleLengthLocalOnly([6, 7]) ->setPossibleLength([8, 9, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:1888[689]|4400|8(?:47|8[27])[0-4])\d{4}|1(?:0(?:[23568]\d|4[0-6]|7[016-9]|9[0-8])|1(?:[1-5]\d\d|6(?:0[5-9]|[1-9]\d)|7(?:[0-4]\d|5[0-7]))|(?:[269]\d|[37][1-9]|4[235-9])\d|5(?:31|9\d\d)|8(?:1[23]|[236]\d|4[06]|5(?:46|[7-9])|7[016-9]|8[01]|9[0-8]))\d{5}') + ->setNationalNumberPattern('1(?:(?:1888[689]|4400|8(?:47|8[27])[0-4])\d{4}|9\d{7,8})|1(?:0(?:[23568]\d|4[0-6]|7[016-9]|9[0-8])|1(?:[1-5]\d\d|6(?:0[5-9]|[1-9]\d)|7(?:[0-4]\d|5[0-79]|6[02-4]|8[02-5]))|(?:[26]\d|[37][1-9]|4[235-9])\d|5(?:31|9\d\d)|8(?:1[23]|[236]\d|4[06]|5(?:46|[7-9])|7[016-9]|8[01]|9[0-8]))\d{5}') ->setExampleNumber('123456789') ->setPossibleLength([9, 10]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MZ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MZ.php index def9524c9..c8276f72e 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MZ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MZ.php @@ -31,7 +31,7 @@ public function __construct() ->setNationalNumberPattern('(?:2|8\d)\d{7}') ->setPossibleLength([8, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('8[2-79]\d{7}') + ->setNationalNumberPattern('8(?:[2-79]\d|80)\d{6}') ->setExampleNumber('821234567') ->setPossibleLength([9]); $this->premiumRate = PhoneNumberDesc::empty(); @@ -43,7 +43,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{3,4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['2|8[2-79]']) + ->setLeadingDigitsPattern(['2|8[2-9]']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{3})(\d{3})(\d{3})') 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 34caf2693..f0a5279a9 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NO.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NO.php @@ -34,7 +34,7 @@ public function __construct() ->setNationalNumberPattern('(?:0|[2-9]\d{3})\d{4}') ->setPossibleLength([5, 8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:4[015-8]|9\d)\d{6}') + ->setNationalNumberPattern('(?:4[015-9]|9\d)\d{6}') ->setExampleNumber('40612345') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) @@ -42,7 +42,7 @@ public function __construct() ->setExampleNumber('82012345') ->setPossibleLength([8]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:2[1-4]|3[1-3578]|5[1-35-7]|6[1-4679]|7[0-8])\d{6}') + ->setNationalNumberPattern('(?:2[1-4]|3[1-3578]|5[1-35-7]|6[1-46-9]|7[0-8])\d{6}') ->setExampleNumber('21234567') ->setPossibleLength([8]); $this->numberFormat = [ diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NP.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NP.php index 5360590f6..98f361cf4 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NP.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NP.php @@ -34,7 +34,7 @@ public function __construct() ->setPossibleLengthLocalOnly([6, 7]) ->setPossibleLength([8, 10, 11]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('9(?:00|6[0-3]|7[024-6]|8[0-24-68])\d{7}') + ->setNationalNumberPattern('9(?:00|6[0-3]|7[0-24-6]|8[0-24-68])\d{7}') ->setExampleNumber('9841234567') ->setPossibleLength([10]); $this->premiumRate = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_OM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_OM.php index 200037077..fcc42122f 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_OM.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_OM.php @@ -32,7 +32,7 @@ public function __construct() ->setNationalNumberPattern('(?:1505|[279]\d{3}|500)\d{4}|800\d{5,6}') ->setPossibleLength([7, 8, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:1505|90[1-9]\d)\d{4}|(?:7[126-9]|9[1-9])\d{6}') + ->setNationalNumberPattern('(?:1505|90[1-9]\d)\d{4}|(?:7[124-9]|9[1-9])\d{6}') ->setExampleNumber('92123456') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) 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 1cc8b2c32..7b7a51e47 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PA.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PA.php @@ -40,7 +40,7 @@ public function __construct() ->setExampleNumber('8601234') ->setPossibleLength([7]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?: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(?:[047-9]\d|1[0-8]|2[0-5]|33|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[4-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}') + ->setNationalNumberPattern('(?:1(?:0\d|1[0479]|2[37]|3[0137]|4[147]|5[05]|6[058]|7[0167]|8[2358]|9[1389])|2(?:[0235-79]\d|1[0-7]|4[013-9]|8[02-9])|3(?:[0147-9]\d|[25][0-5]|33|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[4-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}') ->setExampleNumber('2001234') ->setPossibleLength([7]); $this->numberFormat = [ diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PG.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PG.php index 7216780ec..e2db6739a 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PG.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PG.php @@ -32,7 +32,7 @@ public function __construct() ->setNationalNumberPattern('(?:180|[78]\d{3})\d{4}|(?:[2-589]\d|64)\d{5}') ->setPossibleLength([7, 8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:7\d|8[1-38])\d{6}') + ->setNationalNumberPattern('(?:7\d|8[1-48])\d{6}') ->setExampleNumber('70123456') ->setPossibleLength([8]); $this->premiumRate = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PL.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PL.php index 54c9533dc..461353610 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PL.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PL.php @@ -32,7 +32,7 @@ public function __construct() ->setNationalNumberPattern('(?:6|8\d\d)\d{7}|[1-9]\d{6}(?:\d{2})?|[26]\d{5}') ->setPossibleLength([6, 7, 8, 9, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('2131[89]\d{4}|21(?:1[013-5]|2\d|3[2-9])\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\d{7}') + ->setNationalNumberPattern('21(?:1[013-5]|2\d|3[1-9])\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\d{7}') ->setExampleNumber('512345678') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) @@ -40,7 +40,7 @@ public function __construct() ->setExampleNumber('701234567') ->setPossibleLength([9]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('47\d{7}|(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])(?:[02-9]\d{6}|1(?:[0-8]\d{5}|9\d{3}(?:\d{2})?))') + ->setNationalNumberPattern('(?:30|47\d\d)\d{5}|(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])(?:[02-9]\d{6}|1(?:[0-8]\d{5}|9\d{3}(?:\d{2})?))') ->setExampleNumber('123456789') ->setPossibleLength([7, 9]); $this->numberFormat = [ @@ -58,8 +58,8 @@ public function __construct() ->setPattern('(\d{2})(\d{2})(\d{3})') ->setFormat('$1 $2 $3') ->setLeadingDigitsPattern([ - '(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])1', - '(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])19', + '30|(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])1', + '30|(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])19', ]) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PM.php index 2004f21d3..4e1f965ad 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PM.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PM.php @@ -30,23 +30,23 @@ class PhoneNumberMetadata_PM extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[45]\d{5}|(?:708|8\d\d)\d{6}') + ->setNationalNumberPattern('[78]\d{8}|[2-9]\d{5}') ->setPossibleLength([6, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:4[02-489]|5[02-9]|708(?:4[0-5]|5[0-6]))\d{4}') + ->setNationalNumberPattern('708(?:4[0-5]|5[0-6])\d{4}|(?:[236-9]\d|4[02-489]|5[02-9])\d{4}') ->setExampleNumber('551234'); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('8[129]\d{7}') ->setExampleNumber('810123456') ->setPossibleLength([9]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:4[1-35-9]|5[0-47-9]|80[6-9]\d\d)\d{4}') + ->setNationalNumberPattern('80[6-9]\d{6}|(?:[236-9]\d|4[1-35-9]|5[0-47-9])\d{4}') ->setExampleNumber('430123'); $this->numberFormat = [ (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[45]']) + ->setLeadingDigitsPattern(['[2-9]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PR.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PR.php index 304774449..8f2791dc0 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PR.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PR.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002345678'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PY.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PY.php index d0273f64e..a1923bdb2 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PY.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PY.php @@ -31,7 +31,7 @@ class PhoneNumberMetadata_PY extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('59\d{4,6}|9\d{5,10}|(?:[2-46-8]\d|5[0-8])\d{4,7}') + ->setNationalNumberPattern('[36-8]\d{5,8}|4\d{6,8}|59\d{6}|9\d{5,10}|(?:2\d|5[0-8])\d{6,7}') ->setPossibleLengthLocalOnly([5]) ->setPossibleLength([6, 7, 8, 9, 10, 11]); $this->mobile = (new PhoneNumberDesc()) @@ -40,11 +40,16 @@ public function __construct() ->setPossibleLength([9]); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36])\d{5,7}|(?:2(?:2[4-68]|[4-68]\d|7[15]|9[1-5])|3(?:18|3[167]|4[2357]|51|[67]\d)|4(?:3[12]|5[13]|9[1-47])|5(?:[1-4]\d|5[02-4])|6(?:3[1-3]|44|7[1-8])|7(?:4[0-4]|5\d|6[1-578]|75|8[0-8])|858)\d{5,6}') + ->setNationalNumberPattern('(?:3[289]|4[246-8]|61|7[1-3]|8[1-36])\d{5,7}|(?:2(?:[14-68]\d|2[4-68]|7[15]|9[1-5])|3(?:18|3[167]|4[2357]|51|[67]\d)|4(?:1\d|3[12]|5[13]|9[1-47])|5(?:[1-4]\d|5[02-4])|6(?:3[1-3]|44|7[1-8])|7(?:4[0-4]|5\d|6[1-578]|75|8[0-8])|858)\d{5,6}') ->setExampleNumber('212345678') ->setPossibleLengthLocalOnly([5, 6]) ->setPossibleLength([7, 8, 9]); $this->numberFormat = [ + (new NumberFormat()) + ->setPattern('(\d{6,7})') + ->setFormat('$1') + ->setLeadingDigitsPattern(['[125]|4[01]']) + ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{3})(\d{3,6})') ->setFormat('$1 $2') @@ -54,7 +59,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{5})') ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36]']) + ->setLeadingDigitsPattern(['3[289]|4[246-8]|61|7[1-3]|8[1-36]']) ->setNationalPrefixFormattingRule('(0$1)') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) @@ -104,10 +109,58 @@ public function __construct() ->setPossibleLength([9]); $this->pager = PhoneNumberDesc::empty(); $this->uan = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[2-9]0\d{4,7}') + ->setNationalNumberPattern('[245]0\d{6,7}|[36-9]0\d{4,7}') ->setExampleNumber('201234567') ->setPossibleLength([6, 7, 8, 9]); $this->voicemail = PhoneNumberDesc::empty(); $this->noInternationalDialling = PhoneNumberDesc::empty(); + $this->intlNumberFormat = [ + (new NumberFormat()) + ->setPattern('(\d{3})(\d{3,6})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['[2-9]0']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{2})(\d{5})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['3[289]|4[246-8]|61|7[1-3]|8[1-36]']) + ->setNationalPrefixFormattingRule('(0$1)') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{4,5})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['2[279]|3[13-5]|4[359]|5|6(?:[34]|7[1-46-8])|7[46-8]|85']) + ->setNationalPrefixFormattingRule('(0$1)') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{2})(\d{3})(\d{3,4})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['2[14-68]|3[26-9]|4[1246-8]|6(?:1|75)|7[1-35]|8[1-36]']) + ->setNationalPrefixFormattingRule('(0$1)') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{2})(\d{3})(\d{4})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['87']) + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{6})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['9(?:[5-79]|8[1-7])']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{3})(\d{3})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['[2-8]']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{4})(\d{3})(\d{4})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['9']) + ->setNationalPrefixOptionalWhenFormatting(false), + ]; } } diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_QA.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_QA.php index 21fe977a9..6466758ec 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_QA.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_QA.php @@ -37,7 +37,7 @@ public function __construct() ->setPossibleLength([8]); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('4(?:1111|2022)\d{3}|4(?:[04]\d\d|14[0-6]|999)\d{4}') + ->setNationalNumberPattern('4(?:(?:[014]\d\d|999)\d|2022)\d{3}') ->setExampleNumber('44123456') ->setPossibleLength([8]); $this->numberFormat = [ diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_RE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_RE.php index 743722455..ade6e18bb 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_RE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_RE.php @@ -40,7 +40,7 @@ public function __construct() ->setNationalNumberPattern('89[1-37-9]\d{6}') ->setExampleNumber('891123456'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('26(?:2\d\d|3(?:0\d|1[0-6]))\d{4}') + ->setNationalNumberPattern('2631[0-6]\d{4}|26(?:2\d|30|88)\d{5}') ->setExampleNumber('262161234'); $this->numberFormat = [ (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_RU.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_RU.php index 5726f5e0f..68591cd6f 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_RU.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_RU.php @@ -22,6 +22,7 @@ class PhoneNumberMetadata_RU extends PhoneMetadata { protected const ID = 'RU'; protected const COUNTRY_CODE = 7; + protected const LEADING_DIGITS = '[3489]'; protected const NATIONAL_PREFIX = '8'; protected ?string $nationalPrefixForParsing = '8'; @@ -45,7 +46,7 @@ public function __construct() ->setExampleNumber('8091234567') ->setPossibleLength([10]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('336(?:[013-9]\d|2[013-9])\d{5}|(?:3(?:0[12]|4[1-35-79]|5[1-3]|65|8[1-58]|9[0145])|4(?:01|1[1356]|2[13467]|7[1-5]|8[1-7]|9[1-689])|8(?:1[1-8]|2[01]|3[13-6]|4[0-8]|5[15-7]|6[0-35-79]|7[1-37-9]))\d{7}') + ->setNationalNumberPattern('(?:3(?:0[12]|36|4[1-35-79]|5[1-3]|65|8[1-58]|9[0145])|4(?:01|1[1356]|2[13467]|7[1-5]|8[1-7]|9[1-689])|8(?:1[1-8]|2[01]|3[13-6]|4[0-8]|5[15-7]|6[0-35-79]|7[1-37-9]))\d{7}') ->setExampleNumber('3011234567') ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([10]); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SA.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SA.php index 12767300d..e2b9431ea 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SA.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SA.php @@ -35,7 +35,7 @@ public function __construct() ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([9, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('579[01]\d{5}|5(?:[013-689]\d|7[0-8])\d{6}') + ->setNationalNumberPattern('579[0-8]\d{5}|5(?:[013-689]\d|7[0-8])\d{6}') ->setExampleNumber('512345678') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SE.php index cda0f29be..6b0955583 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SE.php @@ -34,7 +34,7 @@ public function __construct() ->setNationalNumberPattern('(?:[26]\d\d|9)\d{9}|[1-9]\d{8}|[1-689]\d{7}|[1-4689]\d{6}|2\d{5}') ->setPossibleLength([6, 7, 8, 9, 10, 12]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('7[02369]\d{7}') + ->setNationalNumberPattern('7[023689]\d{7}') ->setExampleNumber('701234567') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) 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 eae4dfda3..c0a127f5b 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SG.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SG.php @@ -32,7 +32,7 @@ public function __construct() ->setNationalNumberPattern('(?:(?:1\d|8)\d\d|7000)\d{7}|[3689]\d{7}') ->setPossibleLength([8, 10, 11]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('897[0-5]\d{4}|(?:8(?:0[1-9]|[1-8]\d|9[0-6])|9[0-8]\d)\d{5}') + ->setNationalNumberPattern('80[1-9]\d{5}|(?:8[1-9]|9[0-8])\d{6}') ->setExampleNumber('81234567') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SI.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SI.php index 5bd23d4d8..0113d38a0 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SI.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SI.php @@ -35,7 +35,7 @@ public function __construct() ->setNationalNumberPattern('[1-7]\d{7}|8\d{4,7}|90\d{4,6}') ->setPossibleLength([5, 6, 7, 8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('65(?:[178]\d|5[56]|6[01])\d{4}|(?:[37][01]|4[0139]|51|6[489])\d{6}') + ->setNationalNumberPattern('65(?:[178]\d|5[56]|6[01])\d{4}|(?:[37][01]|4[013]|51|6[489])\d{6}') ->setExampleNumber('31234567') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) @@ -62,7 +62,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{3})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[37][01]|4[0139]|51|6']) + ->setLeadingDigitsPattern(['[37][01]|4[013]|51|6']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) 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 678204ad1..fc194e5eb 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SJ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SJ.php @@ -31,7 +31,7 @@ public function __construct() ->setNationalNumberPattern('0\d{4}|(?:[489]\d|79)\d{6}') ->setPossibleLength([5, 8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:4[015-8]|9\d)\d{6}') + ->setNationalNumberPattern('(?:4[015-9]|9\d)\d{6}') ->setExampleNumber('41234567') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SK.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SK.php index 51ad6f0f9..5ecc27a2a 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SK.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SK.php @@ -65,7 +65,7 @@ public function __construct() ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d)(\d{3})(\d{3})(\d{2})') - ->setFormat('$1/$2 $3 $4') + ->setFormat('$1 $2 $3 $4') ->setLeadingDigitsPattern(['2']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), @@ -77,7 +77,7 @@ public function __construct() ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{2})(\d{2})') - ->setFormat('$1/$2 $3 $4') + ->setFormat('$1 $2 $3 $4') ->setLeadingDigitsPattern(['[3-5]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), @@ -122,7 +122,7 @@ public function __construct() ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d)(\d{3})(\d{3})(\d{2})') - ->setFormat('$1/$2 $3 $4') + ->setFormat('$1 $2 $3 $4') ->setLeadingDigitsPattern(['2']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), @@ -134,7 +134,7 @@ public function __construct() ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{2})(\d{2})') - ->setFormat('$1/$2 $3 $4') + ->setFormat('$1 $2 $3 $4') ->setLeadingDigitsPattern(['[3-5]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SL.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SL.php index 596cd9fc1..85e165e0f 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SL.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SL.php @@ -34,7 +34,7 @@ public function __construct() ->setPossibleLengthLocalOnly([6]) ->setPossibleLength([8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:25|3[0-5]|66|7[1-9]|8[08]|9[09])\d{6}') + ->setNationalNumberPattern('(?:25|3[0-5]|66|7\d|8[08]|9[09])\d{6}') ->setExampleNumber('25123456'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) 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 cdc96ac05..2d218ba7d 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SN.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SN.php @@ -31,7 +31,7 @@ public function __construct() ->setNationalNumberPattern('(?:[378]\d|93)\d{7}') ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('7(?:(?:[06-8]\d|[19]0|21)\d|5(?:0[01]|[19]0|2[25]|3[356]|[4-7]\d|8[35]))\d{5}') + ->setNationalNumberPattern('7(?:[015-8]\d|21|90)\d{6}') ->setExampleNumber('701234567'); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('88[4689]\d{6}') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SO.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SO.php index d07191a37..f8d766b35 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SO.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SO.php @@ -33,7 +33,7 @@ public function __construct() ->setNationalNumberPattern('[346-9]\d{8}|[12679]\d{7}|[1-5]\d{6}|[1348]\d{5}') ->setPossibleLength([6, 7, 8, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:(?:15|(?:3[59]|4[89]|6\d|7[679]|8[08])\d|9(?:0\d|[2-9]))\d|2(?:4\d|8))\d{5}|(?:[67]\d\d|904)\d{5}') + ->setNationalNumberPattern('(?:(?:15|(?:3[59]|4[89]|6\d|7[0-35-9]|8[08])\d|9(?:0\d|[2-9]))\d|2(?:4\d|8))\d{5}|(?:[67]\d\d|904)\d{5}') ->setExampleNumber('71123456') ->setPossibleLength([7, 8, 9]); $this->premiumRate = PhoneNumberDesc::empty(); @@ -58,19 +58,19 @@ public function __construct() ->setLeadingDigitsPattern(['[15]|2[0-79]|3[0-46-8]|4[0-7]']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) - ->setPattern('(\d)(\d{7})') + ->setPattern('(\d{2})(\d{5,7})') ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['(?:2|90)4|[67]']) + ->setLeadingDigitsPattern(['1|28|9[2-9]']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) - ->setPattern('(\d{3})(\d{3})(\d{3})') - ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[348]|64|79|90']) + ->setPattern('(\d)(\d{7})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['[267]|904']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) - ->setPattern('(\d{2})(\d{5,7})') - ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['1|28|6[0-35-9]|7[67]|9[2-9]']) + ->setPattern('(\d{2})(\d{3})(\d{4})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['[346-9]']) ->setNationalPrefixOptionalWhenFormatting(false), ]; $this->tollFree = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SR.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SR.php index 9dc149623..4de109449 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SR.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SR.php @@ -28,10 +28,10 @@ class PhoneNumberMetadata_SR extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[2-5]|68|[78]\d|90)\d{5}') + ->setNationalNumberPattern('(?:[2-5]|[6-9]\d)\d{5}') ->setPossibleLength([6, 7]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:7[124-7]|8[1-9])\d{5}') + ->setNationalNumberPattern('(?:6[08]|7[1-7]|8[1-9])\d{5}') ->setExampleNumber('7412345') ->setPossibleLength([7]); $this->premiumRate = (new PhoneNumberDesc()) @@ -39,8 +39,9 @@ public function __construct() ->setExampleNumber('9012345') ->setPossibleLength([7]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:2[1-3]|3[0-7]|(?:4|68)\d|5[2-58])\d{4}') - ->setExampleNumber('211234'); + ->setNationalNumberPattern('(?:2[1-3]|3[0-7]|4\d|5[2-578])\d{4}') + ->setExampleNumber('211234') + ->setPossibleLength([6]); $this->numberFormat = [ (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{2})') @@ -65,9 +66,8 @@ public function __construct() $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = PhoneNumberDesc::empty(); $this->voip = (new PhoneNumberDesc()) - ->setNationalNumberPattern('56\d{4}') - ->setExampleNumber('561234') - ->setPossibleLength([6]); + ->setNationalNumberPattern('(?:56|91\d)\d{4}') + ->setExampleNumber('561234'); $this->pager = PhoneNumberDesc::empty(); $this->uan = PhoneNumberDesc::empty(); $this->voicemail = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SV.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SV.php index c32a096b8..5dcedc5f2 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SV.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SV.php @@ -28,10 +28,10 @@ class PhoneNumberMetadata_SV extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[267]\d{7}|(?:80\d|900)\d{4}(?:\d{4})?') + ->setNationalNumberPattern('[25-7]\d{7}|(?:80\d|900)\d{4}(?:\d{4})?') ->setPossibleLength([7, 8, 11]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[67]\d{7}') + ->setNationalNumberPattern('[5-7]\d{7}') ->setExampleNumber('70123456') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) @@ -51,7 +51,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{4})(\d{4})') ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['[267]']) + ->setLeadingDigitsPattern(['[25-7]']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{3})(\d{4})(\d{4})') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SX.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SX.php index 0408b14be..2d1c5050a 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SX.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SX.php @@ -36,14 +36,14 @@ public function __construct() ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('7215(?:1[02]|2\d|5[034679]|8[014-8])\d{4}') + ->setNationalNumberPattern('7215(?:1[02]|2\d|5[034679]|8[0-24-8])\d{4}') ->setExampleNumber('7215205678') ->setPossibleLengthLocalOnly([7]); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('900[2-9]\d{6}') ->setExampleNumber('9002123456'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('7215(?:4[2-8]|8[239]|9[056])\d{4}') + ->setNationalNumberPattern('7215(?:4[2-8]|8[39]|9[056])\d{4}') ->setExampleNumber('7215425678') ->setPossibleLengthLocalOnly([7]); $this->tollFree = (new PhoneNumberDesc()) @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002123456'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SY.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SY.php index 121e54ab5..232941bc0 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SY.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SY.php @@ -30,11 +30,11 @@ class PhoneNumberMetadata_SY extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[1-39]\d{8}|[1-5]\d{7}') + ->setNationalNumberPattern('[1-359]\d{8}|[1-5]\d{7}') ->setPossibleLengthLocalOnly([6, 7]) ->setPossibleLength([8, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('9[1-9]\d{7}') + ->setNationalNumberPattern('(?:50|9[1-9])\d{7}') ->setExampleNumber('944567890') ->setPossibleLength([9]); $this->premiumRate = PhoneNumberDesc::empty(); @@ -46,13 +46,13 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{3,4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[1-5]']) + ->setLeadingDigitsPattern(['[1-4]|5[1-3]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) ->setPattern('(\d{3})(\d{3})(\d{3})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['9']) + ->setLeadingDigitsPattern(['[59]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), ]; diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SZ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SZ.php index a5cbdefdf..73701f420 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SZ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SZ.php @@ -31,7 +31,7 @@ public function __construct() ->setNationalNumberPattern('0800\d{4}|(?:[237]\d|900)\d{6}') ->setPossibleLength([8, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('7[6-9]\d{6}') + ->setNationalNumberPattern('7[5-9]\d{6}') ->setExampleNumber('76123456') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TC.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TC.php index 74207b4ab..9cb44600c 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TC.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TC.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002345678'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = (new PhoneNumberDesc()) ->setNationalNumberPattern('649(?:71[01]|966)\d{4}') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TD.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TD.php index 4b637f8a8..d336b6cf8 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TD.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TD.php @@ -29,10 +29,10 @@ class PhoneNumberMetadata_TD extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:22|30|[689]\d|77)\d{6}') + ->setNationalNumberPattern('(?:22|[3689]\d|77)\d{6}') ->setPossibleLength([8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:30|[69]\d|77|8[56])\d{6}') + ->setNationalNumberPattern('(?:3[01]|[69]\d|77|8[5-7])\d{6}') ->setExampleNumber('63012345'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TG.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TG.php index f2d626617..be972a7e1 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TG.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TG.php @@ -31,7 +31,7 @@ public function __construct() ->setNationalNumberPattern('[279]\d{7}') ->setPossibleLength([8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:7[0-29]|9[0-36-9])\d{6}') + ->setNationalNumberPattern('(?:7[0-289]|9[0-36-9])\d{6}') ->setExampleNumber('90112345'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TH.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TH.php index f85dfe1cc..e64a89b38 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TH.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TH.php @@ -34,7 +34,7 @@ public function __construct() ->setNationalNumberPattern('(?:001800|[2-57]|[689]\d)\d{7}|1\d{7,9}') ->setPossibleLength([8, 9, 10, 13]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('67(?:1[0-8]|2[4-7])\d{5}|(?:14|6[1-6]|[89]\d)\d{7}') + ->setNationalNumberPattern('(?:(?:14|[89]\d)\d\d|6(?:[1-6]\d\d|7(?:1[0-8]|2[4-7]|3[1-6])))\d{5}') ->setExampleNumber('812345678') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TJ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TJ.php index 0761df066..d9cc75970 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TJ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TJ.php @@ -29,11 +29,11 @@ class PhoneNumberMetadata_TJ extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[0-57-9]\d{8}') + ->setNationalNumberPattern('(?:[0-57-9]\d|66)\d{7}') ->setPossibleLengthLocalOnly([3, 5, 6, 7]) ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:33[03-9]|4(?:1[18]|4[02-479])|81[1-9])\d{6}|(?:[09]\d|1[0-27-9]|2[0-27]|[34]0|5[05]|7[01578]|8[078])\d{7}') + ->setNationalNumberPattern('(?:33[03-9]|4(?:1[18]|4[02-479])|81[1-9])\d{6}|(?:[09]\d|1[0-27-9]|2[0-27]|3[08]|40|5[05]|66|7[0157-9]|8[07-9])\d{7}') ->setExampleNumber('917123456'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) @@ -59,7 +59,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[0-57-9]']) + ->setLeadingDigitsPattern(['\d']) ->setNationalPrefixOptionalWhenFormatting(false), ]; $this->tollFree = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TM.php index 63f106012..a6786e4f3 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TM.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TM.php @@ -31,10 +31,10 @@ class PhoneNumberMetadata_TM extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[1-6]\d|71)\d{6}') + ->setNationalNumberPattern('[1-7]\d{7}') ->setPossibleLength([8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:6\d|71)\d{6}') + ->setNationalNumberPattern('(?:6\d|7[12])\d{6}') ->setExampleNumber('66123456'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TR.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TR.php index f3bbd4a2c..42fb29d9b 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TR.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TR.php @@ -34,7 +34,7 @@ public function __construct() ->setNationalNumberPattern('4\d{6}|8\d{11,12}|(?:[2-58]\d\d|900)\d{7}') ->setPossibleLength([7, 10, 12, 13]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('561(?:011|61\d)\d{4}|5(?:0[15-7]|1[06]|24|[34]\d|5[1-59]|9[46])\d{7}') + ->setNationalNumberPattern('561(?:011|61\d)\d{4}|5(?:[03-5]\d|1[06]|24|6[24]|7[245]|9[46])\d{7}') ->setExampleNumber('5012345678') ->setPossibleLength([10]); $this->premiumRate = (new PhoneNumberDesc()) @@ -42,7 +42,7 @@ public function __construct() ->setExampleNumber('9001234567') ->setPossibleLength([10]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:2(?:[13][26]|[28][2468]|[45][268]|[67][246])|3(?:[13][28]|[24-6][2468]|[78][02468]|92)|4(?:[16][246]|[23578][2468]|4[26]))\d{7}') + ->setNationalNumberPattern('(?:2(?:1[26]|[28][2468]|[3-5][268]|[67][246])|3(?:[13][28]|[24-6][2468]|[78][02468]|92)|4(?:[16][246]|[23578][2468]|4[26]))\d{7}') ->setExampleNumber('2123456789') ->setPossibleLength([10]); $this->numberFormat = [ @@ -60,7 +60,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{3})(\d{3})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['5(?:[0-59]|61)', '5(?:[0-59]|61[06])', '5(?:[0-59]|61[06]1)']) + ->setLeadingDigitsPattern(['5[0-79]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) @@ -111,7 +111,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{3})(\d{3})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['5(?:[0-59]|61)', '5(?:[0-59]|61[06])', '5(?:[0-59]|61[06]1)']) + ->setLeadingDigitsPattern(['5[0-79]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TT.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TT.php index 269da473c..727d9ae3d 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TT.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TT.php @@ -47,11 +47,11 @@ public function __construct() ->setExampleNumber('8682211234') ->setPossibleLengthLocalOnly([7]); $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('8(?:00|33|44|55|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('868800\d{4}|8(?:00|33|44|55|66|77|88)[2-9]\d{6}') ->setExampleNumber('8002345678'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TW.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TW.php index e698c3821..71cedd024 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TW.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TW.php @@ -53,16 +53,34 @@ public function __construct() ->setLeadingDigitsPattern(['202']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{5})') + ->setFormat('$1 $2') + ->setLeadingDigitsPattern(['826']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{3})(\d{2})(\d{3})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['83']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), + (new NumberFormat()) + ->setPattern('(\d{2})(\d{2})(\d{4})') + ->setFormat('$1 $2 $3') + ->setLeadingDigitsPattern(['82']) + ->setNationalPrefixFormattingRule('0$1') + ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{3,4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[258]0']) + ->setLeadingDigitsPattern(['[25]0|37|49|8[09]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d)(\d{3,4})(\d{4})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[23568]|4(?:0[02-48]|[1-47-9])|7[1-9]', '[23568]|4(?:0[2-48]|[1-47-9])|(?:400|7)[1-9]']) + ->setLeadingDigitsPattern(['[23568]|4(?:0[02-48]|[1-478])|7[1-9]', '[23568]|4(?:0[2-48]|[1-478])|(?:400|7)[1-9]']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TZ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TZ.php index 0d478d71d..b9a5cbe5b 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TZ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TZ.php @@ -33,7 +33,7 @@ public function __construct() ->setNationalNumberPattern('(?:[25-8]\d|41|90)\d{7}') ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:6[125-9]|7[13-9])\d{7}') + ->setNationalNumberPattern('(?:6[1-35-9]|7\d)\d{7}') ->setExampleNumber('621234567'); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('90\d{7}') 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 9490a416a..61b335eae 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UG.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UG.php @@ -34,7 +34,7 @@ public function __construct() ->setPossibleLengthLocalOnly([5, 6, 7]) ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('72[48]0\d{5}|7(?:[014-8]\d|2[067]|36|9[0189])\d{6}') + ->setNationalNumberPattern('7280\d{5}|7(?:[014-8]\d|2[01467]|3[0167]|9[0-589])\d{6}') ->setExampleNumber('712345678'); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('90[1-3]\d{6}') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_US.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_US.php index f3fe7fbe6..15b0b5e0e 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_US.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_US.php @@ -37,14 +37,14 @@ public function __construct() ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:3052(?:0[0-8]|[1-9]\d)|5056(?:[0-35-9]\d|4[0-68]))\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|983[2-47-9])\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[0378]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-3589]|8[04-69]))[2-9]\d{6}') + ->setNationalNumberPattern('(?:472[2-47-9]|983[2-57-9])\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[02469]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013-79]|3[0-24679]|4[167]|5[0-3]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-269])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-2478]|4[0378]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-3589]|8[04-69]))[2-9]\d{6}') ->setExampleNumber('2015550123') ->setPossibleLengthLocalOnly([7]); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('900[2-9]\d{6}') ->setExampleNumber('9002345678'); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:3052(?:0[0-8]|[1-9]\d)|5056(?:[0-35-9]\d|4[0-68]))\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|983[2-47-9])\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[0378]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-3589]|8[04-69]))[2-9]\d{6}') + ->setNationalNumberPattern('(?:472[2-47-9]|983[2-57-9])\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[02469]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013-79]|3[0-24679]|4[167]|5[0-3]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-269])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-2478]|4[0378]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-3589]|8[04-69]))[2-9]\d{6}') ->setExampleNumber('2015550123') ->setPossibleLengthLocalOnly([7]); $this->numberFormat = [ @@ -69,12 +69,9 @@ public function __construct() ->setExampleNumber('8002345678'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); - $this->voip = (new PhoneNumberDesc()) - ->setNationalNumberPattern('305209\d{4}') - ->setExampleNumber('3052090123') - ->setPossibleLengthLocalOnly([7]); + $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); $this->uan = PhoneNumberDesc::empty(); $this->voicemail = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UY.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UY.php index 04ce6250b..02263641e 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UY.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UY.php @@ -32,8 +32,8 @@ class PhoneNumberMetadata_UY extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('0004\d{2,9}|[1249]\d{7}|(?:[49]\d|80)\d{5}') - ->setPossibleLength([6, 7, 8, 9, 10, 11, 12, 13]); + ->setNationalNumberPattern('0004\d{2,9}|[1249]\d{7}|2\d{3,4}|(?:[49]\d|80)\d{5}') + ->setPossibleLength([4, 5, 6, 7, 8, 9, 10, 11, 12, 13]); $this->mobile = (new PhoneNumberDesc()) ->setNationalNumberPattern('9[1-9]\d{6}') ->setExampleNumber('94231234') @@ -48,6 +48,11 @@ public function __construct() ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([8]); $this->numberFormat = [ + (new NumberFormat()) + ->setPattern('(\d{4,5})') + ->setFormat('$1') + ->setLeadingDigitsPattern(['21']) + ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{3})(\d{3,4})') ->setFormat('$1 $2') @@ -83,12 +88,16 @@ public function __construct() ]; $this->tollFree = (new PhoneNumberDesc()) ->setNationalNumberPattern('0004\d{2,9}|(?:405|80[05])\d{4}') - ->setExampleNumber('8001234'); + ->setExampleNumber('8001234') + ->setPossibleLength([6, 7, 8, 9, 10, 11, 12, 13]); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = PhoneNumberDesc::empty(); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); - $this->uan = PhoneNumberDesc::empty(); + $this->uan = (new PhoneNumberDesc()) + ->setNationalNumberPattern('21\d{2,3}') + ->setExampleNumber('21123') + ->setPossibleLength([4, 5]); $this->voicemail = PhoneNumberDesc::empty(); $this->noInternationalDialling = PhoneNumberDesc::empty(); } 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 84bd2d90f..24f78fd99 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UZ.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UZ.php @@ -31,11 +31,11 @@ public function __construct() ->setNationalNumberPattern('(?:20|33|[5-9]\d)\d{7}') ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:(?:[25]0|33|8[78]|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}|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}') + ->setNationalNumberPattern('(?:(?:[25]0|33|8[078]|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}|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}') ->setExampleNumber('912345678'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?: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])|[168]\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}') + ->setNationalNumberPattern('(?: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(?:[168]\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}') ->setExampleNumber('669050123'); $this->numberFormat = [ (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VC.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VC.php index e3fbe2ba9..5eb70ba8e 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VC.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VC.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002345678'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = (new PhoneNumberDesc()) ->setNationalNumberPattern('78451[0-2]\d{4}') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VG.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VG.php index 0df3a41cc..647ad7650 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VG.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VG.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002345678'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VI.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VI.php index e099abdcb..62b1db7ca 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VI.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VI.php @@ -51,7 +51,7 @@ public function __construct() ->setExampleNumber('8002345678'); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = (new PhoneNumberDesc()) - ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\d{6}') + ->setNationalNumberPattern('52(?:3(?:[2-46-9][02-9]\d|5(?:[02-46-9]\d|5[0-46-9]))|4(?:[2-478][02-9]\d|5(?:[034]\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\d)|9(?:[05-9]\d|2[0-5]|49)))\d{4}|52[34][2-9]1[02-9]\d{4}|5(?:00|2[125-9]|3[23]|44|66|77|88)[2-9]\d{6}') ->setExampleNumber('5002345678'); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VN.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VN.php index 06db1e7c2..acfe5544f 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VN.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VN.php @@ -30,10 +30,10 @@ class PhoneNumberMetadata_VN extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[12]\d{9}|[135-9]\d{8}|[16]\d{7}|[16-8]\d{6}') + ->setNationalNumberPattern('[12]\d{9}|[135-9]\d{8}|[16]\d{6,7}|7\d{6}') ->setPossibleLength([7, 8, 9, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:5(?:2[238]|59)|89[6-9]|99[013-9])\d{6}|(?:3\d|5[1689]|7[06-9]|8[1-8]|9[0-8])\d{7}') + ->setNationalNumberPattern('121[0-3]\d{5}|(?:160|(?:3\d|7[06-9])\d|5(?:[1689]\d|2[238]|59)|8(?:[1-8]\d|9[6-9])|9(?:[0-8]\d|9[013-9]))\d{6}') ->setExampleNumber('912345678') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) @@ -51,12 +51,6 @@ public function __construct() ->setLeadingDigitsPattern(['[17]99']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), - (new NumberFormat()) - ->setPattern('(\d{2})(\d{5})') - ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['80']) - ->setNationalPrefixFormattingRule('0$1') - ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) ->setPattern('(\d{3})(\d{4,5})') ->setFormat('$1 $2') @@ -66,12 +60,12 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{4})(\d{4,6})') ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['1']) + ->setLeadingDigitsPattern(['1(?:2[02]|[89])']) ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['6']) + ->setLeadingDigitsPattern(['1[26]|6']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) @@ -105,7 +99,7 @@ public function __construct() ->setPossibleLength([9]); $this->pager = PhoneNumberDesc::empty(); $this->uan = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[17]99|80\d)\d{4}|69\d{5,6}') + ->setNationalNumberPattern('[17]99\d{4}|69\d{5,6}') ->setExampleNumber('1992000') ->setPossibleLength([7, 8]); $this->voicemail = PhoneNumberDesc::empty(); @@ -113,21 +107,15 @@ public function __construct() ->setNationalNumberPattern('[17]99\d{4}|69\d{5,6}') ->setPossibleLength([7, 8]); $this->intlNumberFormat = [ - (new NumberFormat()) - ->setPattern('(\d{2})(\d{5})') - ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['80']) - ->setNationalPrefixFormattingRule('0$1') - ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) ->setPattern('(\d{4})(\d{4,6})') ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['1']) + ->setLeadingDigitsPattern(['1(?:2[02]|[89])']) ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) ->setPattern('(\d{2})(\d{3})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['6']) + ->setLeadingDigitsPattern(['1[26]|6']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(true), (new NumberFormat()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VU.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VU.php index ebb3fe61c..a483e6351 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VU.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_VU.php @@ -31,7 +31,7 @@ public function __construct() ->setNationalNumberPattern('[57-9]\d{6}|(?:[238]\d|48)\d{3}') ->setPossibleLength([5, 7]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[58]\d|7[013-7])\d{5}') + ->setNationalNumberPattern('(?:[58]\d|7[0-7])\d{5}') ->setExampleNumber('5912345') ->setPossibleLength([7]); $this->premiumRate = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_YT.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_YT.php index 954ac8dff..2a1ea2d5c 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_YT.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_YT.php @@ -29,14 +29,14 @@ class PhoneNumberMetadata_YT extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('7093\d{5}|(?:80|9\d)\d{7}|(?:26|63)9\d{6}') + ->setNationalNumberPattern('(?:639\d|7093)\d{5}|(?:26|80|9\d)\d{7}') ->setPossibleLength([9]); $this->mobile = (new PhoneNumberDesc()) ->setNationalNumberPattern('(?:639(?:0[0-79]|1[019]|[267]\d|3[09]|40|5[05-9]|9[04-79])|7093[5-7])\d{4}') ->setExampleNumber('639012345'); $this->premiumRate = PhoneNumberDesc::empty(); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('269(?:0[0-467]|15|5[0-4]|6\d|[78]0)\d{4}') + ->setNationalNumberPattern('26(?:89\d|9(?:0[0-467]|15|5[0-4]|6\d|[78]0))\d{4}') ->setExampleNumber('269601234'); $this->tollFree = (new PhoneNumberDesc()) ->setNationalNumberPattern('80\d{7}') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ZA.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ZA.php index 08965d1b5..43ebb9143 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ZA.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ZA.php @@ -34,7 +34,7 @@ public function __construct() ->setNationalNumberPattern('[1-79]\d{8}|8\d{4,9}') ->setPossibleLength([5, 6, 7, 8, 9, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:1(?:3492[0-25]|4495[0235]|549(?:20|5[01]))|4[34]492[01])\d{3}|8[1-4]\d{3,7}|(?:2[27]|47|54)4950\d{3}|(?:1(?:049[2-4]|9[12]\d\d)|(?:50[0-2]|6\d\d|7(?:[0-46-9]\d|5[0-4]))\d\d|8(?:5\d{3}|7(?:08[67]|158|28[5-9]|310)))\d{4}|(?:1[6-8]|28|3[2-69]|4[025689]|5[36-8])4920\d{3}|(?:12|[2-5]1)492\d{4}') + ->setNationalNumberPattern('(?:1(?:3492[0-25]|4495[0235]|549(?:20|5[01]))|4[34]492[01])\d{3}|8[1-4]\d{3,7}|(?:2[27]|47|54)4950\d{3}|(?:1(?:049[2-4]|9[12]\d\d)|(?:50[0-2]|[67]\d\d)\d\d|8(?:5\d{3}|7(?:08[67]|158|28[5-9]|310)))\d{4}|(?:1[6-8]|28|3[2-69]|4[025689]|5[36-8])4920\d{3}|(?:12|[2-5]1)492\d{4}') ->setExampleNumber('711234567') ->setPossibleLength([5, 6, 7, 8, 9]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ZW.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ZW.php index 0c0796ac1..eb10ec322 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ZW.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ZW.php @@ -34,7 +34,7 @@ public function __construct() ->setPossibleLengthLocalOnly([3, 4]) ->setPossibleLength([5, 6, 7, 8, 9, 10]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('7(?:[1278]\d|3[1-9])\d{6}') + ->setNationalNumberPattern('7(?:[1278]\d|3[1-9]|9[01])\d{6}') ->setExampleNumber('712345678') ->setPossibleLength([9]); $this->premiumRate = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_BL.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_BL.php index 66974b173..4f615dd75 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_BL.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_BL.php @@ -27,17 +27,22 @@ class ShortNumberMetadata_BL extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1\d') - ->setPossibleLength([2]); - $this->premiumRate = PhoneNumberDesc::empty(); + ->setNationalNumberPattern('[13]\d(?:\d\d(?:\d{2})?)?') + ->setPossibleLength([2, 4, 6]); + $this->premiumRate = (new PhoneNumberDesc()) + ->setNationalNumberPattern('3[2469]\d\d') + ->setExampleNumber('3200') + ->setPossibleLength([4]); $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('18') - ->setExampleNumber('18'); + ->setNationalNumberPattern('18|3(?:00|1[0-689])\d') + ->setExampleNumber('18') + ->setPossibleLength([2, 4]); $this->emergency = (new PhoneNumberDesc()) ->setNationalNumberPattern('18') - ->setExampleNumber('18'); + ->setExampleNumber('18') + ->setPossibleLength([2]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('18') + ->setNationalNumberPattern('18|3(?:00[0-79]|1[0-689]\d)|(?:118[02-9]|3[2469])\d\d') ->setExampleNumber('18'); $this->standard_rate = PhoneNumberDesc::empty(); $this->carrierSpecific = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_CH.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_CH.php index 0ec2438f8..95423a71e 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_CH.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_CH.php @@ -34,7 +34,7 @@ public function __construct() ->setExampleNumber('543') ->setPossibleLength([3, 4, 5]); $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:1(?:[278]|6\d{3})|4[47])|5200') + ->setNationalNumberPattern('1(?:1(?:[278]|6\d{3})|4[247])|5200') ->setExampleNumber('112') ->setPossibleLength([3, 4, 6]); $this->emergency = (new PhoneNumberDesc()) @@ -42,7 +42,7 @@ public function __construct() ->setExampleNumber('112') ->setPossibleLength([3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:0[78]\d\d|1(?:[278]|45|6(?:000|111))|4(?:[03-57]|1[0145])|6(?:00|[1-46])|8(?:02|1[189]|[25]0|7|8[08]|99))|[2-9]\d{2,4}') + ->setNationalNumberPattern('1(?:0[78]\d\d|1(?:[278]|45|6(?:000|111))|4(?:[02-57]|1[0145])|6(?:00|[1-46])|8(?:02|1[189]|[25]0|7|8[08]|99))|[2-9]\d{2,4}') ->setExampleNumber('112'); $this->standard_rate = (new PhoneNumberDesc()) ->setNationalNumberPattern('1(?:4[035]|6[1-46])|1(?:41|60)\d') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_DE.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_DE.php index c613080aa..1b4179a33 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_DE.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_DE.php @@ -27,7 +27,7 @@ class ShortNumberMetadata_DE extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[137]\d{2,5}') + ->setNationalNumberPattern('[1-46-8]\d{2,5}') ->setPossibleLength([3, 4, 5, 6]); $this->premiumRate = PhoneNumberDesc::empty(); $this->tollFree = (new PhoneNumberDesc()) @@ -39,16 +39,16 @@ public function __construct() ->setExampleNumber('110') ->setPossibleLength([3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('11(?:[025]|6(?:00[06]|1(?:1[167]|23))|800\d)|3311|7464|118\d\d') + ->setNationalNumberPattern('11(?:[025]|6(?:00[06]|1(?:1[167]|23))|800\d)|22(?:044|5(?:43|80)|7700|922)|33(?:11|3[34])|44844|600\d\d|7(?:0\d{3}|464)|80808|118\d\d') ->setExampleNumber('110'); $this->standard_rate = PhoneNumberDesc::empty(); $this->carrierSpecific = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:331|746)\d') + ->setNationalNumberPattern('(?:33[13]|746)\d|(?:22(?:[059]|7\d)|(?:44|80)8|600|70\d)\d\d') ->setExampleNumber('3310') - ->setPossibleLength([4]); + ->setPossibleLength([4, 5, 6]); $this->smsServices = (new PhoneNumberDesc()) - ->setNationalNumberPattern('746\d') - ->setExampleNumber('7460') - ->setPossibleLength([4]); + ->setNationalNumberPattern('(?:333|746)\d|(?:22(?:[059]|7\d)|(?:44|80)8|600|70\d)\d\d') + ->setExampleNumber('3330') + ->setPossibleLength([4, 5, 6]); } } diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_ES.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_ES.php index 2fed858b0..e82fdcc32 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_ES.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_ES.php @@ -33,7 +33,7 @@ public function __construct() ->setNationalNumberPattern('[12]2\d{1,4}|90(?:5\d|7)|(?:118|2(?:[357]\d|80)|3[357]\d)\d\d|[79]9[57]\d{3}') ->setExampleNumber('120'); $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('0(?:16|6[57]|8[58])|1(?:006|12|[3-7]\d\d)|(?:116|20\d)\d{3}') + ->setNationalNumberPattern('0(?:16|20|6[57]|8[58])|1(?:006|12|[3-7]\d\d)|(?:116|20\d)\d{3}') ->setExampleNumber('016') ->setPossibleLength([3, 4, 6]); $this->emergency = (new PhoneNumberDesc()) @@ -41,10 +41,10 @@ public function __construct() ->setExampleNumber('085') ->setPossibleLength([3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('0(?:1[0-26]|6[0-257]|8[058]|9[12])|1(?:0[03-57]\d{1,3}|1(?:2|6(?:000|111)|8\d\d)|2\d{1,4}|[3-9]\d\d)|2(?:2\d{1,4}|80\d\d)|90(?:5[124578]|7)|1(?:3[34]|77)|(?:2[01]\d|[79]9[57])\d{3}|[23][357]\d{3}') + ->setNationalNumberPattern('0(?:1[0-267]|2[0148]|6[0-257]|8[058]|9[12])|1(?:0[03-57]\d{1,3}|1(?:2|6(?:000|111)|8\d\d)|2\d{1,4}|[3-9]\d\d)|2(?:2\d{1,4}|80\d\d)|90(?:5[124578]|7)|1(?:3[34]|77)|(?:2[01]\d|[79]9[57])\d{3}|[23][357]\d{3}') ->setExampleNumber('010'); $this->standard_rate = (new PhoneNumberDesc()) - ->setNationalNumberPattern('0(?:[16][0-2]|80|9[12])|21\d{4}') + ->setNationalNumberPattern('0(?:1[0-27]|2[148]|6[0-2]|80|9[12])|21\d{4}') ->setExampleNumber('010') ->setPossibleLength([3, 6]); $this->carrierSpecific = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_FO.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_FO.php index 413fe910f..f1d5db5e6 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_FO.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_FO.php @@ -38,10 +38,13 @@ public function __construct() ->setExampleNumber('112') ->setPossibleLength([3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:1[248]|819)|1(?:4[124]|71|8[7-9])\d') + ->setNationalNumberPattern('11[248]|1(?:4[124]|71|8[17-9]|9\d)\d') ->setExampleNumber('112'); $this->standard_rate = PhoneNumberDesc::empty(); $this->carrierSpecific = PhoneNumberDesc::empty(); - $this->smsServices = PhoneNumberDesc::empty(); + $this->smsServices = (new PhoneNumberDesc()) + ->setNationalNumberPattern('19\d\d') + ->setExampleNumber('1900') + ->setPossibleLength([4]); } } diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_FR.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_FR.php index f1ded9755..71d3b3f55 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_FR.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_FR.php @@ -41,7 +41,7 @@ public function __construct() ->setExampleNumber('15') ->setPossibleLength([2, 3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:0\d\d|1(?:[02459]|6(?:000|111)|8\d{3})|[578]|9[167])|2(?:0(?:00|2)0|24)|[3-8]\d{4}|3\d{3}|6(?:1[14]|34)|7(?:0[06]|22|40)') + ->setNationalNumberPattern('1(?:0\d\d|1(?:[02459]|6(?:00[06]|11[17])|8\d{3})|[578]|9[167])|2(?:0(?:00|2)0|24)|[3-8]\d{4}|3\d{3}|6(?:1[14]|34)|7(?:0[06]|22|40)') ->setExampleNumber('15'); $this->standard_rate = (new PhoneNumberDesc()) ->setNationalNumberPattern('202\d|6(?:1[14]|34)|70[06]') diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_GF.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_GF.php index 239078b40..ac4d369d1 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_GF.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_GF.php @@ -27,17 +27,22 @@ class ShortNumberMetadata_GF extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1\d') - ->setPossibleLength([2]); - $this->premiumRate = PhoneNumberDesc::empty(); + ->setNationalNumberPattern('[13]\d(?:\d\d(?:\d{2})?)?') + ->setPossibleLength([2, 4, 6]); + $this->premiumRate = (new PhoneNumberDesc()) + ->setNationalNumberPattern('3[2469]\d\d') + ->setExampleNumber('3200') + ->setPossibleLength([4]); $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1[578]') - ->setExampleNumber('15'); + ->setNationalNumberPattern('1[578]|3(?:0\d|1[0-689])\d') + ->setExampleNumber('15') + ->setPossibleLength([2, 4]); $this->emergency = (new PhoneNumberDesc()) ->setNationalNumberPattern('1[578]') - ->setExampleNumber('15'); + ->setExampleNumber('15') + ->setPossibleLength([2]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1[578]') + ->setNationalNumberPattern('1[578]|300[0-79]|(?:118[02-9]\d|3(?:0[1-9]|1[0-689]|[2469]\d))\d') ->setExampleNumber('15'); $this->standard_rate = PhoneNumberDesc::empty(); $this->carrierSpecific = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_GP.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_GP.php index d205feedd..b09b2fe0f 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_GP.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_GP.php @@ -27,17 +27,22 @@ class ShortNumberMetadata_GP extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1\d') - ->setPossibleLength([2]); - $this->premiumRate = PhoneNumberDesc::empty(); + ->setNationalNumberPattern('[13]\d(?:\d\d(?:\d{2})?)?') + ->setPossibleLength([2, 4, 6]); + $this->premiumRate = (new PhoneNumberDesc()) + ->setNationalNumberPattern('3[2469]\d\d') + ->setExampleNumber('3200') + ->setPossibleLength([4]); $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1[578]') - ->setExampleNumber('15'); + ->setNationalNumberPattern('1[578]|3(?:00|1[0-689])\d') + ->setExampleNumber('15') + ->setPossibleLength([2, 4]); $this->emergency = (new PhoneNumberDesc()) ->setNationalNumberPattern('1[578]') - ->setExampleNumber('15'); + ->setExampleNumber('15') + ->setPossibleLength([2]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1[578]') + ->setNationalNumberPattern('1[578]|3(?:00[0-79]|1[0-689]\d)|(?:118[02-9]|3[2469])\d\d') ->setExampleNumber('15'); $this->standard_rate = PhoneNumberDesc::empty(); $this->carrierSpecific = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_GY.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_GY.php index 1e6dc9680..8b9b2b029 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_GY.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_GY.php @@ -31,7 +31,7 @@ public function __construct() ->setPossibleLength([3, 4]); $this->premiumRate = PhoneNumberDesc::empty(); $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('91[1-3]') + ->setNationalNumberPattern('91[1-4]') ->setExampleNumber('911') ->setPossibleLength([3]); $this->emergency = (new PhoneNumberDesc()) @@ -39,7 +39,7 @@ public function __construct() ->setExampleNumber('911') ->setPossibleLength([3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('0(?:02|(?:17|80)1|444|7(?:[67]7|9)|9(?:0[78]|[2-47]))|1(?:443|5[568])|91[1-3]') + ->setNationalNumberPattern('0(?:02|(?:17|80)1|444|7(?:[67]7|9)|9(?:0[78]|[2-47]))|1(?:443|5[568])|91[1-4]') ->setExampleNumber('002'); $this->standard_rate = PhoneNumberDesc::empty(); $this->carrierSpecific = (new PhoneNumberDesc()) diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_IT.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_IT.php index 2da2493ab..5106f791e 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_IT.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_IT.php @@ -34,7 +34,7 @@ public function __construct() ->setExampleNumber('1200') ->setPossibleLength([4, 5, 7]); $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:1(?:[2358]|6\d{3})|87)') + ->setNationalNumberPattern('1(?:1(?:[2358]|6\d{3})|46|87)') ->setExampleNumber('112') ->setPossibleLength([3, 6]); $this->emergency = (new PhoneNumberDesc()) @@ -42,7 +42,7 @@ public function __construct() ->setExampleNumber('112') ->setPossibleLength([3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:0\d{2,3}|1(?:[2-57-9]|6(?:000|111))|3[39]|4(?:82|9\d{1,3})|5(?:00|1[58]|2[25]|3[03]|44|[59])|60|8[67]|9(?:[01]|2[2-9]|4\d|696))|4(?:2323|5045)|(?:1(?:2|92[01])|4(?:3(?:[01]|[45]\d\d)|[478](?:[0-4]|[5-9]\d\d)|55))\d\d') + ->setNationalNumberPattern('1(?:0\d{2,3}|1(?:[2-57-9]|6(?:000|111))|3[39]|4(?:82|9\d{1,3})|5(?:00|1[58]|2[25]|3[03]|44|[59])|60|8[67]|9(?:[01]|2[2-9]|4\d|696))|4(?:2323|5045)|14\d|(?:1(?:2|92[01])|4(?:3(?:[01]|[45]\d\d)|[478](?:[0-4]|[5-9]\d\d)|55))\d\d') ->setExampleNumber('112'); $this->standard_rate = PhoneNumberDesc::empty(); $this->carrierSpecific = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_JP.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_JP.php index cac4f43b7..1f84515f7 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_JP.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_JP.php @@ -27,8 +27,8 @@ class ShortNumberMetadata_JP extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[01]\d\d(?:\d{7})?') - ->setPossibleLength([3, 10]); + ->setNationalNumberPattern('[01]\d\d(?:\d{5,7})?') + ->setPossibleLength([3, 8, 9, 10]); $this->premiumRate = PhoneNumberDesc::empty(); $this->tollFree = (new PhoneNumberDesc()) ->setNationalNumberPattern('11[089]') @@ -39,13 +39,13 @@ public function __construct() ->setExampleNumber('110') ->setPossibleLength([3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('000[259]\d{6}|1(?:0[24]|1[089]|44|89)') + ->setNationalNumberPattern('000[2569]\d{4,6}|1(?:0[24]|1[089]|44|89)') ->setExampleNumber('102'); $this->standard_rate = PhoneNumberDesc::empty(); $this->carrierSpecific = PhoneNumberDesc::empty(); $this->smsServices = (new PhoneNumberDesc()) - ->setNationalNumberPattern('000[259]\d{6}') - ->setExampleNumber('0002000000') - ->setPossibleLength([10]); + ->setNationalNumberPattern('000[2569]\d{4,6}') + ->setExampleNumber('00020000') + ->setPossibleLength([8, 9, 10]); } } diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_KR.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_KR.php index 31472eff2..b143c31f1 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_KR.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_KR.php @@ -27,8 +27,8 @@ class ShortNumberMetadata_KR extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1\d{2,4}') - ->setPossibleLength([3, 4, 5]); + ->setNationalNumberPattern('1\d\d(?:\d(?:\d(?:\d{3})?)?)?') + ->setPossibleLength([3, 4, 5, 8]); $this->premiumRate = PhoneNumberDesc::empty(); $this->tollFree = (new PhoneNumberDesc()) ->setNationalNumberPattern('1(?:1[27-9]|28|330|82)') @@ -39,13 +39,16 @@ public function __construct() ->setExampleNumber('112') ->setPossibleLength([3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:[016-9]114|3(?:0[01]|2|3[0-35-9]|45?|5[057]|6[569]|7[79]|8[2589]|9[0189]))|1(?:0[015]|1\d|2[01357-9]|41|8[28])') + ->setNationalNumberPattern('1(?:[01679]114|3(?:0[01]|2|3[0-35-9]|45?|5[057]|6[569]|7[79]|8[2589]|9[0189])|55[15]\d{4}|8(?:(?:11|44|66)\d{4}|[28]))|1(?:0[015]|1\d|2[01357-9]|41|8114)') ->setExampleNumber('100'); $this->standard_rate = PhoneNumberDesc::empty(); $this->carrierSpecific = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:0[01]|1[4-6]|41)|1(?:[06-9]1\d|111)\d') + ->setNationalNumberPattern('1(?:0[01]|1[4-6]|41|8114)|1(?:[0679]1\d|111)\d') ->setExampleNumber('100') ->setPossibleLength([3, 5]); - $this->smsServices = PhoneNumberDesc::empty(); + $this->smsServices = (new PhoneNumberDesc()) + ->setNationalNumberPattern('1(?:55|8[146])\d{5}') + ->setExampleNumber('15500000') + ->setPossibleLength([8]); } } diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_MF.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_MF.php index 3027b4c5f..40a495ef1 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_MF.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_MF.php @@ -27,17 +27,22 @@ class ShortNumberMetadata_MF extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1\d') - ->setPossibleLength([2]); - $this->premiumRate = PhoneNumberDesc::empty(); + ->setNationalNumberPattern('[13]\d(?:\d\d(?:\d{2})?)?') + ->setPossibleLength([2, 4, 6]); + $this->premiumRate = (new PhoneNumberDesc()) + ->setNationalNumberPattern('3[2469]\d\d') + ->setExampleNumber('3200') + ->setPossibleLength([4]); $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1[578]') - ->setExampleNumber('15'); + ->setNationalNumberPattern('1[578]|3(?:00|1[0-689])\d') + ->setExampleNumber('15') + ->setPossibleLength([2, 4]); $this->emergency = (new PhoneNumberDesc()) ->setNationalNumberPattern('1[578]') - ->setExampleNumber('15'); + ->setExampleNumber('15') + ->setPossibleLength([2]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1[578]') + ->setNationalNumberPattern('1[578]|3(?:00[0-79]|1[0-689]\d)|(?:118[02-9]|3[2469])\d\d') ->setExampleNumber('15'); $this->standard_rate = PhoneNumberDesc::empty(); $this->carrierSpecific = PhoneNumberDesc::empty(); diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_PM.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_PM.php index ac7ef9f9d..ce8148de7 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_PM.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_PM.php @@ -34,7 +34,7 @@ public function __construct() ->setExampleNumber('3200') ->setPossibleLength([4]); $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1[578]|3(?:0\d|1[689])\d') + ->setNationalNumberPattern('1[578]|310[0-245]|3(?:0\d|1[1-689])\d') ->setExampleNumber('15') ->setPossibleLength([2, 4]); $this->emergency = (new PhoneNumberDesc()) @@ -42,15 +42,15 @@ public function __construct() ->setExampleNumber('15') ->setPossibleLength([2]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1[578]|31(?:03|[689]\d)|(?:118[02-9]|3[02469])\d\d') + ->setNationalNumberPattern('1[578]|31(?:0[0-5]|[1-689]\d)|(?:118[02-9]|3[02469])\d\d') ->setExampleNumber('15'); $this->standard_rate = (new PhoneNumberDesc()) ->setNationalNumberPattern('118\d{3}') ->setExampleNumber('118000') ->setPossibleLength([6]); $this->carrierSpecific = (new PhoneNumberDesc()) - ->setNationalNumberPattern('310\d') - ->setExampleNumber('3100') + ->setNationalNumberPattern('3103') + ->setExampleNumber('3103') ->setPossibleLength([4]); $this->smsServices = PhoneNumberDesc::empty(); } diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_PY.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_PY.php index 1daede7dd..276250d83 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_PY.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_PY.php @@ -27,20 +27,28 @@ class ShortNumberMetadata_PY extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[19]\d\d') - ->setPossibleLength([3]); + ->setNationalNumberPattern('[12459]\d\d(?:\d{3,4})?') + ->setPossibleLength([3, 6, 7]); $this->premiumRate = PhoneNumberDesc::empty(); $this->tollFree = (new PhoneNumberDesc()) ->setNationalNumberPattern('128|911') - ->setExampleNumber('128'); + ->setExampleNumber('128') + ->setPossibleLength([3]); $this->emergency = (new PhoneNumberDesc()) ->setNationalNumberPattern('128|911') - ->setExampleNumber('128'); + ->setExampleNumber('128') + ->setPossibleLength([3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1[1-9]\d|911') + ->setNationalNumberPattern('[1245][01]\d{5}|(?:1[1-9]|[245]0\d{3})\d|911') ->setExampleNumber('110'); $this->standard_rate = PhoneNumberDesc::empty(); - $this->carrierSpecific = PhoneNumberDesc::empty(); - $this->smsServices = PhoneNumberDesc::empty(); + $this->carrierSpecific = (new PhoneNumberDesc()) + ->setNationalNumberPattern('[1245][01]\d{5}|[245]0\d{4}') + ->setExampleNumber('200000') + ->setPossibleLength([6, 7]); + $this->smsServices = (new PhoneNumberDesc()) + ->setNationalNumberPattern('[1245][01]\d{5}|[245]0\d{4}') + ->setExampleNumber('200000') + ->setPossibleLength([6, 7]); } } diff --git a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_RO.php b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_RO.php index fef0b6f7d..103f2601d 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_RO.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_RO.php @@ -34,7 +34,7 @@ public function __construct() ->setExampleNumber('1200') ->setPossibleLength([4, 6]); $this->tollFree = (new PhoneNumberDesc()) - ->setNationalNumberPattern('11(?:2|6\d{3})') + ->setNationalNumberPattern('11(?:[23]|6\d{3})') ->setExampleNumber('112') ->setPossibleLength([3, 6]); $this->emergency = (new PhoneNumberDesc()) @@ -42,13 +42,13 @@ public function __construct() ->setExampleNumber('112') ->setPossibleLength([3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:1(?:2|6(?:000|1(?:11|23))|8(?:(?:01|8[18])1|119|[23]00|932))|[24]\d\d|9(?:0(?:00|19)|1[19]|21|3[02]|5[178]))|8[48]\d\d') + ->setNationalNumberPattern('1(?:1(?:[23]|6(?:000|1(?:11|23))|8(?:(?:01|8[18])1|119|[23]00|932))|[24]\d\d|9(?:0(?:00|19)|1[19]|21|3[02]|5[178]))|8[48]\d\d') ->setExampleNumber('112'); $this->standard_rate = PhoneNumberDesc::empty(); $this->carrierSpecific = PhoneNumberDesc::empty(); $this->smsServices = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:1[24]|8[48])\d\d') - ->setExampleNumber('1200') - ->setPossibleLength([4]); + ->setNationalNumberPattern('113|(?:1[24]|8[48])\d\d') + ->setExampleNumber('113') + ->setPossibleLength([3, 4]); } } 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 1968ed218..a3485bf8c 100644 --- a/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_UY.php +++ b/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_UY.php @@ -27,7 +27,7 @@ class ShortNumberMetadata_UY extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[129]\d{2,4}') + ->setNationalNumberPattern('[19]\d{2,4}') ->setPossibleLength([3, 4, 5]); $this->premiumRate = PhoneNumberDesc::empty(); $this->tollFree = (new PhoneNumberDesc()) @@ -39,7 +39,7 @@ public function __construct() ->setExampleNumber('128') ->setPossibleLength([3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:0[4-9]|1[2368]|2[0-3568]|787|997\d?)|21997|911') + ->setNationalNumberPattern('1(?:0[4-9]|1[2368]|2[0-3568]|787|997\d?)|911') ->setExampleNumber('104'); $this->standard_rate = (new PhoneNumberDesc()) ->setNationalNumberPattern('178\d')