Propaganistas / Laravel-Phone

src/PhoneServiceProvider.php

Indentation +51 added lines, -51 removed lines

@@ -10,63 +10,63 @@
 
 class PhoneServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the application events.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->registerValidator();
+	/**
+	 * Bootstrap the application events.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->registerValidator();
 
-        $this->registerRule();
-    }
+		$this->registerRule();
+	}
 
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->singleton('libphonenumber', function ($app) {
-            return PhoneNumberUtil::getInstance();
-        });
+	/**
+	 * Register the service provider.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app->singleton('libphonenumber', function ($app) {
+			return PhoneNumberUtil::getInstance();
+		});
 
-        $this->app->alias('libphonenumber', PhoneNumberUtil::class);
-    }
+		$this->app->alias('libphonenumber', PhoneNumberUtil::class);
+	}
 
-    /**
-     * Register the "phone" validator.
-     */
-    protected function registerValidator()
-    {
-        $extend = static::canUseDependentValidation() ? 'extendDependent' : 'extend';
+	/**
+	 * Register the "phone" validator.
+	 */
+	protected function registerValidator()
+	{
+		$extend = static::canUseDependentValidation() ? 'extendDependent' : 'extend';
 
-        $this->app['validator']->{$extend}('phone', Validation\Phone::class . '@validate');
-    }
+		$this->app['validator']->{$extend}('phone', Validation\Phone::class . '@validate');
+	}
 
-    /**
-     * Register the "phone" rule macro.
-     */
-    protected function registerRule()
-    {
-        if (class_exists('Illuminate\Validation\Rule') && class_uses(Rule::class, Macroable::class)) {
-            Rule::macro('phone', function () {
-                return new Rules\Phone;
-            });
-        }
-    }
+	/**
+	 * Register the "phone" rule macro.
+	 */
+	protected function registerRule()
+	{
+		if (class_exists('Illuminate\Validation\Rule') && class_uses(Rule::class, Macroable::class)) {
+			Rule::macro('phone', function () {
+				return new Rules\Phone;
+			});
+		}
+	}
 
-    /**
-     * Determine whether we can register a dependent validator.
-     *
-     * @return bool
-     */
-    public static function canUseDependentValidation()
-    {
-        $validator = new ReflectionClass('\Illuminate\Validation\Factory');
+	/**
+	 * Determine whether we can register a dependent validator.
+	 *
+	 * @return bool
+	 */
+	public static function canUseDependentValidation()
+	{
+		$validator = new ReflectionClass('\Illuminate\Validation\Factory');
 
-        return $validator->hasMethod('extendDependent');
-    }
+		return $validator->hasMethod('extendDependent');
+	}
 }

src/Traits/ParsesCountries.php

Indentation +26 added lines, -26 removed lines

@@ -5,31 +5,31 @@
 
 trait ParsesCountries
 {
-    /**
-     * Determine whether the given country code is valid.
-     *
-     * @param string $country
-     * @return bool
-     */
-    public static function isValidCountryCode($country)
-    {
-        return ISO3166::isValid($country);
-    }
+	/**
+	 * Determine whether the given country code is valid.
+	 *
+	 * @param string $country
+	 * @return bool
+	 */
+	public static function isValidCountryCode($country)
+	{
+		return ISO3166::isValid($country);
+	}
 
-    /**
-     * Parse the provided phone countries to a valid array.
-     *
-     * @param string|array $countries
-     * @return array
-     */
-    protected function parseCountries($countries)
-    {
-        return Collection::make(is_array($countries) ? $countries : func_get_args())
-                         ->map(function ($country) {
-                             return strtoupper($country);
-                         })
-                         ->filter(function ($value) {
-                             return static::isValidCountryCode($value);
-                         })->toArray();
-    }
+	/**
+	 * Parse the provided phone countries to a valid array.
+	 *
+	 * @param string|array $countries
+	 * @return array
+	 */
+	protected function parseCountries($countries)
+	{
+		return Collection::make(is_array($countries) ? $countries : func_get_args())
+						 ->map(function ($country) {
+							 return strtoupper($country);
+						 })
+						 ->filter(function ($value) {
+							 return static::isValidCountryCode($value);
+						 })->toArray();
+	}
 }
\ No newline at end of file

src/Traits/ParsesTypes.php

Indentation +63 added lines, -63 removed lines

