Propaganistas / Laravel-Phone

src/LaravelPhoneFacade.php

Indentation +9 added lines, -9 removed lines

@@ -4,13 +4,13 @@
 
 class LaravelPhoneFacade extends Facade
 {
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string
-     */
-    protected static function getFacadeAccessor()
-    {
-        return 'libphonenumber';
-    }
+	/**
+	 * Get the registered name of the component.
+	 *
+	 * @return string
+	 */
+	protected static function getFacadeAccessor()
+	{
+		return 'libphonenumber';
+	}
 }

src/PhoneValidator.php

Indentation +241 added lines, -241 removed lines

@@ -10,246 +10,246 @@
 class PhoneValidator
 {
 
-    /**
-     * @var \libphonenumber\PhoneNumberUtil
-     */
-    protected $lib;
-
-    /**
-     * Dotted validator data.
-     *
-     * @var array
-     */
-    protected $data;
-
-    /**
-     * Whether the country should be auto-detected.
-     *
-     * @var bool
-     */
-    protected $autodetect = false;
-
-    /**
-     * Whether to allow lenient checking of numbers (i.e. landline without area codes).
-     *
-     * @var bool
-     */
-    protected $lenient = false;
-
-    /**
-     * The field to use for country if not passed as a parameter.
-     *
-     * @var string|null
-     */
-    protected $countryField = null;
-
-    /**
-     * Countries to validate against.
-     *
-     * @var array
-     */
-    protected $countries = [];
-
-    /**
-     * Transformed phone number types to validate against.
-     *
-     * @var array
-     */
-    protected $types = [];
-
-    /**
-     * PhoneValidator constructor.
-     */
-    public function __construct(PhoneNumberUtil $lib)
-    {
-        $this->lib = $lib;
-    }
-
-    /**
-     * Validates a phone number.
-     *
-     * @param  string $attribute
-     * @param  mixed  $value
-     * @param  array  $parameters
-     * @param  object $validator
-     * @return bool
-     * @throws \Propaganistas\LaravelPhone\Exceptions\InvalidParameterException
-     * @throws \Propaganistas\LaravelPhone\Exceptions\NoValidCountryFoundException
-     */
-    public function validatePhone($attribute, $value, array $parameters, $validator)
-    {
-        $this->data = array_dot($validator->getData());
-
-        $this->assignParameters($parameters);
-
-        $this->checkCountries($attribute);
-
-        // If autodetecting, let's first try without a country.
-        // Otherwise use provided countries as default.
-        if ($this->autodetect || ($this->lenient && empty($this->countries))) {
-            array_unshift($this->countries, null);
-        }
-
-        foreach ($this->countries as $country) {
-            if ($this->isValidNumber($value, $country)) {
-                return true;
-            }
-        }
-
-        // All specified country validations have failed.
-        return false;
-    }
-
-    /**
-     * Parses the supplied validator parameters.
-     *
-     * @param array $parameters
-     * @throws \Propaganistas\LaravelPhone\Exceptions\InvalidParameterException
-     */
-    protected function assignParameters(array $parameters)
-    {
-        $types = [];
-
-        foreach ($parameters as $parameter) {
-            // First check if the parameter is some phone type configuration.
-            if ($this->isPhoneType($parameter)) {
-                $types[] = strtoupper($parameter);
-            } elseif ($this->isPhoneCountry($parameter)) {
-                $this->countries[] = strtoupper($parameter);
-            } elseif ($parameter == 'AUTO') {
-                $this->autodetect = true;
-            } elseif ($parameter == 'LENIENT') {
-                $this->lenient = true;
-            } // Lastly check if it is an input field containing the country.
-            elseif ($this->isInputField($parameter)) {
-                $this->countryField = $parameter;
-            } else {
-                // Force developers to write proper code.
-                throw new InvalidParameterException($parameter);
-            }
-        }
-
-        $this->types = $this->parseTypes($types);
-
-    }
-
-    /**
-     * Checks the detected countries. Overrides countries if a country field is present.
-     * When using a country field, we should validate to false if country is empty so no exception
-     * will be thrown.
-     *
-     * @param string $attribute
-     * @throws \Propaganistas\LaravelPhone\Exceptions\NoValidCountryFoundException
-     */
-    protected function checkCountries($attribute)
-    {
-        $countryField = (is_null($this->countryField) ? $attribute . '_country' : $this->countryField);
-
-        if ($this->isInputField($countryField)) {
-            $this->countries = [array_get($this->data, $countryField)];
-        } elseif (! $this->autodetect && ! $this->lenient && empty($this->countries)) {
-            throw new NoValidCountryFoundException;
-        }
-    }
-
-    /**
-     * Performs the actual validation of the phone number.
-     *
-     * @param mixed $number
-     * @param null  $country
-     * @return bool
-     */
-    protected function isValidNumber($number, $country = null)
-    {
-        try {
-            // Throws NumberParseException if not parsed correctly against the supplied country.
-            // If no country was given, tries to discover the country code from the number itself.
-            $phoneNumber = $this->lib->parse($number, $country);
-
-            // Check if type is allowed.
-            if (empty($this->types) || in_array($this->lib->getNumberType($phoneNumber), $this->types)) {
-
-                // Lenient validation.
-                if ($this->lenient) {
-                    return $this->lib->isPossibleNumber($phoneNumber, $country);
-                }
-
-                // For automatic detection, the number should have a country code.
-                if ($phoneNumber->hasCountryCode()) {
-
-                    // Automatic detection:
-                    if ($this->autodetect) {
-                        // Validate if the international phone number is valid for its contained country.
-                        return $this->lib->isValidNumber($phoneNumber);
-                    }
-
-                    // Validate number against the specified country.
-                    return $this->lib->isValidNumberForRegion($phoneNumber, $country);
-                }
-            }
-
-        } catch (NumberParseException $e) {
-            // Proceed to default validation error.
-        }
-
-        return false;
-    }
-
-    /**
-     * Parses the supplied phone number types.
-     *
-     * @param array $types
-     * @return array
-     */
-    protected function parseTypes(array $types)
-    {
-        // Transform types to their namespaced class constant.
-        array_walk($types, function (&$type) {
-            $type = constant('\libphonenumber\PhoneNumberType::' . $type);
-        });
-
-        // Add in the unsure number type if applicable.
-        if (array_intersect([PhoneNumberType::FIXED_LINE, PhoneNumberType::MOBILE], $types)) {
-            $types[] = PhoneNumberType::FIXED_LINE_OR_MOBILE;
-        }
-
-        return $types;
-    }
-
-    /**
-     * Checks if the given field is an actual input field.
-     *
-     * @param string $field
-     * @return bool
-     */
-    public function isInputField($field)
-    {
-        return ! is_null(array_get($this->data, $field));
-    }
-
-    /**
-     * Checks if the supplied string is a valid country code.
-     *
-     * @param  string $country
-     * @return bool
-     */
-    public function isPhoneCountry($country)
-    {
-        return ISO3166::isValid(strtoupper($country));
-    }
-
-    /**
-     * Checks if the supplied string is a valid phone number type.
-     *
-     * @param  string $type
-     * @return bool
-     */
-    public function isPhoneType($type)
-    {
-        // Legacy support.
-        $type = ($type == 'LANDLINE' ? 'FIXED_LINE' : $type);
-
-        return defined('\libphonenumber\PhoneNumberType::' . strtoupper($type));
-    }
+	/**
+	 * @var \libphonenumber\PhoneNumberUtil
+	 */
+	protected $lib;
+
+	/**
+	 * Dotted validator data.
+	 *
+	 * @var array
+	 */
+	protected $data;
+
+	/**
+	 * Whether the country should be auto-detected.
+	 *
+	 * @var bool
+	 */
+	protected $autodetect = false;
+
+	/**
+	 * Whether to allow lenient checking of numbers (i.e. landline without area codes).
+	 *
+	 * @var bool
+	 */
+	protected $lenient = false;
+
+	/**
+	 * The field to use for country if not passed as a parameter.
+	 *
+	 * @var string|null
+	 */
+	protected $countryField = null;
+
+	/**
+	 * Countries to validate against.
+	 *
+	 * @var array
+	 */
+	protected $countries = [];
+
+	/**
+	 * Transformed phone number types to validate against.
+	 *
+	 * @var array
+	 */
+	protected $types = [];
+
+	/**
+	 * PhoneValidator constructor.
+	 */
+	public function __construct(PhoneNumberUtil $lib)
+	{
+		$this->lib = $lib;
+	}
+
+	/**
+	 * Validates a phone number.
+	 *
+	 * @param  string $attribute
+	 * @param  mixed  $value
+	 * @param  array  $parameters
+	 * @param  object $validator
+	 * @return bool
+	 * @throws \Propaganistas\LaravelPhone\Exceptions\InvalidParameterException
+	 * @throws \Propaganistas\LaravelPhone\Exceptions\NoValidCountryFoundException
+	 */
+	public function validatePhone($attribute, $value, array $parameters, $validator)
+	{
+		$this->data = array_dot($validator->getData());
+
+		$this->assignParameters($parameters);
+
+		$this->checkCountries($attribute);
+
+		// If autodetecting, let's first try without a country.
+		// Otherwise use provided countries as default.
+		if ($this->autodetect || ($this->lenient && empty($this->countries))) {
+			array_unshift($this->countries, null);
+		}
+
+		foreach ($this->countries as $country) {
+			if ($this->isValidNumber($value, $country)) {
+				return true;
+			}
+		}
+
+		// All specified country validations have failed.
+		return false;
+	}
+
+	/**
+	 * Parses the supplied validator parameters.
+	 *
+	 * @param array $parameters
+	 * @throws \Propaganistas\LaravelPhone\Exceptions\InvalidParameterException
+	 */
+	protected function assignParameters(array $parameters)
+	{
+		$types = [];
+
+		foreach ($parameters as $parameter) {
+			// First check if the parameter is some phone type configuration.
+			if ($this->isPhoneType($parameter)) {
+				$types[] = strtoupper($parameter);
+			} elseif ($this->isPhoneCountry($parameter)) {
+				$this->countries[] = strtoupper($parameter);
+			} elseif ($parameter == 'AUTO') {
+				$this->autodetect = true;
+			} elseif ($parameter == 'LENIENT') {
+				$this->lenient = true;
+			} // Lastly check if it is an input field containing the country.
+			elseif ($this->isInputField($parameter)) {
+				$this->countryField = $parameter;
+			} else {
+				// Force developers to write proper code.
+				throw new InvalidParameterException($parameter);
+			}
+		}
+
+		$this->types = $this->parseTypes($types);
+
+	}
+
+	/**
+	 * Checks the detected countries. Overrides countries if a country field is present.
+	 * When using a country field, we should validate to false if country is empty so no exception
+	 * will be thrown.
+	 *
+	 * @param string $attribute
+	 * @throws \Propaganistas\LaravelPhone\Exceptions\NoValidCountryFoundException
+	 */
+	protected function checkCountries($attribute)
+	{
+		$countryField = (is_null($this->countryField) ? $attribute . '_country' : $this->countryField);
+
+		if ($this->isInputField($countryField)) {
+			$this->countries = [array_get($this->data, $countryField)];
+		} elseif (! $this->autodetect && ! $this->lenient && empty($this->countries)) {
+			throw new NoValidCountryFoundException;
+		}
+	}
+
+	/**
+	 * Performs the actual validation of the phone number.
+	 *
+	 * @param mixed $number
+	 * @param null  $country
+	 * @return bool
+	 */
+	protected function isValidNumber($number, $country = null)
+	{
+		try {
+			// Throws NumberParseException if not parsed correctly against the supplied country.
+			// If no country was given, tries to discover the country code from the number itself.
+			$phoneNumber = $this->lib->parse($number, $country);
+
+			// Check if type is allowed.
+			if (empty($this->types) || in_array($this->lib->getNumberType($phoneNumber), $this->types)) {
+
+				// Lenient validation.
+				if ($this->lenient) {
+					return $this->lib->isPossibleNumber($phoneNumber, $country);
+				}
+
+				// For automatic detection, the number should have a country code.
+				if ($phoneNumber->hasCountryCode()) {
+
+					// Automatic detection:
+					if ($this->autodetect) {
+						// Validate if the international phone number is valid for its contained country.
+						return $this->lib->isValidNumber($phoneNumber);
+					}
+
+					// Validate number against the specified country.
+					return $this->lib->isValidNumberForRegion($phoneNumber, $country);
+				}
+			}
+
+		} catch (NumberParseException $e) {
+			// Proceed to default validation error.
+		}
+
+		return false;
+	}
+
+	/**
+	 * Parses the supplied phone number types.
+	 *
+	 * @param array $types
+	 * @return array
+	 */
+	protected function parseTypes(array $types)
+	{
+		// Transform types to their namespaced class constant.
+		array_walk($types, function (&$type) {
+			$type = constant('\libphonenumber\PhoneNumberType::' . $type);
+		});
+
+		// Add in the unsure number type if applicable.
+		if (array_intersect([PhoneNumberType::FIXED_LINE, PhoneNumberType::MOBILE], $types)) {
+			$types[] = PhoneNumberType::FIXED_LINE_OR_MOBILE;
+		}
+
+		return $types;
+	}
+
+	/**
+	 * Checks if the given field is an actual input field.
+	 *
+	 * @param string $field
+	 * @return bool
+	 */
+	public function isInputField($field)
+	{
+		return ! is_null(array_get($this->data, $field));
+	}
+
+	/**
+	 * Checks if the supplied string is a valid country code.
+	 *
+	 * @param  string $country
+	 * @return bool
+	 */
+	public function isPhoneCountry($country)
+	{
+		return ISO3166::isValid(strtoupper($country));
+	}
+
+	/**
+	 * Checks if the supplied string is a valid phone number type.
+	 *
+	 * @param  string $type
+	 * @return bool
+	 */
+	public function isPhoneType($type)
+	{
+		// Legacy support.
+		$type = ($type == 'LANDLINE' ? 'FIXED_LINE' : $type);
+
+		return defined('\libphonenumber\PhoneNumberType::' . strtoupper($type));
+	}
 
 }

