-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #40620 from nextcloud/feat/noid/ocp-for-phonenumbe…
…r-util feat(phonenumber): Add OCP wrapper for PhoneNumber utils library
- Loading branch information
Showing
9 changed files
with
164 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
| /** | ||
| * | ||
| * @copyright Copyright (c) 2023 Joas Schilling <coding@schilljs.com> | ||
| * | ||
| * @author Joas Schilling <coding@schilljs.com> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OC; | ||
|
|
||
| use libphonenumber\NumberParseException; | ||
| use libphonenumber\PhoneNumberFormat; | ||
| use OCP\IPhoneNumberUtil; | ||
|
|
||
| /** | ||
| * @since 28.0.0 | ||
| */ | ||
| class PhoneNumberUtil implements IPhoneNumberUtil { | ||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| public function getCountryCodeForRegion(string $regionCode): ?int { | ||
| $phoneUtil = \libphonenumber\PhoneNumberUtil::getInstance(); | ||
| $countryCode = $phoneUtil->getCountryCodeForRegion($regionCode); | ||
| return $countryCode === 0 ? null : $countryCode; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| public function convertToStandardFormat(string $input, ?string $defaultRegion = null): ?string { | ||
| $phoneUtil = \libphonenumber\PhoneNumberUtil::getInstance(); | ||
| try { | ||
| $phoneNumber = $phoneUtil->parse($input, $defaultRegion); | ||
| if ($phoneUtil->isValidNumber($phoneNumber)) { | ||
| return $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164); | ||
| } | ||
| } catch (NumberParseException) { | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
| /** | ||
| * | ||
| * @copyright Copyright (c) 2023 Joas Schilling <coding@schilljs.com> | ||
| * | ||
| * @author Joas Schilling <coding@schilljs.com> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCP; | ||
|
|
||
| /** | ||
| * @since 28.0.0 | ||
| */ | ||
| interface IPhoneNumberUtil { | ||
| /** | ||
| * Returns the country code for a specific region | ||
| * | ||
| * For example, this would be `41` for Switzerland and `49` for Germany. | ||
| * Returns null when the region is invalid. | ||
| * | ||
| * @param string $regionCode Two-letter region code of ISO 3166-1 | ||
| * @return int|null Null when invalid/unsupported, the phone country code otherwise | ||
| * @since 28.0.0 | ||
| */ | ||
| public function getCountryCodeForRegion(string $regionCode): ?int; | ||
|
|
||
| /** | ||
| * Converts a given input into an E164 formatted phone number | ||
| * | ||
| * E164 is the international format without any formatting characters or spaces. | ||
| * E.g. +41446681800 where +41 is the region code. | ||
| * | ||
| * @param string $input Input phone number can contain formatting spaces, slashes and dashes | ||
| * @param string|null $defaultRegion Two-letter region code of ISO 3166-1 | ||
| * @return string|null Null when the input is invalid for the given region or requires a region. | ||
| * @since 28.0.0 | ||
| */ | ||
| public function convertToStandardFormat(string $input, ?string $defaultRegion = null): ?string; | ||
| } |
Oops, something went wrong.