Propaganistas / Laravel-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

Spacing +2 added lines, -2 removed lines

@@ -142,11 +142,11 @@
         $parameters = implode(',', array_merge(
             $this->countries,
             $this->types,
-            ($this->countryField ? [$this->countryField]: []),
+            ($this->countryField ? [$this->countryField] : []),
             ($this->detect ? ['AUTO'] : []),
             ($this->lenient ? ['LENIENT'] : [])
         ));
 
-        return 'phone' . (! empty($parameters) ? ":$parameters" : '');
+        return 'phone'.(!empty($parameters) ? ":$parameters" : '');
     }
 }
\ No newline at end of file

src/Validation/Phone.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
                 $phoneNumber = PhoneNumber::make($value, $country);
 
                 // Type validation.
-                if (! empty($types) && ! $phoneNumber->isOfType($types)) {
+                if (!empty($types) && !$phoneNumber->isOfType($types)) {
                     continue;
                 }
 
@@ -118,7 +118,7 @@ 
         $leftovers = array_diff_key($parameters, $types, $inputCountry ? [] : $countries);
         $leftovers = array_diff($leftovers, ['AUTO', 'LENIENT', $inputField]);
 
-        if (! empty($leftovers)) {
+        if (!empty($leftovers)) {
             throw InvalidParameterException::parameters($leftovers);
         }
 

Indentation +119 added lines, -119 removed lines

@@ -11,123 +11,123 @@
 
 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 no field is present, this will be null.
-        $inputCountry = Arr::get($data, $inputField);
-
-        $countries = static::parseCountries($inputCountry ? [$inputCountry] : $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, $inputCountry ? [] : $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 no field is present, this will be null.
+		$inputCountry = Arr::get($data, $inputField);
+
+		$countries = static::parseCountries($inputCountry ? [$inputCountry] : $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, $inputCountry ? [] : $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,
+		];
+	}
 }