Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

fixup PhoneNumberHelper

Browse Source
This commit is contained in:
Pol Dellaiera 2022-02-22 12:01:29 +01:00
parent d780d95157
commit 68a64aa67f
No known key found for this signature in database
GPG Key ID: D476DFE9C67467CA
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
View File

@ -15,6 +15,7 @@ use GuzzleHttp\Client;
use GuzzleHttp\Exception\ClientException; use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Exception\ConnectException; use GuzzleHttp\Exception\ConnectException;
use GuzzleHttp\Exception\ServerException; use GuzzleHttp\Exception\ServerException;
use libphonenumber\NumberParseException;
use libphonenumber\PhoneNumber; use libphonenumber\PhoneNumber;
use libphonenumber\PhoneNumberFormat; use libphonenumber\PhoneNumberFormat;
use libphonenumber\PhoneNumberUtil; use libphonenumber\PhoneNumberUtil;
@ -71,14 +72,28 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
public function denormalize(string $phoneNumber): string public function denormalize(string $phoneNumber): string
{ {
$phoneUtil = PhoneNumberUtil::getInstance(); $phoneUtil = PhoneNumberUtil::getInstance();
$phoneNumber = $phoneUtil->parse($phoneNumber);
return $phoneUtil->format($phoneNumber, PhoneNumberFormat::NATIONAL); return $phoneUtil
->format(
$phoneUtil->parse($phoneNumber),
PhoneNumberFormat::E164
);
} }
public function format(string $phonenumber): string /**
* @param string $phoneNumber A national phone number starting with +
* @return string
* @throws NumberParseException
*/
public function format(string $phoneNumber): string
{ {
return $this->normalize($phonenumber); $phoneUtil = PhoneNumberUtil::getInstance();
return $phoneUtil
->format(
$phoneUtil->parse($phoneNumber, $this->config['default_carrier_code']),
PhoneNumberFormat::NATIONAL
);
} }
/** /**
@ -162,9 +177,12 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
public function normalize(string $phoneNumber): string public function normalize(string $phoneNumber): string
{ {
$phoneUtil = PhoneNumberUtil::getInstance(); $phoneUtil = PhoneNumberUtil::getInstance();
$phoneNumber = $phoneUtil->parse($phoneNumber, $this->config['default_carrier_code']);
return $phoneUtil->formatNationalNumberWithPreferredCarrierCode($phoneNumber, $this->config['default_carrier_code']); return $phoneUtil
->format(
$phoneUtil->parse($phoneNumber, $this->config['default_carrier_code']),
PhoneNumberFormat::E164
);
} }
private function performTwilioFormat($phonenumber) private function performTwilioFormat($phonenumber)