Spacing +6 added lines, -6 removed lines

@@ -143,11 +143,11 @@ 
      */
     protected function checkCountries($attribute)
     {
-        $countryField = (is_null($this->countryField) ? $attribute . '_country' : $this->countryField);
+        $countryField = (is_null($this->countryField) ? $attribute.'_country' : $this->countryField);
 
         if ($this->isInputField($countryField)) {
             $this->countries = [array_get($this->data, $countryField)];
-        } elseif (! $this->autodetect && ! $this->lenient && empty($this->countries)) {
+        } elseif (!$this->autodetect && !$this->lenient && empty($this->countries)) {
             throw new NoValidCountryFoundException;
         }
     }
@@ -204,8 +204,8 @@ 
     protected function parseTypes(array $types)
     {
         // Transform types to their namespaced class constant.
-        array_walk($types, function (&$type) {
-            $type = constant('\libphonenumber\PhoneNumberType::' . $type);
+        array_walk($types, function(&$type) {
+            $type = constant('\libphonenumber\PhoneNumberType::'.$type);
         });
 
         // Add in the unsure number type if applicable.
@@ -224,7 +224,7 @@ 
      */
     public function isInputField($field)
     {
-        return ! is_null(array_get($this->data, $field));
+        return !is_null(array_get($this->data, $field));
     }
 
     /**
@@ -249,7 +249,7 @@ 
         // Legacy support.
         $type = ($type == 'LANDLINE' ? 'FIXED_LINE' : $type);
 
-        return defined('\libphonenumber\PhoneNumberType::' . strtoupper($type));
+        return defined('\libphonenumber\PhoneNumberType::'.strtoupper($type));
     }
 
 }

src/helpers.php

Spacing +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
 use Illuminate\Support\Facades\App;
 use libphonenumber\PhoneNumberFormat;
 
-if (! function_exists('phone')) {
+if (!function_exists('phone')) {
     /**
      * Get the PhoneNumberUtil or format a phone number for display.
      *
@@ -13,7 +13,7 @@ 
     {
         $lib = App::make('libphonenumber');
 
-        if (! $arguments = func_get_args()) {
+        if (!$arguments = func_get_args()) {
             return $lib;
         }
 
@@ -28,7 +28,7 @@ 
     }
 }
 
-if (! function_exists('phone_format')) {
+if (!function_exists('phone_format')) {
     /**
      * Formats a phone number and country for display.
      *

Indentation +33 added lines, -33 removed lines

@@ -4,43 +4,43 @@
 use libphonenumber\PhoneNumberFormat;
 
 if (! function_exists('phone')) {
-    /**
-     * Get the PhoneNumberUtil or format a phone number for display.
-     *
-     * @return \libphonenumber\PhoneNumberUtil|string
-     */
-    function phone()
-    {
-        $lib = App::make('libphonenumber');
+	/**
+	 * Get the PhoneNumberUtil or format a phone number for display.
+	 *
+	 * @return \libphonenumber\PhoneNumberUtil|string
+	 */
+	function phone()
+	{
+		$lib = App::make('libphonenumber');
 
-        if (! $arguments = func_get_args()) {
-            return $lib;
-        }
+		if (! $arguments = func_get_args()) {
+			return $lib;
+		}
 
-        $phone = $arguments[0];
-        $country = isset($arguments[1]) ? $arguments[1] : App::getLocale();
-        $format = isset($arguments[2]) ? $arguments[2] : PhoneNumberFormat::INTERNATIONAL;
+		$phone = $arguments[0];
+		$country = isset($arguments[1]) ? $arguments[1] : App::getLocale();
+		$format = isset($arguments[2]) ? $arguments[2] : PhoneNumberFormat::INTERNATIONAL;
 
-        return $lib->format(
-            $lib->parse($phone, $country),
-            $format
-        );
-    }
+		return $lib->format(
+			$lib->parse($phone, $country),
+			$format
+		);
+	}
 }
 
 if (! function_exists('phone_format')) {
-    /**
-     * Formats a phone number and country for display.
-     *
-     * @param string   $phone
-     * @param string   $country
-     * @param int|null $format
-     * @return string
-     *
-     * @deprecated 2.8.0
-     */
-    function phone_format($phone, $country = null, $format = PhoneNumberFormat::INTERNATIONAL)
-    {
-        return phone($phone, $country, $format);
-    }
+	/**
+	 * Formats a phone number and country for display.
+	 *
+	 * @param string   $phone
+	 * @param string   $country
+	 * @param int|null $format
+	 * @return string
+	 *
+	 * @deprecated 2.8.0
+	 */
+	function phone_format($phone, $country = null, $format = PhoneNumberFormat::INTERNATIONAL)
+	{
+		return phone($phone, $country, $format);
+	}
 }

src/LaravelPhoneServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      */
     public function register()
     {
-        $this->app->singleton('libphonenumber', function ($app) {
+        $this->app->singleton('libphonenumber', function($app) {
             return PhoneNumberUtil::getInstance();
         });
 

Indentation +32 added lines, -32 removed lines

@@ -6,41 +6,41 @@
 
 class LaravelPhoneServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the application events.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $extend = static::canUseDependentValidation() ? 'extendDependent' : 'extend';
+	/**
+	 * Bootstrap the application events.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$extend = static::canUseDependentValidation() ? 'extendDependent' : 'extend';
 
-        $this->app['validator']->{$extend}('phone', 'Propaganistas\LaravelPhone\PhoneValidator@validatePhone');
-    }
+		$this->app['validator']->{$extend}('phone', 'Propaganistas\LaravelPhone\PhoneValidator@validatePhone');
+	}
 
-    /**
-     * 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', 'libphonenumber\PhoneNumberUtil');
-    }
+		$this->app->alias('libphonenumber', 'libphonenumber\PhoneNumberUtil');
+	}
 
-    /**
-     * 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/Phone.php

Doc Comments +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
     /**
      * Throw a IndeterminablePhoneCountryException.
      *
-     * @param $message
+     * @param string $message
      * @throws \Propaganistas\LaravelPhone\Exceptions\PhoneCountryException
      */
     protected function throwCountryException($message)

Indentation +286 added lines, -286 removed lines

@@ -16,290 +16,290 @@
 
 class Phone implements Jsonable, JsonSerializable, Serializable
 {
-    use ParsesCountries,
-        ParsesFormats,
-        ParsesTypes;
-
-    /**
-     * The provided phone number.
-     *
-     * @var string
-     */
-    protected $number;
-
-    /**
-     * The provided phone countries.
-     *
-     * @var array
-     */
-    protected $countries = [];
-
-    /**
-     * @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 = null)
-    {
-        $instance = new static($number);
-
-        return $instance->ofCountry($country);
-    }
-
-    /**
-     * Set the country to which the phone number belongs to.
-     *
-     * @param string|array $country
-     * @return $this
-     */
-    public function ofCountry($country)
-    {
-        $instance = clone $this;
-        $instance->countries = $instance->parseCountries($country);
-
-        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
-     */
-    public function format($format)
-    {
-        if (! ($format = static::parseFormat($format))) {
-            return $this->throwFormatException('Unknown format "' . (string) $format . '"');
-        }
-
-        $country = Arr::get($this->countries, 0);
-
-        if (! $country && ! Str::startsWith($this->number, '+')) {
-            return $this->throwFormatException('A country should be provided or the number should be in international format');
-        }
-
-        return $this->lib->format(
-            $this->getPhoneNumberInstance(),
-            $format
-        );
-    }
-
-    /**
-     * Format the phone number in a way that it can be dialled from the provided country.
-     *
-     * @param string $country
-     * @return string
-     */
-    public function formatForCountry($country)
-    {
-        if (! static::isCountryCode($country)) {
-            return $this->throwCountryException($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
-     */
-    public function formatForMobileDialingInCountry($country, $removeFormatting = false)
-    {
-        if (! static::isCountryCode($country)) {
-            return $this->throwCountryException($country);
-        }
-
-        return $this->lib->formatNumberForMobileDialing(
-            $this->getPhoneNumberInstance(),
-            $country,
-            $removeFormatting
-        );
-    }
-
-    /**
-     * Get the phone number's country.
-     *
-     * @return string
-     */
-    public function getCountry()
-    {
-        return $this->lib->getRegionCodeForNumber($this->getPhoneNumberInstance());
-    }
-
-    /**
-     * Get the phone number's type.
-     *
-     * @param bool $asConstant
-     * @return string|int
-     */
-    public function getType($asConstant = false)
-    {
-        $type = $this->lib->getNumberType($this->getPhoneNumberInstance());
-
-        return $asConstant ? $type : array_search($type, static::$types);
-    }
-
-    /**
-     * Get the PhoneNumber instance of the current number.
-     *
-     * @return \libphonenumber\PhoneNumber
-     */
-    public function getPhoneNumberInstance()
-    {
-        // Let's try each provided country.
-        foreach ($this->countries as $country) {
-            try {
-                return $this->lib->parse($this->number, $country);
-            } catch (NumberParseException $exception) {
-            }
-        }
-
-        // Otherwise let's try to autodetect the country if the number is in international format.
-        if (Str::startsWith($this->number, '+')) {
-            try {
-                return $this->lib->parse($this->number, null);
-            } catch (NumberParseException $exception) {
-            }
-        }
-
-        return $this->throwCountryException($this->number);
-    }
-
-    /**
-     * Throw a IndeterminablePhoneCountryException.
-     *
-     * @param $message
-     * @throws \Propaganistas\LaravelPhone\Exceptions\PhoneCountryException
-     */
-    protected function throwCountryException($message)
-    {
-        throw new PhoneCountryException($message);
-    }
-
-    /**
-     * Throw a PhoneFormatException.
-     *
-     * @param string $message
-     * @throws \Propaganistas\LaravelPhone\Exceptions\PhoneFormatException
-     */
-    protected function throwFormatException($message)
-    {
-        throw new PhoneFormatException($message);
-    }
-
-    /**
-     * 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->number = $serialized;
-        $this->countries = [];
-    }
-
-    /**
-     * Convert the phone instance to a formatted number.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->formatE164();
-    }
+	use ParsesCountries,
+		ParsesFormats,
+		ParsesTypes;
+
+	/**
+	 * The provided phone number.
+	 *
+	 * @var string
+	 */
+	protected $number;
+
+	/**
+	 * The provided phone countries.
+	 *
+	 * @var array
+	 */
+	protected $countries = [];
+
+	/**
+	 * @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 = null)
+	{
+		$instance = new static($number);
+
+		return $instance->ofCountry($country);
+	}
+
+	/**
+	 * Set the country to which the phone number belongs to.
+	 *
+	 * @param string|array $country
+	 * @return $this
+	 */
+	public function ofCountry($country)
+	{
+		$instance = clone $this;
+		$instance->countries = $instance->parseCountries($country);
+
+		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
+	 */
+	public function format($format)
+	{
+		if (! ($format = static::parseFormat($format))) {
+			return $this->throwFormatException('Unknown format "' . (string) $format . '"');
+		}
+
+		$country = Arr::get($this->countries, 0);
+
+		if (! $country && ! Str::startsWith($this->number, '+')) {
+			return $this->throwFormatException('A country should be provided or the number should be in international format');
+		}
+
+		return $this->lib->format(
+			$this->getPhoneNumberInstance(),
+			$format
+		);
+	}
+
+	/**
+	 * Format the phone number in a way that it can be dialled from the provided country.
+	 *
+	 * @param string $country
+	 * @return string
+	 */
+	public function formatForCountry($country)
+	{
+		if (! static::isCountryCode($country)) {
+			return $this->throwCountryException($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
+	 */
+	public function formatForMobileDialingInCountry($country, $removeFormatting = false)
+	{
+		if (! static::isCountryCode($country)) {
+			return $this->throwCountryException($country);
+		}
+
+		return $this->lib->formatNumberForMobileDialing(
+			$this->getPhoneNumberInstance(),
+			$country,
+			$removeFormatting
+		);
+	}
+
+	/**
+	 * Get the phone number's country.
+	 *
+	 * @return string
+	 */
+	public function getCountry()
+	{
+		return $this->lib->getRegionCodeForNumber($this->getPhoneNumberInstance());
+	}
+
+	/**
+	 * Get the phone number's type.
+	 *
+	 * @param bool $asConstant
+	 * @return string|int
+	 */
+	public function getType($asConstant = false)
+	{
+		$type = $this->lib->getNumberType($this->getPhoneNumberInstance());
+
+		return $asConstant ? $type : array_search($type, static::$types);
+	}
+
+	/**
+	 * Get the PhoneNumber instance of the current number.
+	 *
+	 * @return \libphonenumber\PhoneNumber
+	 */
+	public function getPhoneNumberInstance()
+	{
+		// Let's try each provided country.
+		foreach ($this->countries as $country) {
+			try {
+				return $this->lib->parse($this->number, $country);
+			} catch (NumberParseException $exception) {
+			}
+		}
+
+		// Otherwise let's try to autodetect the country if the number is in international format.
+		if (Str::startsWith($this->number, '+')) {
+			try {
+				return $this->lib->parse($this->number, null);
+			} catch (NumberParseException $exception) {
+			}
+		}
+
+		return $this->throwCountryException($this->number);
+	}
+
+	/**
+	 * Throw a IndeterminablePhoneCountryException.
+	 *
+	 * @param $message
+	 * @throws \Propaganistas\LaravelPhone\Exceptions\PhoneCountryException
+	 */
+	protected function throwCountryException($message)
+	{
+		throw new PhoneCountryException($message);
+	}
+
+	/**
+	 * Throw a PhoneFormatException.
+	 *
+	 * @param string $message
+	 * @throws \Propaganistas\LaravelPhone\Exceptions\PhoneFormatException
+	 */
+	protected function throwFormatException($message)
+	{
+		throw new PhoneFormatException($message);
+	}
+
+	/**
+	 * 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->number = $serialized;
+		$this->countries = [];
+	}
+
+	/**
+	 * Convert the phone instance to a formatted number.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->formatE164();
+	}
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -126,13 +126,13 @@ 
      */
     public function format($format)
     {
-        if (! ($format = static::parseFormat($format))) {
-            return $this->throwFormatException('Unknown format "' . (string) $format . '"');
+        if (!($format = static::parseFormat($format))) {
+            return $this->throwFormatException('Unknown format "'.(string) $format.'"');
         }
 
         $country = Arr::get($this->countries, 0);
 
-        if (! $country && ! Str::startsWith($this->number, '+')) {
+        if (!$country && !Str::startsWith($this->number, '+')) {
             return $this->throwFormatException('A country should be provided or the number should be in international format');
         }
 
@@ -150,7 +150,7 @@ 
      */
     public function formatForCountry($country)
     {
-        if (! static::isCountryCode($country)) {
+        if (!static::isCountryCode($country)) {
             return $this->throwCountryException($country);
         }
 
@@ -169,7 +169,7 @@ 
      */
     public function formatForMobileDialingInCountry($country, $removeFormatting = false)
     {
-        if (! static::isCountryCode($country)) {
+        if (!static::isCountryCode($country)) {
             return $this->throwCountryException($country);
         }
 

src/Exceptions/PhoneCountryException.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <?php namespace Propaganistas\LaravelPhone\Exceptions;
 
-class PhoneCountryException extends \Exception{}
+class PhoneCountryException extends \Exception {}

src/Traits/ParsesCountries.php

Indentation +24 added lines, -24 removed lines

@@ -4,31 +4,31 @@
 
 trait ParsesCountries
 {
-    /**
-     * Determine whether the given country code is valid.
-     *
-     * @param string $country
-     * @return bool
-     */
-    public static function isCountryCode($country)
-    {
-        return ISO3166::isValid($country);
-    }
+	/**
+	 * Determine whether the given country code is valid.
+	 *
+	 * @param string $country
+	 * @return bool
+	 */
+	public static function isCountryCode($country)
+	{
+		return ISO3166::isValid($country);
+	}
 
-    /**
-     * Parse the provided phone countries to a valid array.
-     *
-     * @param string|array $countries
-     * @return array
-     */
-    protected function parseCountries($countries)
-    {
-        $countries = is_array($countries) ? $countries : func_get_args();
+	/**
+	 * Parse the provided phone countries to a valid array.
+	 *
+	 * @param string|array $countries
+	 * @return array
+	 */
+	protected function parseCountries($countries)
+	{
+		$countries = is_array($countries) ? $countries : func_get_args();
 
-        return array_filter($countries, function ($code) {
-            $code = strtoupper($code);
+		return array_filter($countries, function ($code) {
+			$code = strtoupper($code);
 
-            return static::isCountryCode($code) ? $code : null;
-        });
-    }
+			return static::isCountryCode($code) ? $code : null;
+		});
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     {
         $countries = is_array($countries) ? $countries : func_get_args();
 
-        return array_filter($countries, function ($code) {
+        return array_filter($countries, function($code) {
             $code = strtoupper($code);
 
             return static::isCountryCode($code) ? $code : null;

src/Traits/ParsesTypes.php

Indentation +64 added lines, -64 removed lines

@@ -6,80 +6,80 @@
 
 trait ParsesTypes
 {
-    /**
-     * Array of available phone formats.
-     *
-     * @var array
-     */
-    protected static $types;
+	/**
+	 * Array of available phone formats.
+	 *
+	 * @var array
+	 */
+	protected static $types;
 
-    /**
-     * Determine whether the given type is valid.
-     *
-     * @param string $type
-     * @return bool
-     */
-    public static function isType($type)
-    {
-        return ! is_null(static::parseTypes($type));
-    }
+	/**
+	 * Determine whether the given type is valid.
+	 *
+	 * @param string $type
+	 * @return bool
+	 */
+	public static function isType($type)
+	{
+		return ! is_null(static::parseTypes($type));
+	}
 
-    /**
-     * Parse a phone type.
-     *
-     * @param string|array $types
-     * @return array
-     */
-    protected static function parseTypes($types)
-    {
-        static::loadTypes();
+	/**
+	 * Parse a phone type.
+	 *
+	 * @param string|array $types
+	 * @return array
+	 */
+	protected static function parseTypes($types)
+	{
+		static::loadTypes();
 
-        $types = is_array($types) ? $types : func_get_args();
+		$types = is_array($types) ? $types : func_get_args();
 
-        return array_filter($types, function ($type) {
-            // If the type equals a constant's value, just return it.
-            if (in_array($type, static::$types)) {
-                return $type;
-            }
+		return array_filter($types, function ($type) {
+			// If the type equals a constant's value, just return it.
+			if (in_array($type, static::$types)) {
+				return $type;
+			}
 
-            // Otherwise we'll assume the type is the constant's name.
-            return Arr::get(static::$types, strtoupper($type));
-        });
-    }
+			// Otherwise we'll assume the type is the constant's name.
+			return Arr::get(static::$types, strtoupper($type));
+		});
+	}
 
-    /**
-     * 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();
 
-        $types = is_array($types) ? $types : func_get_args();
+		$types = is_array($types) ? $types : func_get_args();
 
-        return array_filter($types, function ($type) {
-            $type = strtoupper($type);
+		return array_filter($types, function ($type) {
+			$type = strtoupper($type);
 
-            // If the type equals a constant's name, just return it.
-            if (isset(static::$types[$type])) {
-                return static::$types[$type];
-            }
+			// If the type equals a constant's name, just return it.
+			if (isset(static::$types[$type])) {
+				return static::$types[$type];
+			}
 
-            // Otherwise we'll assume the type is the constant's value.
-            return array_search($type, static::$types);
-        });
-    }
+			// Otherwise we'll assume the type is the constant's value.
+			return array_search($type, static::$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

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
      */
     public static function isType($type)
     {
-        return ! is_null(static::parseTypes($type));
+        return !is_null(static::parseTypes($type));
     }
 
     /**
@@ -36,7 +36,7 @@ 
 
         $types = is_array($types) ? $types : func_get_args();
 
-        return array_filter($types, function ($type) {
+        return array_filter($types, function($type) {
             // If the type equals a constant's value, just return it.
             if (in_array($type, static::$types)) {
                 return $type;
@@ -59,7 +59,7 @@ 
 
         $types = is_array($types) ? $types : func_get_args();
 
-        return array_filter($types, function ($type) {
+        return array_filter($types, function($type) {
             $type = strtoupper($type);
 
             // If the type equals a constant's name, just return it.
@@ -78,7 +78,7 @@ 
      */
     private static function loadTypes()
     {
-        if (! static::$types) {
+        if (!static::$types) {
             static::$types = with(new ReflectionClass(PhoneNumberType::class))->getConstants();
         }
     }

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 isFormat($format)
-    {
-        return ! is_null(static::parseFormat($format));
-    }
+	/**
+	 * Determine whether the given format is valid.
+	 *
+	 * @param string $format
+	 * @return bool
+	 */
+	public static function isFormat($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)) {
-            return $format;
-        }
+		// If the format equals a constant's value, just return it.
+		if (in_array($format, static::$formats)) {
+			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

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
      */
     public static function isFormat($format)
     {
-        return ! is_null(static::parseFormat($format));
+        return !is_null(static::parseFormat($format));
     }
 
     /**
@@ -48,7 +48,7 @@ 
      */
     private static function loadFormats()
     {
-        if (! static::$formats) {
+        if (!static::$formats) {
             static::$formats = with(new ReflectionClass(PhoneNumberFormat::class))->getConstants();
         }
     }