diff options
| -rw-r--r-- | apps/provisioning_api/lib/Controller/UsersController.php | 5 | ||||
| -rw-r--r-- | lib/private/Accounts/AccountManager.php | 3 |
2 files changed, 3 insertions, 5 deletions
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) { |