@@ -7,74 +7,74 @@
 
 trait ParsesTypes
 {
-    /**
-     * Array of available phone types.
-     *
-     * @var array
-     */
-    protected static $types;
+	/**
+	 * Array of available phone types.
+	 *
+	 * @var array
+	 */
+	protected static $types;
 
-    /**
-     * Determine whether the given type is valid.
-     *
-     * @param string $type
-     * @return bool
-     */
-    public static function isValidType($type)
-    {
-        return ! empty(static::parseTypes($type));
-    }
+	/**
+	 * Determine whether the given type is valid.
+	 *
+	 * @param string $type
+	 * @return bool
+	 */
+	public static function isValidType($type)
+	{
+		return ! empty(static::parseTypes($type));
+	}
 
-    /**
-     * Parse a phone type into constant's value.
-     *
-     * @param string|array $types
-     * @return array
-     */
-    protected static function parseTypes($types)
-    {
-        static::loadTypes();
+	/**
+	 * Parse a phone type into constant's value.
+	 *
+	 * @param string|array $types
+	 * @return array
+	 */
+	protected static function parseTypes($types)
+	{
+		static::loadTypes();
 
-        return Collection::make(is_array($types) ? $types : func_get_args())
-                         ->map(function ($type) {
-                             // If the type equals a constant's value, just return it.
-                             if (in_array($type, static::$types, true)) {
-                                 return $type;
-                             }
+		return Collection::make(is_array($types) ? $types : func_get_args())
+						 ->map(function ($type) {
+							 // If the type equals a constant's value, just return it.
+							 if (in_array($type, static::$types, true)) {
+								 return $type;
+							 }
 
-                             // Otherwise we'll assume the type is the constant's name.
-                             return Arr::get(static::$types, strtoupper($type));
-                         })
-                         ->reject(function ($value) {
-                             return is_null($value) || $value === false;
-                         })->toArray();
-    }
+							 // Otherwise we'll assume the type is the constant's name.
+							 return Arr::get(static::$types, strtoupper($type));
+						 })
+						 ->reject(function ($value) {
+							 return is_null($value) || $value === false;
+						 })->toArray();
+	}
 
-    /**
-     * Parse a phone type into its string representation.
-     *
-     * @param string|array $types
-     * @return array
-     */
-    protected static function parseTypesAsStrings($types)
-    {
-        static::loadTypes();
+	/**
+	 * Parse a phone type into its string representation.
+	 *
+	 * @param string|array $types
+	 * @return array
+	 */
+	protected static function parseTypesAsStrings($types)
+	{
+		static::loadTypes();
 
-        return array_keys(
-            array_intersect(
-                static::$types,
-                static::parseTypes($types)
-            )
-        );
-    }
+		return array_keys(
+			array_intersect(
+				static::$types,
+				static::parseTypes($types)
+			)
+		);
+	}
 
-    /**
-     * Load all available formats once.
-     */
-    private static function loadTypes()
-    {
-        if (! static::$types) {
-            static::$types = with(new ReflectionClass(PhoneNumberType::class))->getConstants();
-        }
-    }
+	/**
+	 * Load all available formats once.
+	 */
+	private static function loadTypes()
+	{
+		if (! static::$types) {
+			static::$types = with(new ReflectionClass(PhoneNumberType::class))->getConstants();
+		}
+	}
 }
\ No newline at end of file

src/Traits/ParsesFormats.php

Indentation +41 added lines, -41 removed lines

@@ -6,50 +6,50 @@
 
 trait ParsesFormats
 {
-    /**
-     * Array of available phone formats.
-     *
-     * @var array
-     */
-    protected static $formats;
+	/**
+	 * Array of available phone formats.
+	 *
+	 * @var array
+	 */
+	protected static $formats;
 
-    /**
-     * Determine whether the given format is valid.
-     *
-     * @param string $format
-     * @return bool
-     */
-    public static function isValidFormat($format)
-    {
-        return ! is_null(static::parseFormat($format));
-    }
+	/**
+	 * Determine whether the given format is valid.
+	 *
+	 * @param string $format
+	 * @return bool
+	 */
+	public static function isValidFormat($format)
+	{
+		return ! is_null(static::parseFormat($format));
+	}
 
-    /**
-     * Parse a phone format.
-     *
-     * @param string $format
-     * @return string
-     */
-    protected static function parseFormat($format)
-    {
-        static::loadFormats();
+	/**
+	 * Parse a phone format.
+	 *
+	 * @param string $format
+	 * @return string
+	 */
+	protected static function parseFormat($format)
+	{
+		static::loadFormats();
 
-        // If the format equals a constant's value, just return it.
-        if (in_array($format, static::$formats, true)) {
-            return $format;
-        }
+		// If the format equals a constant's value, just return it.
+		if (in_array($format, static::$formats, true)) {
+			return $format;
+		}
 
-        // Otherwise we'll assume the format is the constant's name.
-        return Arr::get(static::$formats, strtoupper($format));
-    }
+		// Otherwise we'll assume the format is the constant's name.
+		return Arr::get(static::$formats, strtoupper($format));
+	}
 
-    /**
-     * Load all available formats once.
-     */
-    private static function loadFormats()
-    {
-        if (! static::$formats) {
-            static::$formats = with(new ReflectionClass(PhoneNumberFormat::class))->getConstants();
-        }
-    }
+	/**
+	 * Load all available formats once.
+	 */
+	private static function loadFormats()
+	{
+		if (! static::$formats) {
+			static::$formats = with(new ReflectionClass(PhoneNumberFormat::class))->getConstants();
+		}
+	}
 }
\ No newline at end of file

src/helpers.php

Indentation +16 added lines, -16 removed lines

@@ -3,22 +3,22 @@
 use Propaganistas\LaravelPhone\PhoneNumber;
 
 if (! function_exists('phone')) {
-    /**
-     * Get a PhoneNumber instance or a formatted string.
-     *
-     * @param string       $number
-     * @param string|array $country
-     * @param string       $format
-     * @return string|Propaganistas\LaravelPhone\PhoneNumber
-     */
-    function phone($number, $country = [], $format = null)
-    {
-        $phone = PhoneNumber::make($number, $country);
+	/**
+	 * Get a PhoneNumber instance or a formatted string.
+	 *
+	 * @param string       $number
+	 * @param string|array $country
+	 * @param string       $format
+	 * @return string|Propaganistas\LaravelPhone\PhoneNumber
+	 */
+	function phone($number, $country = [], $format = null)
+	{
+		$phone = PhoneNumber::make($number, $country);
 
-        if (! is_null($format)) {
-            return $phone->format($format);
-        }
+		if (! is_null($format)) {
+			return $phone->format($format);
+		}
 
-        return $phone;
-    }
+		return $phone;
+	}
 }

