diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2023-05-31 17:57:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-31 17:57:46 +0200 |
commit | 90a628d23db8bc9bb4c25e4e6794772ba193201d (patch) | |
tree | 2ea16556734ac704070bf07d9454a291f1a7cbf1 | |
parent | 56ece0c6f39a18507e3e3fc26cee05b614783015 (diff) | |
parent | 4809e8d9a9a9658c57b0cd9488290ddd172f9831 (diff) | |
download | nextcloud-server-90a628d23db8bc9bb4c25e4e6794772ba193201d.tar.gz nextcloud-server-90a628d23db8bc9bb4c25e4e6794772ba193201d.zip |
Merge pull request #38514 from nextcloud/bump/giggsey/libphonenumber-for-php_to_lite-version
chore(libphonenumber): Bump giggsey/libphonenumber-for-php to giggsey…
m--------- | 3rdparty | 0 | ||||
-rw-r--r-- | apps/provisioning_api/lib/Controller/UsersController.php | 5 | ||||
-rw-r--r-- | lib/private/Accounts/AccountManager.php | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/3rdparty b/3rdparty -Subproject b28af7ccf0bebff554672543fbbfe0e5d99968b +Subproject 216b791c9081f06a4ed6581a436020647dd41bb diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 7dfdea991e5..6ce46087d80 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -46,7 +46,6 @@ namespace OCA\Provisioning_API\Controller; use InvalidArgumentException; use libphonenumber\NumberParseException; -use libphonenumber\PhoneNumber; use libphonenumber\PhoneNumberFormat; use libphonenumber\PhoneNumberUtil; use OC\Authentication\Token\RemoteWipe; @@ -245,7 +244,7 @@ class UsersController extends AUserData { foreach ($phoneNumbers as $phone) { try { $phoneNumber = $phoneUtil->parse($phone, $location); - if ($phoneNumber instanceof PhoneNumber && $phoneUtil->isValidNumber($phoneNumber)) { + if ($phoneUtil->isValidNumber($phoneNumber)) { $normalizedNumber = $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164); $normalizedNumberToKey[$normalizedNumber] = (string) $key; } @@ -258,7 +257,7 @@ class UsersController extends AUserData { // when it's different to the user's given region. try { $phoneNumber = $phoneUtil->parse($phone, $defaultPhoneRegion); - if ($phoneNumber instanceof PhoneNumber && $phoneUtil->isValidNumber($phoneNumber)) { + if ($phoneUtil->isValidNumber($phoneNumber)) { $normalizedNumber = $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164); $normalizedNumberToKey[$normalizedNumber] = (string) $key; } diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php index 8fc16d5ce1a..81c53d368ec 100644 --- a/lib/private/Accounts/AccountManager.php +++ b/lib/private/Accounts/AccountManager.php @@ -38,7 +38,6 @@ namespace OC\Accounts; use Exception; use InvalidArgumentException; use libphonenumber\NumberParseException; -use libphonenumber\PhoneNumber; use libphonenumber\PhoneNumberFormat; use libphonenumber\PhoneNumberUtil; use OC\Profile\TProfileHelper; @@ -186,7 +185,7 @@ class AccountManager implements IAccountManager { $phoneUtil = PhoneNumberUtil::getInstance(); try { $phoneNumber = $phoneUtil->parse($input, $defaultRegion); - if ($phoneNumber instanceof PhoneNumber && $phoneUtil->isValidNumber($phoneNumber)) { + if ($phoneUtil->isValidNumber($phoneNumber)) { return $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164); } } catch (NumberParseException $e) { |