Propaganistas / Laravel-Phone

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 (is_numeric($type) && in_array($type, static::$types)) {
-                                 return (int) $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 (is_numeric($type) && in_array($type, static::$types)) {
+								 return (int) $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

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
      */
     public static function isValidType($type)
     {
-        return ! empty(static::parseTypes($type));
+        return !empty(static::parseTypes($type));
     }
 
     /**
@@ -36,7 +36,7 @@ 
         static::loadTypes();
 
         return Collection::make(is_array($types) ? $types : func_get_args())
-                         ->map(function ($type) {
+                         ->map(function($type) {
                              // If the type equals a constant's value, just return it.
                              if (is_numeric($type) && in_array($type, static::$types)) {
                                  return (int) $type;
@@ -45,7 +45,7 @@ 
                              // Otherwise we'll assume the type is the constant's name.
                              return Arr::get(static::$types, strtoupper($type));
                          })
-                         ->reject(function ($value) {
+                         ->reject(function($value) {
                              return is_null($value) || $value === false;
                          })->toArray();
     }
@@ -73,7 +73,7 @@ 
      */
     private static function loadTypes()
     {
-        if (! static::$types) {
+        if (!static::$types) {
             static::$types = with(new ReflectionClass(PhoneNumberType::class))->getConstants();
         }
     }

src/Validation/Phone.php

Indentation +130 added lines, -130 removed lines

@@ -11,134 +11,134 @@
 
 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)
-    {
-        $originalParameters = $parameters;
-        $parameters = array_map('strtolower', $parameters);
-
-        // 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);
-            }
-
-            // Invalid country field values should just validate to false, and this is exactly what
-            // we're getting when simply excluding invalid values.
-            // This will also prevent parameter hijacking through the country field.
-            if (static::isValidCountryCode($inputCountry)) {
-                $parameters[] = $inputCountry;
-            }
-        }
-
-        $countries = static::parseCountries($parameters);
-        $types = static::parseTypes($parameters);
-        $auto = in_array('auto', $parameters);
-        $lenient = in_array('lenient', $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, $countries, $types);
-        $leftovers = array_diff($leftovers, ['auto', 'lenient', $inputField]);
-
-        if (! empty($leftovers)) {
-            throw InvalidParameterException::parameters(array_intersect_key($originalParameters, $leftovers));
-        }
-
-        return [$countries, $types, $auto, $lenient, $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)
+	{
+		$originalParameters = $parameters;
+		$parameters = array_map('strtolower', $parameters);
+
+		// 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);
+			}
+
+			// Invalid country field values should just validate to false, and this is exactly what
+			// we're getting when simply excluding invalid values.
+			// This will also prevent parameter hijacking through the country field.
+			if (static::isValidCountryCode($inputCountry)) {
+				$parameters[] = $inputCountry;
+			}
+		}
+
+		$countries = static::parseCountries($parameters);
+		$types = static::parseTypes($parameters);
+		$auto = in_array('auto', $parameters);
+		$lenient = in_array('lenient', $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, $countries, $types);
+		$leftovers = array_diff($leftovers, ['auto', 'lenient', $inputField]);
+
+		if (! empty($leftovers)) {
+			throw InvalidParameterException::parameters(array_intersect_key($originalParameters, $leftovers));
+		}
+
+		return [$countries, $types, $auto, $lenient, $inputField];
+	}
 }

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;
                 }
 
@@ -135,7 +135,7 @@ 
         $leftovers = array_diff_key($parameters, $countries, $types);
         $leftovers = array_diff($leftovers, ['auto', 'lenient', $inputField]);
 
-        if (! empty($leftovers)) {
+        if (!empty($leftovers)) {
             throw InvalidParameterException::parameters(array_intersect_key($originalParameters, $leftovers));
         }