src/Rules/Phone.php

Indentation +143 added lines, -143 removed lines

@@ -6,147 +6,147 @@
 
 class Phone
 {
-    /**
-     * The provided phone countries.
-     *
-     * @var array
-     */
-    protected $countries = [];
-
-    /**
-     * The input field name to check for a country value.
-     *
-     * @var string
-     */
-    protected $countryField;
-
-    /**
-     * The provided phone types.
-     *
-     * @var array
-     */
-    protected $types = [];
-
-    /**
-     * Whether the number's country should be auto-detected.
-     *
-     * @var bool
-     */
-    protected $detect = false;
-
-    /**
-     * Whether to allow lenient checks (i.e. landline numbers without area codes).
-     *
-     * @var bool
-     */
-    protected $lenient = false;
-
-    /**
-     * Set the phone countries.
-     *
-     * @param string|array $country
-     * @return $this
-     */
-    public function country($country)
-    {
-        $countries = is_array($country) ? $country : func_get_args();
-
-        $this->countries = array_merge($this->countries, $countries);
-
-        return $this;
-    }
-
-    /**
-     * Set the country input field.
-     *
-     * @param string $name
-     * @return $this
-     */
-    public function countryField($name)
-    {
-        $this->countryField = $name;
-
-        return $this;
-    }
-
-    /**
-     * Set the phone types.
-     *
-     * @param string|array $type
-     * @return $this
-     */
-    public function type($type)
-    {
-        $types = is_array($type) ? $type : func_get_args();
-
-        $this->types = array_merge($this->types, $types);
-
-        return $this;
-    }
-
-    /**
-     * Shortcut method for mobile type restriction.
-     *
-     * @return $this
-     */
-    public function mobile()
-    {
-        $this->type(PhoneNumberType::MOBILE);
-
-        return $this;
-    }
-
-    /**
-     * Shortcut method for fixed line type restriction.
-     *
-     * @return $this
-     */
-    public function fixedLine()
-    {
-        $this->type(PhoneNumberType::FIXED_LINE);
-
-        return $this;
-    }
-
-    /**
-     * Enable automatic country detection.
-     *
-     * @return $this
-     */
-    public function detect()
-    {
-        $this->detect = true;
-
-        return $this;
-    }
-
-    /**
-     * Enable lenient number checking.
-     *
-     * @return $this
-     */
-    public function lenient()
-    {
-        $this->lenient = true;
-
-        return $this;
-    }
-
-    /**
-     * Convert the rule to a validation string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $parameters = implode(',', array_merge(
-            $this->countries,
-            $this->types,
-            ($this->countryField ? [$this->countryField]: []),
-            ($this->detect ? ['AUTO'] : []),
-            ($this->lenient ? ['LENIENT'] : [])
-        ));
-
-        return 'phone' . (! empty($parameters) ? ":$parameters" : '');
-    }
+	/**
+	 * The provided phone countries.
+	 *
+	 * @var array
+	 */
+	protected $countries = [];
+
+	/**
+	 * The input field name to check for a country value.
+	 *
+	 * @var string
+	 */
+	protected $countryField;
+
+	/**
+	 * The provided phone types.
+	 *
+	 * @var array
+	 */
+	protected $types = [];
+
+	/**
+	 * Whether the number's country should be auto-detected.
+	 *
+	 * @var bool
+	 */
+	protected $detect = false;
+
+	/**
+	 * Whether to allow lenient checks (i.e. landline numbers without area codes).
+	 *
+	 * @var bool
+	 */
+	protected $lenient = false;
+
+	/**
+	 * Set the phone countries.
+	 *
+	 * @param string|array $country
+	 * @return $this
+	 */
+	public function country($country)
+	{
+		$countries = is_array($country) ? $country : func_get_args();
+
+		$this->countries = array_merge($this->countries, $countries);
+
+		return $this;
+	}
+
+	/**
+	 * Set the country input field.
+	 *
+	 * @param string $name
+	 * @return $this
+	 */
+	public function countryField($name)
+	{
+		$this->countryField = $name;
+
+		return $this;
+	}
+
+	/**
+	 * Set the phone types.
+	 *
+	 * @param string|array $type
+	 * @return $this
+	 */
+	public function type($type)
+	{
+		$types = is_array($type) ? $type : func_get_args();
+
+		$this->types = array_merge($this->types, $types);
+
+		return $this;
+	}
+
+	/**
+	 * Shortcut method for mobile type restriction.
+	 *
+	 * @return $this
+	 */
+	public function mobile()
+	{
+		$this->type(PhoneNumberType::MOBILE);
+
+		return $this;
+	}
+
+	/**
+	 * Shortcut method for fixed line type restriction.
+	 *
+	 * @return $this
+	 */
+	public function fixedLine()
+	{
+		$this->type(PhoneNumberType::FIXED_LINE);
+
+		return $this;
+	}
+
+	/**
+	 * Enable automatic country detection.
+	 *
+	 * @return $this
+	 */
+	public function detect()
+	{
+		$this->detect = true;
+
+		return $this;
+	}
+
+	/**
+	 * Enable lenient number checking.
+	 *
+	 * @return $this
+	 */
+	public function lenient()
+	{
+		$this->lenient = true;
+
+		return $this;
+	}
+
+	/**
+	 * Convert the rule to a validation string.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		$parameters = implode(',', array_merge(
+			$this->countries,
+			$this->types,
+			($this->countryField ? [$this->countryField]: []),
+			($this->detect ? ['AUTO'] : []),
+			($this->lenient ? ['LENIENT'] : [])
+		));
+
+		return 'phone' . (! empty($parameters) ? ":$parameters" : '');
+	}
 }
\ No newline at end of file

src/Validation/Phone.php

Indentation +126 added lines, -126 removed lines

@@ -11,130 +11,130 @@
 
 class Phone
 {
-    use ParsesCountries,
-        ParsesTypes;
-
-    /**
-     * @var \libphonenumber\PhoneNumberUtil
-     */
-    protected $lib;
-
-    /**
-     * Phone constructor.
-     */
-    public function __construct()
-    {
-        $this->lib = PhoneNumberUtil::getInstance();
-    }
-
-    /**
-     * Validates a phone number.
-     *
-     * @param  string $attribute
-     * @param  mixed  $value
-     * @param  array  $parameters
-     * @param  object $validator
-     * @return bool
-     */
-    public function validate($attribute, $value, array $parameters, $validator)
-    {
-        $data = $validator->getData();
-
-        list(
-            $countries,
-            $types,
-            $detect,
-            $lenient) = $this->extractParameters($attribute, $parameters, $data);
-
-        // A "null" country is prepended:
-        // 1. In case of auto-detection to have the validation run first without supplying a country.
-        // 2. In case of lenient validation without provided countries; we still might have some luck...
-        if ($detect || ($lenient && empty($countries))) {
-            array_unshift($countries, null);
-        }
-
-        foreach ($countries as $country) {
-            try {
-                // Parsing the phone number also validates the country, so no need to do this explicitly.
-                // It'll throw a PhoneCountryException upon failure.
-                $phoneNumber = PhoneNumber::make($value, $country);
-
-                // Type validation.
-                if (! empty($types) && ! $phoneNumber->isOfType($types)) {
-                    continue;
-                }
-
-                $lenientPhoneNumber = $phoneNumber->lenient()->getPhoneNumberInstance();
-
-                // Lenient validation.
-                if ($lenient && $this->lib->isPossibleNumber($lenientPhoneNumber, $country)) {
-                    return true;
-                }
-
-                $phoneNumberInstance = $phoneNumber->getPhoneNumberInstance();
-
-                // Country detection.
-                if ($detect && $this->lib->isValidNumber($phoneNumberInstance)) {
-                    return true;
-                }
-
-                // Default number+country validation.
-                if ($this->lib->isValidNumberForRegion($phoneNumberInstance, $country)) {
-                    return true;
-                }
-            } catch (NumberParseException $e) {
-                continue;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Parse and extract parameters in the appropriate validation arguments.
-     *
-     * @param string $attribute
-     * @param array  $parameters
-     * @param array  $data
-     * @return array
-     * @throws \Propaganistas\LaravelPhone\Exceptions\InvalidParameterException
-     */
-    protected function extractParameters($attribute, array $parameters, array $data)
-    {
-        // Discover if an input field was provided. If not, guess the field's name.
-        $inputField = Collection::make($parameters)
-                                ->intersect(array_keys(Arr::dot($data)))
-                                ->first() ?: "${attribute}_country";
-
-        // Attempt to retrieve the field's value.
-        if ($inputCountry = Arr::get($data, $inputField)) {
-
-            if (static::isValidType($inputField)) {
-                throw InvalidParameterException::ambiguous($inputField);
-            }
-
-            $parameters[] = $inputCountry;
-        }
-
-        $countries = static::parseCountries($parameters);
-        $types = static::parseTypes($parameters);
-
-        // Force developers to write proper code.
-        // Since the static parsers return a validated array with preserved keys, we can safely diff against the keys.
-        // Unfortunately we can't use $collection->diffKeys() as it's not available yet in earlier 5.* versions.
-        $leftovers = array_diff_key($parameters, $types, $countries);
-        $leftovers = array_diff($leftovers, ['AUTO', 'LENIENT', $inputField]);
-
-        if (! empty($leftovers)) {
-            throw InvalidParameterException::parameters($leftovers);
-        }
-
-        return [
-            $countries,
-            $types,
-            in_array('AUTO', $parameters),
-            in_array('LENIENT', $parameters),
-            $inputField,
-        ];
-    }
+	use ParsesCountries,
+		ParsesTypes;
+
+	/**
+	 * @var \libphonenumber\PhoneNumberUtil
+	 */
+	protected $lib;
+
+	/**
+	 * Phone constructor.
+	 */
+	public function __construct()
+	{
+		$this->lib = PhoneNumberUtil::getInstance();
+	}
+
+	/**
+	 * Validates a phone number.
+	 *
+	 * @param  string $attribute
+	 * @param  mixed  $value
+	 * @param  array  $parameters
+	 * @param  object $validator
+	 * @return bool
+	 */
+	public function validate($attribute, $value, array $parameters, $validator)
+	{
+		$data = $validator->getData();
+
+		list(
+			$countries,
+			$types,
+			$detect,
+			$lenient) = $this->extractParameters($attribute, $parameters, $data);
+
+		// A "null" country is prepended:
+		// 1. In case of auto-detection to have the validation run first without supplying a country.
+		// 2. In case of lenient validation without provided countries; we still might have some luck...
+		if ($detect || ($lenient && empty($countries))) {
+			array_unshift($countries, null);
+		}
+
+		foreach ($countries as $country) {
+			try {
+				// Parsing the phone number also validates the country, so no need to do this explicitly.
+				// It'll throw a PhoneCountryException upon failure.
+				$phoneNumber = PhoneNumber::make($value, $country);
+
+				// Type validation.
+				if (! empty($types) && ! $phoneNumber->isOfType($types)) {
+					continue;
+				}
+
+				$lenientPhoneNumber = $phoneNumber->lenient()->getPhoneNumberInstance();
+
+				// Lenient validation.
+				if ($lenient && $this->lib->isPossibleNumber($lenientPhoneNumber, $country)) {
+					return true;
+				}
+
+				$phoneNumberInstance = $phoneNumber->getPhoneNumberInstance();
+
+				// Country detection.
+				if ($detect && $this->lib->isValidNumber($phoneNumberInstance)) {
+					return true;
+				}
+
+				// Default number+country validation.
+				if ($this->lib->isValidNumberForRegion($phoneNumberInstance, $country)) {
+					return true;
+				}
+			} catch (NumberParseException $e) {
+				continue;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Parse and extract parameters in the appropriate validation arguments.
+	 *
+	 * @param string $attribute
+	 * @param array  $parameters
+	 * @param array  $data
+	 * @return array
+	 * @throws \Propaganistas\LaravelPhone\Exceptions\InvalidParameterException
+	 */
+	protected function extractParameters($attribute, array $parameters, array $data)
+	{
+		// Discover if an input field was provided. If not, guess the field's name.
+		$inputField = Collection::make($parameters)
+								->intersect(array_keys(Arr::dot($data)))
+								->first() ?: "${attribute}_country";
+
+		// Attempt to retrieve the field's value.
+		if ($inputCountry = Arr::get($data, $inputField)) {
+
+			if (static::isValidType($inputField)) {
+				throw InvalidParameterException::ambiguous($inputField);
+			}
+
+			$parameters[] = $inputCountry;
+		}
+
+		$countries = static::parseCountries($parameters);
+		$types = static::parseTypes($parameters);
+
+		// Force developers to write proper code.
+		// Since the static parsers return a validated array with preserved keys, we can safely diff against the keys.
+		// Unfortunately we can't use $collection->diffKeys() as it's not available yet in earlier 5.* versions.
+		$leftovers = array_diff_key($parameters, $types, $countries);
+		$leftovers = array_diff($leftovers, ['AUTO', 'LENIENT', $inputField]);
+
+		if (! empty($leftovers)) {
+			throw InvalidParameterException::parameters($leftovers);
+		}
+
+		return [
+			$countries,
+			$types,
+			in_array('AUTO', $parameters),
+			in_array('LENIENT', $parameters),
+			$inputField,
+		];
+	}
 }

src/PhoneNumber.php

Indentation +369 added lines, -369 removed lines

@@ -18,373 +18,373 @@
 
 class PhoneNumber implements Jsonable, JsonSerializable, Serializable
 {
-    use ParsesCountries,
-        ParsesFormats,
-        ParsesTypes;
-
-    /**
-     * The provided phone number.
-     *
-     * @var string
-     */
-    protected $number;
-
-    /**
-     * The provided phone country.
-     *
-     * @var array
-     */
-    protected $countries = [];
-
-    /**
-     * The detected phone country.
-     *
-     * @var string
-     */
-    protected $country;
-
-    /**
-     * Whether to allow lenient checks (i.e. landline numbers without area codes).
-     *
-     * @var bool
-     */
-    protected $lenient = false;
-
-    /**
-     * @var \libphonenumber\PhoneNumberUtil
-     */
-    protected $lib;
-
-    /**
-     * Phone constructor.
-     *
-     * @param string $number
-     */
-    public function __construct($number)
-    {
-        $this->number = $number;
-        $this->lib = PhoneNumberUtil::getInstance();
-    }
-
-    /**
-     * Create a phone instance.
-     *
-     * @param string       $number
-     * @param string|array $country
-     * @return static
-     */
-    public static function make($number, $country = [])
-    {
-        $instance = new static($number);
-
-        return $instance->ofCountry($country);
-    }
-
-    /**
-     * Set the country to which the phone number belongs to.
-     *
-     * @param string|array $country
-     * @return static
-     */
-    public function ofCountry($country)
-    {
-        $countries = is_array($country) ? $country : func_get_args();
-
-        $instance = clone $this;
-        $instance->countries = array_unique(
-            array_merge($instance->countries, static::parseCountries($countries))
-        );
-
-        return $instance;
-    }
-
-    /**
-     * Format the phone number in international format.
-     *
-     * @return string
-     */
-    public function formatInternational()
-    {
-        return $this->format(PhoneNumberFormat::INTERNATIONAL);
-    }
-
-    /**
-     * Format the phone number in national format.
-     *
-     * @return string
-     */
-    public function formatNational()
-    {
-        return $this->format(PhoneNumberFormat::NATIONAL);
-    }
-
-    /**
-     * Format the phone number in E164 format.
-     *
-     * @return string
-     */
-    public function formatE164()
-    {
-        return $this->format(PhoneNumberFormat::E164);
-    }
-
-    /**
-     * Format the phone number in RFC3966 format.
-     *
-     * @return string
-     */
-    public function formatRFC3966()
-    {
-        return $this->format(PhoneNumberFormat::RFC3966);
-    }
-
-    /**
-     * Format the phone number in a given format.
-     *
-     * @param string $format
-     * @return string
-     * @throws \Propaganistas\LaravelPhone\Exceptions\NumberFormatException
-     */
-    public function format($format)
-    {
-        $parsedFormat = static::parseFormat($format);
-
-        if (is_null($parsedFormat)) {
-            throw NumberFormatException::invalid($format);
-        }
-
-        return $this->lib->format(
-            $this->getPhoneNumberInstance(),
-            $parsedFormat
-        );
-    }
-
-    /**
-     * Format the phone number in a way that it can be dialled from the provided country.
-     *
-     * @param string $country
-     * @return string
-     * @throws \Propaganistas\LaravelPhone\Exceptions\CountryCodeException
-     */
-    public function formatForCountry($country)
-    {
-        if (! static::isValidCountryCode($country)) {
-            throw CountryCodeException::invalid($country);
-        }
-
-        return $this->lib->formatOutOfCountryCallingNumber(
-            $this->getPhoneNumberInstance(),
-            $country
-        );
-    }
-
-    /**
-     * Format the phone number in a way that it can be dialled from the provided country using a cellphone.
-     *
-     * @param string $country
-     * @param bool   $removeFormatting
-     * @return string
-     * @throws \Propaganistas\LaravelPhone\Exceptions\CountryCodeException
-     */
-    public function formatForMobileDialingInCountry($country, $removeFormatting = false)
-    {
-        if (! static::isValidCountryCode($country)) {
-            throw CountryCodeException::invalid($country);
-        }
-
-        return $this->lib->formatNumberForMobileDialing(
-            $this->getPhoneNumberInstance(),
-            $country,
-            $removeFormatting
-        );
-    }
-
-    /**
-     * Get the phone number's country.
-     *
-     * @return string
-     */
-    public function getCountry()
-    {
-        if (! $this->country) {
-            $this->country = $this->filterValidCountry($this->countries);
-        }
-
-        return $this->country;
-    }
-
-    /**
-     * Check if the phone number is of (a) given country(ies).
-     *
-     * @param string|array $country
-     * @return bool
-     */
-    public function isOfCountry($country)
-    {
-        $countries = static::parseCountries($country);
-
-        return in_array($this->getCountry(), $countries);
-    }
-
-    /**
-     * Filter the provided countries to the one that is valid for the number.
-     *
-     * @param string|array $countries
-     * @return string
-     * @throws \Propaganistas\LaravelPhone\Exceptions\NumberParseException
-     */
-    protected function filterValidCountry($countries)
-    {
-        $result = Collection::make($countries)
-                            ->filter(function ($country) {
-                                $instance = $this->lib->parse($this->number, $country);
-
-                                return $this->lenient
-                                    ? $this->lib->isPossibleNumber($instance, $country)
-                                    : $this->lib->isValidNumberForRegion($instance, $country);
-                            })->first();
-
-        // If we got a new result, return it.
-        if ($result) {
-            return $result;
-        }
-
-        // Last resort: try to detect it from an international number.
-        if ($this->numberLooksInternational()) {
-            $countries[] = null;
-        }
-
-        foreach ($countries as $country) {
-            $instance = $this->lib->parse($this->number, $country);
-
-            if ($this->lib->isValidNumber($instance)) {
-                return $this->lib->getRegionCodeForNumber($instance);
-            }
-        }
-
-        throw NumberParseException::countryRequired($this->number);
-    }
-
-    /**
-     * Get the phone number's type.
-     *
-     * @param bool $asConstant
-     * @return string|int|null
-     */
-    public function getType($asConstant = false)
-    {
-        $type = $this->lib->getNumberType($this->getPhoneNumberInstance());
-
-        if ($asConstant) {
-            return $type;
-        }
-
-        $stringType = Arr::get(static::parseTypesAsStrings($type), 0);
-
-        return $stringType ? strtolower($stringType) : null;
-    }
-
-    /**
-     * Check if the phone number is of (a) given type(s).
-     *
-     * @param string $type
-     * @return bool
-     */
-    public function isOfType($type)
-    {
-        $types = static::parseTypes($type);
-
-        return in_array($this->getType(true), $types, true);
-    }
-
-    /**
-     * Get the PhoneNumber instance of the current number.
-     *
-     * @return \libphonenumber\PhoneNumber
-     */
-    public function getPhoneNumberInstance()
-    {
-        return $this->lib->parse($this->number, $this->getCountry());
-    }
-
-    /**
-     * Determine whether the phone number seems to be in international format.
-     *
-     * @return bool
-     */
-    protected function numberLooksInternational()
-    {
-        return Str::startsWith($this->number, '+');
-    }
-
-    /**
-     * Enable lenient number parsing.
-     *
-     * @return $this
-     */
-    public function lenient()
-    {
-        $this->lenient = true;
-
-        return $this;
-    }
-
-    /**
-     * Convert the phone instance to JSON.
-     *
-     * @param  int $options
-     * @return string
-     */
-    public function toJson($options = 0)
-    {
-        return json_encode($this->jsonSerialize(), $options);
-    }
-
-    /**
-     * Convert the phone instance into something JSON serializable.
-     *
-     * @return string
-     */
-    public function jsonSerialize()
-    {
-        return $this->formatE164();
-    }
-
-    /**
-     * Convert the phone instance into a string representation.
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        return $this->formatE164();
-    }
-
-    /**
-     * Reconstructs the phone instance from a string representation.
-     *
-     * @param string $serialized
-     */
-    public function unserialize($serialized)
-    {
-        $this->lib = PhoneNumberUtil::getInstance();
-        $this->number = $serialized;
-        $this->country = $this->lib->getRegionCodeForNumber($this->getPhoneNumberInstance());
-    }
-
-    /**
-     * Convert the phone instance to a formatted number.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        // Formatting the phone number could throw an exception, but __toString() doesn't cope well with that.
-        // Let's just return the original number in that case.
-        try {
-            return $this->formatE164();
-        } catch (Exception $exception) {
-            return $this->number;
-        }
-    }
+	use ParsesCountries,
+		ParsesFormats,
+		ParsesTypes;
+
+	/**
+	 * The provided phone number.
+	 *
+	 * @var string
+	 */
+	protected $number;
+
+	/**
+	 * The provided phone country.
+	 *
+	 * @var array
+	 */
+	protected $countries = [];
+
+	/**
+	 * The detected phone country.
+	 *
+	 * @var string
+	 */
+	protected $country;
+
+	/**
+	 * Whether to allow lenient checks (i.e. landline numbers without area codes).
+	 *
+	 * @var bool
+	 */
+	protected $lenient = false;
+
+	/**
+	 * @var \libphonenumber\PhoneNumberUtil
+	 */
+	protected $lib;
+
+	/**
+	 * Phone constructor.
+	 *
+	 * @param string $number
+	 */
+	public function __construct($number)
+	{
+		$this->number = $number;
+		$this->lib = PhoneNumberUtil::getInstance();
+	}
+
+	/**
+	 * Create a phone instance.
+	 *
+	 * @param string       $number
+	 * @param string|array $country
+	 * @return static
+	 */
+	public static function make($number, $country = [])
+	{
+		$instance = new static($number);
+
+		return $instance->ofCountry($country);
+	}
+
+	/**
+	 * Set the country to which the phone number belongs to.
+	 *
+	 * @param string|array $country
+	 * @return static
+	 */
+	public function ofCountry($country)
+	{
+		$countries = is_array($country) ? $country : func_get_args();
+
+		$instance = clone $this;
+		$instance->countries = array_unique(
+			array_merge($instance->countries, static::parseCountries($countries))
+		);
+
+		return $instance;
+	}
+
+	/**
+	 * Format the phone number in international format.
+	 *
+	 * @return string
+	 */
+	public function formatInternational()
+	{
+		return $this->format(PhoneNumberFormat::INTERNATIONAL);
+	}
+
+	/**
+	 * Format the phone number in national format.
+	 *
+	 * @return string
+	 */
+	public function formatNational()
+	{
+		return $this->format(PhoneNumberFormat::NATIONAL);
+	}
+
+	/**
+	 * Format the phone number in E164 format.
+	 *
+	 * @return string
+	 */
+	public function formatE164()
+	{
+		return $this->format(PhoneNumberFormat::E164);
+	}
+
+	/**
+	 * Format the phone number in RFC3966 format.
+	 *
+	 * @return string
+	 */
+	public function formatRFC3966()
+	{
+		return $this->format(PhoneNumberFormat::RFC3966);
+	}
+
+	/**
+	 * Format the phone number in a given format.
+	 *
+	 * @param string $format
+	 * @return string
+	 * @throws \Propaganistas\LaravelPhone\Exceptions\NumberFormatException
+	 */
+	public function format($format)
+	{
+		$parsedFormat = static::parseFormat($format);
+
+		if (is_null($parsedFormat)) {
+			throw NumberFormatException::invalid($format);
+		}
+
+		return $this->lib->format(
+			$this->getPhoneNumberInstance(),
+			$parsedFormat
+		);
+	}
+
+	/**
+	 * Format the phone number in a way that it can be dialled from the provided country.
+	 *
+	 * @param string $country
+	 * @return string
+	 * @throws \Propaganistas\LaravelPhone\Exceptions\CountryCodeException
+	 */
+	public function formatForCountry($country)
+	{
+		if (! static::isValidCountryCode($country)) {
+			throw CountryCodeException::invalid($country);
+		}
+
+		return $this->lib->formatOutOfCountryCallingNumber(
+			$this->getPhoneNumberInstance(),
+			$country
+		);
+	}
+
+	/**
+	 * Format the phone number in a way that it can be dialled from the provided country using a cellphone.
+	 *
+	 * @param string $country
+	 * @param bool   $removeFormatting
+	 * @return string
+	 * @throws \Propaganistas\LaravelPhone\Exceptions\CountryCodeException
+	 */
+	public function formatForMobileDialingInCountry($country, $removeFormatting = false)
+	{
+		if (! static::isValidCountryCode($country)) {
+			throw CountryCodeException::invalid($country);
+		}
+
+		return $this->lib->formatNumberForMobileDialing(
+			$this->getPhoneNumberInstance(),
+			$country,
+			$removeFormatting
+		);
+	}
+
+	/**
+	 * Get the phone number's country.
+	 *
+	 * @return string
+	 */
+	public function getCountry()
+	{
+		if (! $this->country) {
+			$this->country = $this->filterValidCountry($this->countries);
+		}
+
+		return $this->country;
+	}
+
+	/**
+	 * Check if the phone number is of (a) given country(ies).
+	 *
+	 * @param string|array $country
+	 * @return bool
+	 */
+	public function isOfCountry($country)
+	{
+		$countries = static::parseCountries($country);
+
+		return in_array($this->getCountry(), $countries);
+	}
+
+	/**
+	 * Filter the provided countries to the one that is valid for the number.
+	 *
+	 * @param string|array $countries
+	 * @return string
+	 * @throws \Propaganistas\LaravelPhone\Exceptions\NumberParseException
+	 */
+	protected function filterValidCountry($countries)
+	{
+		$result = Collection::make($countries)
+							->filter(function ($country) {
+								$instance = $this->lib->parse($this->number, $country);
+
+								return $this->lenient
+									? $this->lib->isPossibleNumber($instance, $country)
+									: $this->lib->isValidNumberForRegion($instance, $country);
+							})->first();
+
+		// If we got a new result, return it.
+		if ($result) {
+			return $result;
+		}
+
+		// Last resort: try to detect it from an international number.
+		if ($this->numberLooksInternational()) {
+			$countries[] = null;
+		}
+
+		foreach ($countries as $country) {
+			$instance = $this->lib->parse($this->number, $country);
+
+			if ($this->lib->isValidNumber($instance)) {
+				return $this->lib->getRegionCodeForNumber($instance);
+			}
+		}
+
+		throw NumberParseException::countryRequired($this->number);
+	}
+
+	/**
+	 * Get the phone number's type.
+	 *
+	 * @param bool $asConstant
+	 * @return string|int|null
+	 */
+	public function getType($asConstant = false)
+	{
+		$type = $this->lib->getNumberType($this->getPhoneNumberInstance());
+
+		if ($asConstant) {
+			return $type;
+		}
+
+		$stringType = Arr::get(static::parseTypesAsStrings($type), 0);
+
+		return $stringType ? strtolower($stringType) : null;
+	}
+
+	/**
+	 * Check if the phone number is of (a) given type(s).
+	 *
+	 * @param string $type
+	 * @return bool
+	 */
+	public function isOfType($type)
+	{
+		$types = static::parseTypes($type);
+
+		return in_array($this->getType(true), $types, true);
+	}
+
+	/**
+	 * Get the PhoneNumber instance of the current number.
+	 *
+	 * @return \libphonenumber\PhoneNumber
+	 */
+	public function getPhoneNumberInstance()
+	{
+		return $this->lib->parse($this->number, $this->getCountry());
+	}
+
+	/**
+	 * Determine whether the phone number seems to be in international format.
+	 *
+	 * @return bool
+	 */
+	protected function numberLooksInternational()
+	{
+		return Str::startsWith($this->number, '+');
+	}
+
+	/**
+	 * Enable lenient number parsing.
+	 *
+	 * @return $this
+	 */
+	public function lenient()
+	{
+		$this->lenient = true;
+
+		return $this;
+	}
+
+	/**
+	 * Convert the phone instance to JSON.
+	 *
+	 * @param  int $options
+	 * @return string
+	 */
+	public function toJson($options = 0)
+	{
+		return json_encode($this->jsonSerialize(), $options);
+	}
+
+	/**
+	 * Convert the phone instance into something JSON serializable.
+	 *
+	 * @return string
+	 */
+	public function jsonSerialize()
+	{
+		return $this->formatE164();
+	}
+
+	/**
+	 * Convert the phone instance into a string representation.
+	 *
+	 * @return string
+	 */
+	public function serialize()
+	{
+		return $this->formatE164();
+	}
+
+	/**
+	 * Reconstructs the phone instance from a string representation.
+	 *
+	 * @param string $serialized
+	 */
+	public function unserialize($serialized)
+	{
+		$this->lib = PhoneNumberUtil::getInstance();
+		$this->number = $serialized;
+		$this->country = $this->lib->getRegionCodeForNumber($this->getPhoneNumberInstance());
+	}
+
+	/**
+	 * Convert the phone instance to a formatted number.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// Formatting the phone number could throw an exception, but __toString() doesn't cope well with that.
+		// Let's just return the original number in that case.
+		try {
+			return $this->formatE164();
+		} catch (Exception $exception) {
+			return $this->number;
+		}
+	}
 }
\ No newline at end of file

src/Exceptions/NumberFormatException.php

Indentation +10 added lines, -10 removed lines

@@ -4,14 +4,14 @@
 
 class NumberFormatException extends Exception implements PhoneNumberException
 {
-    /**
-     * Invalid number format static constructor.
-     *
-     * @param string $format
-     * @return static
-     */
-    public static function invalid($format)
-    {
-        return new static('Invalid number format "' . $format . '".');
-    }
+	/**
+	 * Invalid number format static constructor.
+	 *
+	 * @param string $format
+	 * @return static
+	 */
+	public static function invalid($format)
+	{
+		return new static('Invalid number format "' . $format . '".');
+	}
 }
\ No newline at end of file