| @@ -11,122 +11,122 @@ | ||
| 11 | 11 | |
| 12 | 12 | class Phone | 
| 13 | 13 |  { | 
| 14 | - use ParsesCountries, | |
| 15 | - ParsesTypes; | |
| 16 | - | |
| 17 | - /** | |
| 18 | - * @var \libphonenumber\PhoneNumberUtil | |
| 19 | - */ | |
| 20 | - protected $lib; | |
| 21 | - | |
| 22 | - /** | |
| 23 | - * Phone constructor. | |
| 24 | - */ | |
| 25 | - public function __construct() | |
| 26 | -    { | |
| 27 | - $this->lib = PhoneNumberUtil::getInstance(); | |
| 28 | - } | |
| 29 | - | |
| 30 | - /** | |
| 31 | - * Validates a phone number. | |
| 32 | - * | |
| 33 | - * @param string $attribute | |
| 34 | - * @param mixed $value | |
| 35 | - * @param array $parameters | |
| 36 | - * @param object $validator | |
| 37 | - * @return bool | |
| 38 | - */ | |
| 39 | - public function validate($attribute, $value, array $parameters, $validator) | |
| 40 | -    { | |
| 41 | - $data = $validator->getData(); | |
| 42 | - | |
| 43 | - list( | |
| 44 | - $countries, | |
| 45 | - $types, | |
| 46 | - $detect, | |
| 47 | - $lenient) = $this->extractParameters($attribute, $parameters, $data); | |
| 48 | - | |
| 49 | - // A "null" country is prepended: | |
| 50 | - // 1. In case of auto-detection to have the validation run first without supplying a country. | |
| 51 | - // 2. In case of lenient validation without provided countries; we still might have some luck... | |
| 52 | -        if ($detect || ($lenient && empty($countries))) { | |
| 53 | - array_unshift($countries, null); | |
| 54 | - } | |
| 55 | - | |
| 56 | -        foreach ($countries as $country) { | |
| 57 | -            try { | |
| 58 | - // Parsing the phone number also validates the country, so no need to do this explicitly. | |
| 59 | - // It'll throw a PhoneCountryException upon failure. | |
| 60 | - $phoneNumber = PhoneNumber::make($value, $country); | |
| 61 | - | |
| 62 | - // Type validation. | |
| 63 | -                if (! empty($types) && ! $phoneNumber->isOfType($types)) { | |
| 64 | - continue; | |
| 65 | - } | |
| 66 | - | |
| 67 | - $lenientPhoneNumber = $phoneNumber->lenient()->getPhoneNumberInstance(); | |
| 68 | - | |
| 69 | - // Lenient validation. | |
| 70 | -                if ($lenient && $this->lib->isPossibleNumber($lenientPhoneNumber, $country)) { | |
| 71 | - return true; | |
| 72 | - } | |
| 73 | - | |
| 74 | - $phoneNumberInstance = $phoneNumber->getPhoneNumberInstance(); | |
| 75 | - | |
| 76 | - // Country detection. | |
| 77 | -                if ($detect && $this->lib->isValidNumber($phoneNumberInstance)) { | |
| 78 | - return true; | |
| 79 | - } | |
| 80 | - | |
| 81 | - // Default number+country validation. | |
| 82 | -                if ($this->lib->isValidNumberForRegion($phoneNumberInstance, $country)) { | |
| 83 | - return true; | |
| 84 | - } | |
| 85 | -            } catch (NumberParseException $e) { | |
| 86 | - continue; | |
| 87 | - } | |
| 88 | - } | |
| 89 | - | |
| 90 | - return false; | |
| 91 | - } | |
| 92 | - | |
| 93 | - /** | |
| 94 | - * Parse and extract parameters in the appropriate validation arguments. | |
| 95 | - * | |
| 96 | - * @param string $attribute | |
| 97 | - * @param array $parameters | |
| 98 | - * @param array $data | |
| 99 | - * @return array | |
| 100 | - * @throws \Propaganistas\LaravelPhone\Exceptions\InvalidParameterException | |
| 101 | - */ | |
| 102 | - protected function extractParameters($attribute, array $parameters, array $data) | |
| 103 | -    { | |
| 104 | - // Discover if an input field was provided. If not, guess the field's name. | |
| 105 | - $inputField = Collection::make($parameters) | |
| 106 | - ->intersect(array_keys(Arr::dot($data))) | |
| 107 | -                                ->first() ?: "${attribute}_country"; | |
| 108 | - | |
| 109 | - // Attempt to retrieve the field's value. | |
| 110 | -        if ($inputCountry = Arr::get($data, $inputField)) { | |
| 111 | - | |
| 112 | -            if (static::isValidType($inputField)) { | |
| 113 | - throw InvalidParameterException::ambiguous($inputField); | |
| 114 | - } | |
| 115 | - | |
| 116 | - // Invalid country field values should just validate to false. | |
| 117 | - // This will also prevent parameter hijacking through the country field. | |
| 118 | -            if (static::isValidCountryCode($inputCountry)) { | |
| 119 | - $parameters[] = $inputCountry; | |
| 120 | - } | |
| 121 | - } | |
| 14 | + use ParsesCountries, | |
| 15 | + ParsesTypes; | |
| 16 | + | |
| 17 | + /** | |
| 18 | + * @var \libphonenumber\PhoneNumberUtil | |
| 19 | + */ | |
| 20 | + protected $lib; | |
| 21 | + | |
| 22 | + /** | |
| 23 | + * Phone constructor. | |
| 24 | + */ | |
| 25 | + public function __construct() | |
| 26 | +	{ | |
| 27 | + $this->lib = PhoneNumberUtil::getInstance(); | |
| 28 | + } | |
| 29 | + | |
| 30 | + /** | |
| 31 | + * Validates a phone number. | |
| 32 | + * | |
| 33 | + * @param string $attribute | |
| 34 | + * @param mixed $value | |
| 35 | + * @param array $parameters | |
| 36 | + * @param object $validator | |
| 37 | + * @return bool | |
| 38 | + */ | |
| 39 | + public function validate($attribute, $value, array $parameters, $validator) | |
| 40 | +	{ | |
| 41 | + $data = $validator->getData(); | |
| 42 | + | |
| 43 | + list( | |
| 44 | + $countries, | |
| 45 | + $types, | |
| 46 | + $detect, | |
| 47 | + $lenient) = $this->extractParameters($attribute, $parameters, $data); | |
| 48 | + | |
| 49 | + // A "null" country is prepended: | |
| 50 | + // 1. In case of auto-detection to have the validation run first without supplying a country. | |
| 51 | + // 2. In case of lenient validation without provided countries; we still might have some luck... | |
| 52 | +		if ($detect || ($lenient && empty($countries))) { | |
| 53 | + array_unshift($countries, null); | |
| 54 | + } | |
| 55 | + | |
| 56 | +		foreach ($countries as $country) { | |
| 57 | +			try { | |
| 58 | + // Parsing the phone number also validates the country, so no need to do this explicitly. | |
| 59 | + // It'll throw a PhoneCountryException upon failure. | |
| 60 | + $phoneNumber = PhoneNumber::make($value, $country); | |
| 61 | + | |
| 62 | + // Type validation. | |
| 63 | +				if (! empty($types) && ! $phoneNumber->isOfType($types)) { | |
| 64 | + continue; | |
| 65 | + } | |
| 66 | + | |
| 67 | + $lenientPhoneNumber = $phoneNumber->lenient()->getPhoneNumberInstance(); | |
| 68 | + | |
| 69 | + // Lenient validation. | |
| 70 | +				if ($lenient && $this->lib->isPossibleNumber($lenientPhoneNumber, $country)) { | |
| 71 | + return true; | |
| 72 | + } | |
| 73 | + | |
| 74 | + $phoneNumberInstance = $phoneNumber->getPhoneNumberInstance(); | |
| 75 | + | |
| 76 | + // Country detection. | |
| 77 | +				if ($detect && $this->lib->isValidNumber($phoneNumberInstance)) { | |
| 78 | + return true; | |
| 79 | + } | |
| 80 | + | |
| 81 | + // Default number+country validation. | |
| 82 | +				if ($this->lib->isValidNumberForRegion($phoneNumberInstance, $country)) { | |
| 83 | + return true; | |
| 84 | + } | |
| 85 | +			} catch (NumberParseException $e) { | |
| 86 | + continue; | |
| 87 | + } | |
| 88 | + } | |
| 89 | + | |
| 90 | + return false; | |
| 91 | + } | |
| 92 | + | |
| 93 | + /** | |
| 94 | + * Parse and extract parameters in the appropriate validation arguments. | |
| 95 | + * | |
| 96 | + * @param string $attribute | |
| 97 | + * @param array $parameters | |
| 98 | + * @param array $data | |
| 99 | + * @return array | |
| 100 | + * @throws \Propaganistas\LaravelPhone\Exceptions\InvalidParameterException | |
| 101 | + */ | |
| 102 | + protected function extractParameters($attribute, array $parameters, array $data) | |
| 103 | +	{ | |
| 104 | + // Discover if an input field was provided. If not, guess the field's name. | |
| 105 | + $inputField = Collection::make($parameters) | |
| 106 | + ->intersect(array_keys(Arr::dot($data))) | |
| 107 | +								->first() ?: "${attribute}_country"; | |
| 108 | + | |
| 109 | + // Attempt to retrieve the field's value. | |
| 110 | +		if ($inputCountry = Arr::get($data, $inputField)) { | |
| 111 | + | |
| 112 | +			if (static::isValidType($inputField)) { | |
| 113 | + throw InvalidParameterException::ambiguous($inputField); | |
| 114 | + } | |
| 115 | + | |
| 116 | + // Invalid country field values should just validate to false. | |
| 117 | + // This will also prevent parameter hijacking through the country field. | |
| 118 | +			if (static::isValidCountryCode($inputCountry)) { | |
| 119 | + $parameters[] = $inputCountry; | |
| 120 | + } | |
| 121 | + } | |
| 122 | 122 | |
| 123 | -        $parameters = array_map('strtolower', $parameters); | |
| 124 | - | |
| 125 | - return [ | |
| 126 | - static::parseCountries($parameters), | |
| 127 | - static::parseTypes($parameters), | |
| 128 | -            in_array('auto', $parameters), | |
| 129 | -            in_array('lenient', $parameters) | |
| 130 | - ]; | |
| 131 | - } | |
| 123 | +		$parameters = array_map('strtolower', $parameters); | |
| 124 | + | |
| 125 | + return [ | |
| 126 | + static::parseCountries($parameters), | |
| 127 | + static::parseTypes($parameters), | |
| 128 | +			in_array('auto', $parameters), | |
| 129 | +			in_array('lenient', $parameters) | |
| 130 | + ]; | |
| 131 | + } | |
| 132 | 132 | } |