@@ -2,14 +2,14 @@ |
||
2 | 2 | |
3 | 3 | class CountryCodeException extends \Exception |
4 | 4 | { |
5 | - /** |
|
6 | - * Invalid country code static constructor. |
|
7 | - * |
|
8 | - * @param string $country |
|
9 | - * @return static |
|
10 | - */ |
|
11 | - public static function invalid($country) |
|
12 | - { |
|
13 | - return new static('Invalid country code "' . $country . '".'); |
|
14 | - } |
|
5 | + /** |
|
6 | + * Invalid country code static constructor. |
|
7 | + * |
|
8 | + * @param string $country |
|
9 | + * @return static |
|
10 | + */ |
|
11 | + public static function invalid($country) |
|
12 | + { |
|
13 | + return new static('Invalid country code "' . $country . '".'); |
|
14 | + } |
|
15 | 15 | } |
@@ -10,6 +10,6 @@ |
||
10 | 10 | */ |
11 | 11 | public static function invalid($country) |
12 | 12 | { |
13 | - return new static('Invalid country code "' . $country . '".'); |
|
13 | + return new static('Invalid country code "'.$country.'".'); |
|
14 | 14 | } |
15 | 15 | } |
@@ -2,14 +2,14 @@ |
||
2 | 2 | |
3 | 3 | class NumberFormatException extends \Exception |
4 | 4 | { |
5 | - /** |
|
6 | - * Invalid number format static constructor. |
|
7 | - * |
|
8 | - * @param string $format |
|
9 | - * @return static |
|
10 | - */ |
|
11 | - public static function invalid($format) |
|
12 | - { |
|
13 | - return new static('Invalid number format "' . $format . '".'); |
|
14 | - } |
|
5 | + /** |
|
6 | + * Invalid number format static constructor. |
|
7 | + * |
|
8 | + * @param string $format |
|
9 | + * @return static |
|
10 | + */ |
|
11 | + public static function invalid($format) |
|
12 | + { |
|
13 | + return new static('Invalid number format "' . $format . '".'); |
|
14 | + } |
|
15 | 15 | } |
16 | 16 | \ No newline at end of file |
@@ -10,6 +10,6 @@ |
||
10 | 10 | */ |
11 | 11 | public static function invalid($format) |
12 | 12 | { |
13 | - return new static('Invalid number format "' . $format . '".'); |
|
13 | + return new static('Invalid number format "'.$format.'".'); |
|
14 | 14 | } |
15 | 15 | } |
16 | 16 | \ No newline at end of file |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | use Propaganistas\LaravelPhone\PhoneNumber; |
4 | 4 | |
5 | -if (! function_exists('phone')) { |
|
5 | +if (!function_exists('phone')) { |
|
6 | 6 | /** |
7 | 7 | * Get a PhoneNumber instance or a formatted string. |
8 | 8 | * |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | { |
16 | 16 | $phone = PhoneNumber::make($number, $country); |
17 | 17 | |
18 | - if (! is_null($format)) { |
|
18 | + if (!is_null($format)) { |
|
19 | 19 | return $phone->format($format); |
20 | 20 | } |
21 | 21 |
@@ -3,22 +3,22 @@ |
||
3 | 3 | use Propaganistas\LaravelPhone\PhoneNumber; |
4 | 4 | |
5 | 5 | if (! function_exists('phone')) { |
6 | - /** |
|
7 | - * Get a PhoneNumber instance or a formatted string. |
|
8 | - * |
|
9 | - * @param string $number |
|
10 | - * @param string|array $country |
|
11 | - * @param string $format |
|
12 | - * @return string|Propaganistas\LaravelPhone\PhoneNumber |
|
13 | - */ |
|
14 | - function phone($number, $country = [], $format = null) |
|
15 | - { |
|
16 | - $phone = PhoneNumber::make($number, $country); |
|
6 | + /** |
|
7 | + * Get a PhoneNumber instance or a formatted string. |
|
8 | + * |
|
9 | + * @param string $number |
|
10 | + * @param string|array $country |
|
11 | + * @param string $format |
|
12 | + * @return string|Propaganistas\LaravelPhone\PhoneNumber |
|
13 | + */ |
|
14 | + function phone($number, $country = [], $format = null) |
|
15 | + { |
|
16 | + $phone = PhoneNumber::make($number, $country); |
|
17 | 17 | |
18 | - if (! is_null($format)) { |
|
19 | - return $phone->format($format); |
|
20 | - } |
|
18 | + if (! is_null($format)) { |
|
19 | + return $phone->format($format); |
|
20 | + } |
|
21 | 21 | |
22 | - return $phone; |
|
23 | - } |
|
22 | + return $phone; |
|
23 | + } |
|
24 | 24 | } |
@@ -10,63 +10,63 @@ |
||
10 | 10 | |
11 | 11 | class PhoneServiceProvider extends ServiceProvider |
12 | 12 | { |
13 | - /** |
|
14 | - * Bootstrap the application events. |
|
15 | - * |
|
16 | - * @return void |
|
17 | - */ |
|
18 | - public function boot() |
|
19 | - { |
|
20 | - $this->registerValidator(); |
|
13 | + /** |
|
14 | + * Bootstrap the application events. |
|
15 | + * |
|
16 | + * @return void |
|
17 | + */ |
|
18 | + public function boot() |
|
19 | + { |
|
20 | + $this->registerValidator(); |
|
21 | 21 | |
22 | - $this->registerRule(); |
|
23 | - } |
|
22 | + $this->registerRule(); |
|
23 | + } |
|
24 | 24 | |
25 | - /** |
|
26 | - * Register the service provider. |
|
27 | - * |
|
28 | - * @return void |
|
29 | - */ |
|
30 | - public function register() |
|
31 | - { |
|
32 | - $this->app->singleton('libphonenumber', function ($app) { |
|
33 | - return PhoneNumberUtil::getInstance(); |
|
34 | - }); |
|
25 | + /** |
|
26 | + * Register the service provider. |
|
27 | + * |
|
28 | + * @return void |
|
29 | + */ |
|
30 | + public function register() |
|
31 | + { |
|
32 | + $this->app->singleton('libphonenumber', function ($app) { |
|
33 | + return PhoneNumberUtil::getInstance(); |
|
34 | + }); |
|
35 | 35 | |
36 | - $this->app->alias('libphonenumber', PhoneNumberUtil::class); |
|
37 | - } |
|
36 | + $this->app->alias('libphonenumber', PhoneNumberUtil::class); |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * Register the "phone" validator. |
|
41 | - */ |
|
42 | - protected function registerValidator() |
|
43 | - { |
|
44 | - $extend = static::canUseDependentValidation() ? 'extendDependent' : 'extend'; |
|
39 | + /** |
|
40 | + * Register the "phone" validator. |
|
41 | + */ |
|
42 | + protected function registerValidator() |
|
43 | + { |
|
44 | + $extend = static::canUseDependentValidation() ? 'extendDependent' : 'extend'; |
|
45 | 45 | |
46 | - $this->app['validator']->{$extend}('phone', Validation\Phone::class . '@validate'); |
|
47 | - } |
|
46 | + $this->app['validator']->{$extend}('phone', Validation\Phone::class . '@validate'); |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * Register the "phone" rule macro. |
|
51 | - */ |
|
52 | - protected function registerRule() |
|
53 | - { |
|
54 | - if (class_exists('Illuminate\Validation\Rule') && class_uses(Rule::class, Macroable::class)) { |
|
55 | - Rule::macro('phone', function () { |
|
56 | - return new Rules\Phone; |
|
57 | - }); |
|
58 | - } |
|
59 | - } |
|
49 | + /** |
|
50 | + * Register the "phone" rule macro. |
|
51 | + */ |
|
52 | + protected function registerRule() |
|
53 | + { |
|
54 | + if (class_exists('Illuminate\Validation\Rule') && class_uses(Rule::class, Macroable::class)) { |
|
55 | + Rule::macro('phone', function () { |
|
56 | + return new Rules\Phone; |
|
57 | + }); |
|
58 | + } |
|
59 | + } |
|
60 | 60 | |
61 | - /** |
|
62 | - * Determine whether we can register a dependent validator. |
|
63 | - * |
|
64 | - * @return bool |
|
65 | - */ |
|
66 | - public static function canUseDependentValidation() |
|
67 | - { |
|
68 | - $validator = new ReflectionClass('\Illuminate\Validation\Factory'); |
|
61 | + /** |
|
62 | + * Determine whether we can register a dependent validator. |
|
63 | + * |
|
64 | + * @return bool |
|
65 | + */ |
|
66 | + public static function canUseDependentValidation() |
|
67 | + { |
|
68 | + $validator = new ReflectionClass('\Illuminate\Validation\Factory'); |
|
69 | 69 | |
70 | - return $validator->hasMethod('extendDependent'); |
|
71 | - } |
|
70 | + return $validator->hasMethod('extendDependent'); |
|
71 | + } |
|
72 | 72 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function register() |
31 | 31 | { |
32 | - $this->app->singleton('libphonenumber', function ($app) { |
|
32 | + $this->app->singleton('libphonenumber', function($app) { |
|
33 | 33 | return PhoneNumberUtil::getInstance(); |
34 | 34 | }); |
35 | 35 | |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | { |
44 | 44 | $extend = static::canUseDependentValidation() ? 'extendDependent' : 'extend'; |
45 | 45 | |
46 | - $this->app['validator']->{$extend}('phone', Validation\Phone::class . '@validate'); |
|
46 | + $this->app['validator']->{$extend}('phone', Validation\Phone::class.'@validate'); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | protected function registerRule() |
53 | 53 | { |
54 | 54 | if (class_exists('Illuminate\Validation\Rule') && class_uses(Rule::class, Macroable::class)) { |
55 | - Rule::macro('phone', function () { |
|
55 | + Rule::macro('phone', function() { |
|
56 | 56 | return new Rules\Phone; |
57 | 57 | }); |
58 | 58 | } |
@@ -61,7 +61,7 @@ |
||
61 | 61 | $phoneNumber = PhoneNumber::make($value, $country); |
62 | 62 | |
63 | 63 | // Type validation. |
64 | - if (! empty($types) && ! $phoneNumber->isOfType($types)) { |
|
64 | + if (!empty($types) && !$phoneNumber->isOfType($types)) { |
|
65 | 65 | continue; |
66 | 66 | } |
67 | 67 |
@@ -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 | - $parameters = array_map('strtolower', $parameters); |
|
105 | - |
|
106 | - // Discover if an input field was provided. If not, guess the field's name. |
|
107 | - $inputField = Collection::make($parameters) |
|
108 | - ->intersect(array_keys(Arr::dot($data))) |
|
109 | - ->first() ?: "${attribute}_country"; |
|
110 | - |
|
111 | - // Attempt to retrieve the field's value. |
|
112 | - if ($inputCountry = Arr::get($data, $inputField)) { |
|
113 | - |
|
114 | - if (static::isValidType($inputField)) { |
|
115 | - throw InvalidParameterException::ambiguous($inputField); |
|
116 | - } |
|
117 | - |
|
118 | - // Invalid country field values should just validate to false. |
|
119 | - // This will also prevent parameter hijacking through the country field. |
|
120 | - if (static::isValidCountryCode($inputCountry)) { |
|
121 | - $parameters[] = $inputCountry; |
|
122 | - } |
|
123 | - } |
|
124 | - |
|
125 | - return [ |
|
126 | - static::parseCountries($parameters), |
|
127 | - static::parseTypes($parameters), |
|
128 | - in_array('auto', $parameters), |
|
129 | - in_array('lenient', $parameters) |
|
130 | - ]; |
|
131 | - } |
|
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 | + $parameters = array_map('strtolower', $parameters); |
|
105 | + |
|
106 | + // Discover if an input field was provided. If not, guess the field's name. |
|
107 | + $inputField = Collection::make($parameters) |
|
108 | + ->intersect(array_keys(Arr::dot($data))) |
|
109 | + ->first() ?: "${attribute}_country"; |
|
110 | + |
|
111 | + // Attempt to retrieve the field's value. |
|
112 | + if ($inputCountry = Arr::get($data, $inputField)) { |
|
113 | + |
|
114 | + if (static::isValidType($inputField)) { |
|
115 | + throw InvalidParameterException::ambiguous($inputField); |
|
116 | + } |
|
117 | + |
|
118 | + // Invalid country field values should just validate to false. |
|
119 | + // This will also prevent parameter hijacking through the country field. |
|
120 | + if (static::isValidCountryCode($inputCountry)) { |
|
121 | + $parameters[] = $inputCountry; |
|
122 | + } |
|
123 | + } |
|
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 | } |
@@ -25,10 +25,10 @@ |
||
25 | 25 | protected function parseCountries($countries) |
26 | 26 | { |
27 | 27 | return Collection::make(is_array($countries) ? $countries : func_get_args()) |
28 | - ->map(function ($country) { |
|
28 | + ->map(function($country) { |
|
29 | 29 | return strtoupper($country); |
30 | 30 | }) |
31 | - ->filter(function ($value) { |
|
31 | + ->filter(function($value) { |
|
32 | 32 | return static::isValidCountryCode($value); |
33 | 33 | })->toArray(); |
34 | 34 | } |
@@ -5,39 +5,39 @@ |
||
5 | 5 | |
6 | 6 | trait ParsesCountries |
7 | 7 | { |
8 | - /** |
|
9 | - * Determine whether the given country code is valid. |
|
10 | - * |
|
11 | - * @param string $country |
|
12 | - * @return bool |
|
13 | - */ |
|
14 | - public static function isValidCountryCode($country) |
|
15 | - { |
|
16 | - $iso3166 = new ISO3166; |
|
8 | + /** |
|
9 | + * Determine whether the given country code is valid. |
|
10 | + * |
|
11 | + * @param string $country |
|
12 | + * @return bool |
|
13 | + */ |
|
14 | + public static function isValidCountryCode($country) |
|
15 | + { |
|
16 | + $iso3166 = new ISO3166; |
|
17 | 17 | |
18 | - try { |
|
19 | - $iso3166->alpha2($country); |
|
18 | + try { |
|
19 | + $iso3166->alpha2($country); |
|
20 | 20 | |
21 | - return true; |
|
22 | - } catch (\Exception $e) { |
|
23 | - return false; |
|
24 | - } |
|
25 | - } |
|
21 | + return true; |
|
22 | + } catch (\Exception $e) { |
|
23 | + return false; |
|
24 | + } |
|
25 | + } |
|
26 | 26 | |
27 | - /** |
|
28 | - * Parse the provided phone countries to a valid array. |
|
29 | - * |
|
30 | - * @param string|array $countries |
|
31 | - * @return array |
|
32 | - */ |
|
33 | - protected function parseCountries($countries) |
|
34 | - { |
|
35 | - return Collection::make(is_array($countries) ? $countries : func_get_args()) |
|
36 | - ->map(function ($country) { |
|
37 | - return strtoupper($country); |
|
38 | - }) |
|
39 | - ->filter(function ($value) { |
|
40 | - return static::isValidCountryCode($value); |
|
41 | - })->toArray(); |
|
42 | - } |
|
27 | + /** |
|
28 | + * Parse the provided phone countries to a valid array. |
|
29 | + * |
|
30 | + * @param string|array $countries |
|
31 | + * @return array |
|
32 | + */ |
|
33 | + protected function parseCountries($countries) |
|
34 | + { |
|
35 | + return Collection::make(is_array($countries) ? $countries : func_get_args()) |
|
36 | + ->map(function ($country) { |
|
37 | + return strtoupper($country); |
|
38 | + }) |
|
39 | + ->filter(function ($value) { |
|
40 | + return static::isValidCountryCode($value); |
|
41 | + })->toArray(); |
|
42 | + } |
|
43 | 43 | } |
44 | 44 | \ No newline at end of file |
@@ -6,50 +6,50 @@ |
||
6 | 6 | |
7 | 7 | trait ParsesFormats |
8 | 8 | { |
9 | - /** |
|
10 | - * Array of available phone formats. |
|
11 | - * |
|
12 | - * @var array |
|
13 | - */ |
|
14 | - protected static $formats; |
|
9 | + /** |
|
10 | + * Array of available phone formats. |
|
11 | + * |
|
12 | + * @var array |
|
13 | + */ |
|
14 | + protected static $formats; |
|
15 | 15 | |
16 | - /** |
|
17 | - * Determine whether the given format is valid. |
|
18 | - * |
|
19 | - * @param string $format |
|
20 | - * @return bool |
|
21 | - */ |
|
22 | - public static function isValidFormat($format) |
|
23 | - { |
|
24 | - return ! is_null(static::parseFormat($format)); |
|
25 | - } |
|
16 | + /** |
|
17 | + * Determine whether the given format is valid. |
|
18 | + * |
|
19 | + * @param string $format |
|
20 | + * @return bool |
|
21 | + */ |
|
22 | + public static function isValidFormat($format) |
|
23 | + { |
|
24 | + return ! is_null(static::parseFormat($format)); |
|
25 | + } |
|
26 | 26 | |
27 | - /** |
|
28 | - * Parse a phone format. |
|
29 | - * |
|
30 | - * @param string $format |
|
31 | - * @return string |
|
32 | - */ |
|
33 | - protected static function parseFormat($format) |
|
34 | - { |
|
35 | - static::loadFormats(); |
|
27 | + /** |
|
28 | + * Parse a phone format. |
|
29 | + * |
|
30 | + * @param string $format |
|
31 | + * @return string |
|
32 | + */ |
|
33 | + protected static function parseFormat($format) |
|
34 | + { |
|
35 | + static::loadFormats(); |
|
36 | 36 | |
37 | - // If the format equals a constant's value, just return it. |
|
38 | - if (in_array($format, static::$formats, true)) { |
|
39 | - return $format; |
|
40 | - } |
|
37 | + // If the format equals a constant's value, just return it. |
|
38 | + if (in_array($format, static::$formats, true)) { |
|
39 | + return $format; |
|
40 | + } |
|
41 | 41 | |
42 | - // Otherwise we'll assume the format is the constant's name. |
|
43 | - return Arr::get(static::$formats, strtoupper($format)); |
|
44 | - } |
|
42 | + // Otherwise we'll assume the format is the constant's name. |
|
43 | + return Arr::get(static::$formats, strtoupper($format)); |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * Load all available formats once. |
|
48 | - */ |
|
49 | - private static function loadFormats() |
|
50 | - { |
|
51 | - if (! static::$formats) { |
|
52 | - static::$formats = with(new ReflectionClass(PhoneNumberFormat::class))->getConstants(); |
|
53 | - } |
|
54 | - } |
|
46 | + /** |
|
47 | + * Load all available formats once. |
|
48 | + */ |
|
49 | + private static function loadFormats() |
|
50 | + { |
|
51 | + if (! static::$formats) { |
|
52 | + static::$formats = with(new ReflectionClass(PhoneNumberFormat::class))->getConstants(); |
|
53 | + } |
|
54 | + } |
|
55 | 55 | } |
56 | 56 | \ No newline at end of file |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public static function isValidFormat($format) |
23 | 23 | { |
24 | - return ! is_null(static::parseFormat($format)); |
|
24 | + return !is_null(static::parseFormat($format)); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | /** |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | */ |
49 | 49 | private static function loadFormats() |
50 | 50 | { |
51 | - if (! static::$formats) { |
|
51 | + if (!static::$formats) { |
|
52 | 52 | static::$formats = with(new ReflectionClass(PhoneNumberFormat::class))->getConstants(); |
53 | 53 | } |
54 | 54 | } |
@@ -6,147 +6,147 @@ |
||
6 | 6 | |
7 | 7 | class Phone |
8 | 8 | { |
9 | - /** |
|
10 | - * The provided phone countries. |
|
11 | - * |
|
12 | - * @var array |
|
13 | - */ |
|
14 | - protected $countries = []; |
|
15 | - |
|
16 | - /** |
|
17 | - * The input field name to check for a country value. |
|
18 | - * |
|
19 | - * @var string |
|
20 | - */ |
|
21 | - protected $countryField; |
|
22 | - |
|
23 | - /** |
|
24 | - * The provided phone types. |
|
25 | - * |
|
26 | - * @var array |
|
27 | - */ |
|
28 | - protected $types = []; |
|
29 | - |
|
30 | - /** |
|
31 | - * Whether the number's country should be auto-detected. |
|
32 | - * |
|
33 | - * @var bool |
|
34 | - */ |
|
35 | - protected $detect = false; |
|
36 | - |
|
37 | - /** |
|
38 | - * Whether to allow lenient checks (i.e. landline numbers without area codes). |
|
39 | - * |
|
40 | - * @var bool |
|
41 | - */ |
|
42 | - protected $lenient = false; |
|
43 | - |
|
44 | - /** |
|
45 | - * Set the phone countries. |
|
46 | - * |
|
47 | - * @param string|array $country |
|
48 | - * @return $this |
|
49 | - */ |
|
50 | - public function country($country) |
|
51 | - { |
|
52 | - $countries = is_array($country) ? $country : func_get_args(); |
|
53 | - |
|
54 | - $this->countries = array_merge($this->countries, $countries); |
|
55 | - |
|
56 | - return $this; |
|
57 | - } |
|
58 | - |
|
59 | - /** |
|
60 | - * Set the country input field. |
|
61 | - * |
|
62 | - * @param string $name |
|
63 | - * @return $this |
|
64 | - */ |
|
65 | - public function countryField($name) |
|
66 | - { |
|
67 | - $this->countryField = $name; |
|
68 | - |
|
69 | - return $this; |
|
70 | - } |
|
71 | - |
|
72 | - /** |
|
73 | - * Set the phone types. |
|
74 | - * |
|
75 | - * @param string|array $type |
|
76 | - * @return $this |
|
77 | - */ |
|
78 | - public function type($type) |
|
79 | - { |
|
80 | - $types = is_array($type) ? $type : func_get_args(); |
|
81 | - |
|
82 | - $this->types = array_merge($this->types, $types); |
|
83 | - |
|
84 | - return $this; |
|
85 | - } |
|
86 | - |
|
87 | - /** |
|
88 | - * Shortcut method for mobile type restriction. |
|
89 | - * |
|
90 | - * @return $this |
|
91 | - */ |
|
92 | - public function mobile() |
|
93 | - { |
|
94 | - $this->type(PhoneNumberType::MOBILE); |
|
95 | - |
|
96 | - return $this; |
|
97 | - } |
|
98 | - |
|
99 | - /** |
|
100 | - * Shortcut method for fixed line type restriction. |
|
101 | - * |
|
102 | - * @return $this |
|
103 | - */ |
|
104 | - public function fixedLine() |
|
105 | - { |
|
106 | - $this->type(PhoneNumberType::FIXED_LINE); |
|
107 | - |
|
108 | - return $this; |
|
109 | - } |
|
110 | - |
|
111 | - /** |
|
112 | - * Enable automatic country detection. |
|
113 | - * |
|
114 | - * @return $this |
|
115 | - */ |
|
116 | - public function detect() |
|
117 | - { |
|
118 | - $this->detect = true; |
|
119 | - |
|
120 | - return $this; |
|
121 | - } |
|
122 | - |
|
123 | - /** |
|
124 | - * Enable lenient number checking. |
|
125 | - * |
|
126 | - * @return $this |
|
127 | - */ |
|
128 | - public function lenient() |
|
129 | - { |
|
130 | - $this->lenient = true; |
|
131 | - |
|
132 | - return $this; |
|
133 | - } |
|
134 | - |
|
135 | - /** |
|
136 | - * Convert the rule to a validation string. |
|
137 | - * |
|
138 | - * @return string |
|
139 | - */ |
|
140 | - public function __toString() |
|
141 | - { |
|
142 | - $parameters = implode(',', array_merge( |
|
143 | - $this->countries, |
|
144 | - $this->types, |
|
145 | - ($this->countryField ? [$this->countryField]: []), |
|
146 | - ($this->detect ? ['AUTO'] : []), |
|
147 | - ($this->lenient ? ['LENIENT'] : []) |
|
148 | - )); |
|
149 | - |
|
150 | - return 'phone' . (! empty($parameters) ? ":$parameters" : ''); |
|
151 | - } |
|
9 | + /** |
|
10 | + * The provided phone countries. |
|
11 | + * |
|
12 | + * @var array |
|
13 | + */ |
|
14 | + protected $countries = []; |
|
15 | + |
|
16 | + /** |
|
17 | + * The input field name to check for a country value. |
|
18 | + * |
|
19 | + * @var string |
|
20 | + */ |
|
21 | + protected $countryField; |
|
22 | + |
|
23 | + /** |
|
24 | + * The provided phone types. |
|
25 | + * |
|
26 | + * @var array |
|
27 | + */ |
|
28 | + protected $types = []; |
|
29 | + |
|
30 | + /** |
|
31 | + * Whether the number's country should be auto-detected. |
|
32 | + * |
|
33 | + * @var bool |
|
34 | + */ |
|
35 | + protected $detect = false; |
|
36 | + |
|
37 | + /** |
|
38 | + * Whether to allow lenient checks (i.e. landline numbers without area codes). |
|
39 | + * |
|
40 | + * @var bool |
|
41 | + */ |
|
42 | + protected $lenient = false; |
|
43 | + |
|
44 | + /** |
|
45 | + * Set the phone countries. |
|
46 | + * |
|
47 | + * @param string|array $country |
|
48 | + * @return $this |
|
49 | + */ |
|
50 | + public function country($country) |
|
51 | + { |
|
52 | + $countries = is_array($country) ? $country : func_get_args(); |
|
53 | + |
|
54 | + $this->countries = array_merge($this->countries, $countries); |
|
55 | + |
|
56 | + return $this; |
|
57 | + } |
|
58 | + |
|
59 | + /** |
|
60 | + * Set the country input field. |
|
61 | + * |
|
62 | + * @param string $name |
|
63 | + * @return $this |
|
64 | + */ |
|
65 | + public function countryField($name) |
|
66 | + { |
|
67 | + $this->countryField = $name; |
|
68 | + |
|
69 | + return $this; |
|
70 | + } |
|
71 | + |
|
72 | + /** |
|
73 | + * Set the phone types. |
|
74 | + * |
|
75 | + * @param string|array $type |
|
76 | + * @return $this |
|
77 | + */ |
|
78 | + public function type($type) |
|
79 | + { |
|
80 | + $types = is_array($type) ? $type : func_get_args(); |
|
81 | + |
|
82 | + $this->types = array_merge($this->types, $types); |
|
83 | + |
|
84 | + return $this; |
|
85 | + } |
|
86 | + |
|
87 | + /** |
|
88 | + * Shortcut method for mobile type restriction. |
|
89 | + * |
|
90 | + * @return $this |
|
91 | + */ |
|
92 | + public function mobile() |
|
93 | + { |
|
94 | + $this->type(PhoneNumberType::MOBILE); |
|
95 | + |
|
96 | + return $this; |
|
97 | + } |
|
98 | + |
|
99 | + /** |
|
100 | + * Shortcut method for fixed line type restriction. |
|
101 | + * |
|
102 | + * @return $this |
|
103 | + */ |
|
104 | + public function fixedLine() |
|
105 | + { |
|
106 | + $this->type(PhoneNumberType::FIXED_LINE); |
|
107 | + |
|
108 | + return $this; |
|
109 | + } |
|
110 | + |
|
111 | + /** |
|
112 | + * Enable automatic country detection. |
|
113 | + * |
|
114 | + * @return $this |
|
115 | + */ |
|
116 | + public function detect() |
|
117 | + { |
|
118 | + $this->detect = true; |
|
119 | + |
|
120 | + return $this; |
|
121 | + } |
|
122 | + |
|
123 | + /** |
|
124 | + * Enable lenient number checking. |
|
125 | + * |
|
126 | + * @return $this |
|
127 | + */ |
|
128 | + public function lenient() |
|
129 | + { |
|
130 | + $this->lenient = true; |
|
131 | + |
|
132 | + return $this; |
|
133 | + } |
|
134 | + |
|
135 | + /** |
|
136 | + * Convert the rule to a validation string. |
|
137 | + * |
|
138 | + * @return string |
|
139 | + */ |
|
140 | + public function __toString() |
|
141 | + { |
|
142 | + $parameters = implode(',', array_merge( |
|
143 | + $this->countries, |
|
144 | + $this->types, |
|
145 | + ($this->countryField ? [$this->countryField]: []), |
|
146 | + ($this->detect ? ['AUTO'] : []), |
|
147 | + ($this->lenient ? ['LENIENT'] : []) |
|
148 | + )); |
|
149 | + |
|
150 | + return 'phone' . (! empty($parameters) ? ":$parameters" : ''); |
|
151 | + } |
|
152 | 152 | } |
153 | 153 | \ No newline at end of file |
@@ -142,11 +142,11 @@ |
||
142 | 142 | $parameters = implode(',', array_merge( |
143 | 143 | $this->countries, |
144 | 144 | $this->types, |
145 | - ($this->countryField ? [$this->countryField]: []), |
|
145 | + ($this->countryField ? [$this->countryField] : []), |
|
146 | 146 | ($this->detect ? ['AUTO'] : []), |
147 | 147 | ($this->lenient ? ['LENIENT'] : []) |
148 | 148 | )); |
149 | 149 | |
150 | - return 'phone' . (! empty($parameters) ? ":$parameters" : ''); |
|
150 | + return 'phone'.(!empty($parameters) ? ":$parameters" : ''); |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | \ No newline at end of file |
@@ -7,74 +7,74 @@ |
||
7 | 7 | |
8 | 8 | trait ParsesTypes |
9 | 9 | { |
10 | - /** |
|
11 | - * Array of available phone types. |
|
12 | - * |
|
13 | - * @var array |
|
14 | - */ |
|
15 | - protected static $types; |
|
10 | + /** |
|
11 | + * Array of available phone types. |
|
12 | + * |
|
13 | + * @var array |
|
14 | + */ |
|
15 | + protected static $types; |
|
16 | 16 | |
17 | - /** |
|
18 | - * Determine whether the given type is valid. |
|
19 | - * |
|
20 | - * @param string $type |
|
21 | - * @return bool |
|
22 | - */ |
|
23 | - public static function isValidType($type) |
|
24 | - { |
|
25 | - return ! empty(static::parseTypes($type)); |
|
26 | - } |
|
17 | + /** |
|
18 | + * Determine whether the given type is valid. |
|
19 | + * |
|
20 | + * @param string $type |
|
21 | + * @return bool |
|
22 | + */ |
|
23 | + public static function isValidType($type) |
|
24 | + { |
|
25 | + return ! empty(static::parseTypes($type)); |
|
26 | + } |
|
27 | 27 | |
28 | - /** |
|
29 | - * Parse a phone type into constant's value. |
|
30 | - * |
|
31 | - * @param string|array $types |
|
32 | - * @return array |
|
33 | - */ |
|
34 | - protected static function parseTypes($types) |
|
35 | - { |
|
36 | - static::loadTypes(); |
|
28 | + /** |
|
29 | + * Parse a phone type into constant's value. |
|
30 | + * |
|
31 | + * @param string|array $types |
|
32 | + * @return array |
|
33 | + */ |
|
34 | + protected static function parseTypes($types) |
|
35 | + { |
|
36 | + static::loadTypes(); |
|
37 | 37 | |
38 | - return Collection::make(is_array($types) ? $types : func_get_args()) |
|
39 | - ->map(function ($type) { |
|
40 | - // If the type equals a constant's value, just return it. |
|
41 | - if (is_numeric($type) && in_array($type, static::$types)) { |
|
42 | - return (int) $type; |
|
43 | - } |
|
38 | + return Collection::make(is_array($types) ? $types : func_get_args()) |
|
39 | + ->map(function ($type) { |
|
40 | + // If the type equals a constant's value, just return it. |
|
41 | + if (is_numeric($type) && in_array($type, static::$types)) { |
|
42 | + return (int) $type; |
|
43 | + } |
|
44 | 44 | |
45 | - // Otherwise we'll assume the type is the constant's name. |
|
46 | - return Arr::get(static::$types, strtoupper($type)); |
|
47 | - }) |
|
48 | - ->reject(function ($value) { |
|
49 | - return is_null($value) || $value === false; |
|
50 | - })->toArray(); |
|
51 | - } |
|
45 | + // Otherwise we'll assume the type is the constant's name. |
|
46 | + return Arr::get(static::$types, strtoupper($type)); |
|
47 | + }) |
|
48 | + ->reject(function ($value) { |
|
49 | + return is_null($value) || $value === false; |
|
50 | + })->toArray(); |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * Parse a phone type into its string representation. |
|
55 | - * |
|
56 | - * @param string|array $types |
|
57 | - * @return array |
|
58 | - */ |
|
59 | - protected static function parseTypesAsStrings($types) |
|
60 | - { |
|
61 | - static::loadTypes(); |
|
53 | + /** |
|
54 | + * Parse a phone type into its string representation. |
|
55 | + * |
|
56 | + * @param string|array $types |
|
57 | + * @return array |
|
58 | + */ |
|
59 | + protected static function parseTypesAsStrings($types) |
|
60 | + { |
|
61 | + static::loadTypes(); |
|
62 | 62 | |
63 | - return array_keys( |
|
64 | - array_intersect( |
|
65 | - static::$types, |
|
66 | - static::parseTypes($types) |
|
67 | - ) |
|
68 | - ); |
|
69 | - } |
|
63 | + return array_keys( |
|
64 | + array_intersect( |
|
65 | + static::$types, |
|
66 | + static::parseTypes($types) |
|
67 | + ) |
|
68 | + ); |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * Load all available formats once. |
|
73 | - */ |
|
74 | - private static function loadTypes() |
|
75 | - { |
|
76 | - if (! static::$types) { |
|
77 | - static::$types = with(new ReflectionClass(PhoneNumberType::class))->getConstants(); |
|
78 | - } |
|
79 | - } |
|
71 | + /** |
|
72 | + * Load all available formats once. |
|
73 | + */ |
|
74 | + private static function loadTypes() |
|
75 | + { |
|
76 | + if (! static::$types) { |
|
77 | + static::$types = with(new ReflectionClass(PhoneNumberType::class))->getConstants(); |
|
78 | + } |
|
79 | + } |
|
80 | 80 | } |
81 | 81 | \ No newline at end of file |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public static function isValidType($type) |
24 | 24 | { |
25 | - return ! empty(static::parseTypes($type)); |
|
25 | + return !empty(static::parseTypes($type)); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | static::loadTypes(); |
37 | 37 | |
38 | 38 | return Collection::make(is_array($types) ? $types : func_get_args()) |
39 | - ->map(function ($type) { |
|
39 | + ->map(function($type) { |
|
40 | 40 | // If the type equals a constant's value, just return it. |
41 | 41 | if (is_numeric($type) && in_array($type, static::$types)) { |
42 | 42 | return (int) $type; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | // Otherwise we'll assume the type is the constant's name. |
46 | 46 | return Arr::get(static::$types, strtoupper($type)); |
47 | 47 | }) |
48 | - ->reject(function ($value) { |
|
48 | + ->reject(function($value) { |
|
49 | 49 | return is_null($value) || $value === false; |
50 | 50 | })->toArray(); |
51 | 51 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | private static function loadTypes() |
75 | 75 | { |
76 | - if (! static::$types) { |
|
76 | + if (!static::$types) { |
|
77 | 77 | static::$types = with(new ReflectionClass(PhoneNumberType::class))->getConstants(); |
78 | 78 | } |
79 | 79 | } |