Browse Source

fix(CI): Satisfy psalm by removing a now obsolete type check

Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling 1 year ago
parent
commit
4809e8d9a9

+ 2 - 3
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;
 						}

+ 1 - 2
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) {