figtree-php / validation

src/Rule.php

Indentation +180 added lines, -180 removed lines

@@ -7,184 +7,184 @@
 
 class Rule implements RuleInterface
 {
-	public function __construct(protected int $filterType, protected int $flags = 0, protected array $options = [], protected ?Closure $callback = null)
-	{
-		//
-	}
-
-	/**
-	 * Get the Rule filter type.
-	 *
-	 * @return integer
-	 */
-	public function getFilterType(): int
-	{
-		return $this->filterType;
-	}
-
-	/**
-	 * Get the Rule flags.
-	 *
-	 * @return integer
-	 */
-	public function getFlags(): int
-	{
-		return $this->flags;
-	}
-
-	/**
-	 * Check if a Rule flag is set.
-	 *
-	 * @param integer $flag
-	 *
-	 * @return boolean
-	 */
-	public function hasFlag(int $flag): bool
-	{
-		return $this->flags & $flag;
-	}
-
-	/**
-	 * Add a Rule flag.
-	 *
-	 * @param integer $flag
-	 *
-	 * @return $this
-	 */
-	public function addFlag(int $flag): RuleInterface
-	{
-		$this->flags |= $flag;
-
-		return $this;
-	}
-
-	/**
-	 * Remove a Rule flag.
-	 *
-	 * @param integer $flag
-	 *
-	 * @return $this
-	 */
-	public function removeFlag(int $flag): RuleInterface
-	{
-		$this->flags &= $flag;
-
-		return $this;
-	}
-
-	/**
-	 * Get the Rule options.
-	 *
-	 * @return array
-	 */
-	public function getOptions(): array
-	{
-		return $this->options;
-	}
-
-	/**
-	 * Check if a given Rule option exists.
-	 *
-	 * @param string $name
-	 *
-	 * @return boolean
-	 */
-	public function hasOption(string $name): bool
-	{
-		return key_exists($name, $this->options);
-	}
-
-	/**
-	 * Get the value of a given Rule option.
-	 *
-	 * @param string $name
-	 * @param mixed $default
-	 *
-	 * @return mixed
-	 */
-	public function getOption(string $name, $default = null)
-	{
-		return $this->options[$name] ?? $default;
-	}
-
-	/**
-	 * Set the value of a given Rule option.
-	 *
-	 * @param string $name
-	 * @param mixed $value
-	 *
-	 * @return $this
-	 */
-	public function setOption(string $name, $value): RuleInterface
-	{
-		$this->options[$name] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Remove the given option from the Rule.
-	 *
-	 * @param string $name
-	 *
-	 * @return $this
-	 */
-	public function removeOption(string $name): RuleInterface
-	{
-		unset($this->options[$name]);
-
-		return $this;
-	}
-
-	/**
-	 * Get the Rule callback.
-	 *
-	 * @return \Closure|null
-	 */
-	public function getCallback(): ?Closure
-	{
-		return $this->callback;
-	}
-
-	/**
-	 * Get the Rule callback.
-	 *
-	 * @param \Closure|null $callback
-	 *
-	 * @return $this
-	 */
-	public function setCallback(?Closure $callback): RuleInterface
-	{
-		$this->callback = $callback;
-
-		return $this;
-	}
-
-	/**
-	 * Cast the Rule into an array.
-	 *
-	 * @return array
-	 */
-	public function toArray(): array
-	{
-		$flags = $this->getFlags();
-		$options = $this->getOptions();
-		$callback = $this->getCallback();
-
-		$array = [
-			'filter' => $this->getFilterType(),
-		];
-
-		if ($flags !== 0) {
-			$array['flags'] = $flags;
-		}
-
-		if (!empty($callback)) {
-			$array['options'] = $callback;
-		} elseif (!empty($options)) {
-			$array['options'] = $options;
-		}
-
-		return $array;
-	}
+    public function __construct(protected int $filterType, protected int $flags = 0, protected array $options = [], protected ?Closure $callback = null)
+    {
+        //
+    }
+
+    /**
+     * Get the Rule filter type.
+     *
+     * @return integer
+     */
+    public function getFilterType(): int
+    {
+        return $this->filterType;
+    }
+
+    /**
+     * Get the Rule flags.
+     *
+     * @return integer
+     */
+    public function getFlags(): int
+    {
+        return $this->flags;
+    }
+
+    /**
+     * Check if a Rule flag is set.
+     *
+     * @param integer $flag
+     *
+     * @return boolean
+     */
+    public function hasFlag(int $flag): bool
+    {
+        return $this->flags & $flag;
+    }
+
+    /**
+     * Add a Rule flag.
+     *
+     * @param integer $flag
+     *
+     * @return $this
+     */
+    public function addFlag(int $flag): RuleInterface
+    {
+        $this->flags |= $flag;
+
+        return $this;
+    }
+
+    /**
+     * Remove a Rule flag.
+     *
+     * @param integer $flag
+     *
+     * @return $this
+     */
+    public function removeFlag(int $flag): RuleInterface
+    {
+        $this->flags &= $flag;
+
+        return $this;
+    }
+
+    /**
+     * Get the Rule options.
+     *
+     * @return array
+     */
+    public function getOptions(): array
+    {
+        return $this->options;
+    }
+
+    /**
+     * Check if a given Rule option exists.
+     *
+     * @param string $name
+     *
+     * @return boolean
+     */
+    public function hasOption(string $name): bool
+    {
+        return key_exists($name, $this->options);
+    }
+
+    /**
+     * Get the value of a given Rule option.
+     *
+     * @param string $name
+     * @param mixed $default
+     *
+     * @return mixed
+     */
+    public function getOption(string $name, $default = null)
+    {
+        return $this->options[$name] ?? $default;
+    }
+
+    /**
+     * Set the value of a given Rule option.
+     *
+     * @param string $name
+     * @param mixed $value
+     *
+     * @return $this
+     */
+    public function setOption(string $name, $value): RuleInterface
+    {
+        $this->options[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Remove the given option from the Rule.
+     *
+     * @param string $name
+     *
+     * @return $this
+     */
+    public function removeOption(string $name): RuleInterface
+    {
+        unset($this->options[$name]);
+
+        return $this;
+    }
+
+    /**
+     * Get the Rule callback.
+     *
+     * @return \Closure|null
+     */
+    public function getCallback(): ?Closure
+    {
+        return $this->callback;
+    }
+
+    /**
+     * Get the Rule callback.
+     *
+     * @param \Closure|null $callback
+     *
+     * @return $this
+     */
+    public function setCallback(?Closure $callback): RuleInterface
+    {
+        $this->callback = $callback;
+
+        return $this;
+    }
+
+    /**
+     * Cast the Rule into an array.
+     *
+     * @return array
+     */
+    public function toArray(): array
+    {
+        $flags = $this->getFlags();
+        $options = $this->getOptions();
+        $callback = $this->getCallback();
+
+        $array = [
+            'filter' => $this->getFilterType(),
+        ];
+
+        if ($flags !== 0) {
+            $array['flags'] = $flags;
+        }
+
+        if (!empty($callback)) {
+            $array['options'] = $callback;
+        } elseif (!empty($options)) {
+            $array['options'] = $options;
+        }
+
+        return $array;
+    }
 }

src/AbstractFilter.php

Indentation +116 added lines, -116 removed lines

@@ -3,124 +3,124 @@
 namespace FigTree\Validation;
 
 use FigTree\Validation\Contracts\{
-	FilterInterface,
-	RuleFactoryInterface,
-	RuleInterface
+    FilterInterface,
+    RuleFactoryInterface,
+    RuleInterface
 };
 
 abstract class AbstractFilter implements FilterInterface
 {
-	protected RuleFactoryInterface $ruleFactory;
-
-	/**
-	 * Set or remove a RuleFactory.
-	 *
-	 * @param \FigTree\Validation\Contracts\RuleFactoryInterface $ruleFactory
-	 *
-	 * @return $this
-	 */
-	public function setRuleFactory(RuleFactoryInterface $ruleFactory): FilterInterface
-	{
-		$this->ruleFactory = $ruleFactory;
-
-		return $this;
-	}
-
-	/**
-	 * Filter a single value against the Filter.
-	 *
-	 * @param string $field
-	 * @param mixed $value
-	 *
-	 * @return mixed
-	 */
-	public function filterValue(string $field, mixed $value, $default = null): mixed
-	{
-		$definition = $this->getDefinition($field);
-
-		if (empty($definition)) {
-			return $default;
-		}
-
-		$filter = $definition['filter'] ?? null;
-
-		return filter_var($value, $filter, $definition);
-	}
-
-	/**
-	 * Filter a single input field against the Filter.
-	 *
-	 * @param integer $type
-	 * @param string $field
-	 *
-	 * @return mixed
-	 */
-	public function filterInput(int $type, string $field, $default = null): mixed
-	{
-		$definition = $this->getDefinition($field);
-
-		if (empty($definition)) {
-			return $default;
-		}
-
-		$filter = $definition['filter'] ?? null;
-
-		return filter_input($type, $field, $filter, $definition);
-	}
-
-	/**
-	 * Filter an array of values against the Filter.
-	 *
-	 * @param array $data
-	 * @param boolean $addEmpty
-	 *
-	 * @return mixed
-	 */
-	public function filterArray(array $data, bool $addEmpty = true): array
-	{
-		return filter_var_array($data, $this->getDefinitions(), $addEmpty);
-	}
-
-	/**
-	 * Filter an array of input values against the Filter.
-	 *
-	 * @param integer $type
-	 * @param boolean $addEmpty
-	 *
-	 * @return mixed
-	 */
-	public function filterInputArray(int $type, bool $addEmpty = true): array
-	{
-		return filter_input_array($type, $this->getDefinitions(), $addEmpty);
-	}
-
-	/**
-	 * Get a single Rule as a native filter definition.
-	 *
-	 * @param string $field
-	 *
-	 * @return array|null
-	 */
-	protected function getDefinition(string $field): ?array
-	{
-		$rules = $this->getRules();
-
-		$rule = $rules[$field] ?? null;
-
-		if (!($rule instanceof RuleInterface)) {
-			return null;
-		}
-
-		return $rule->toArray();
-	}
-
-	/**
-	 * Get the Rules as a native filter definition.
-	 *
-	 * @return array
-	 */
-	protected function getDefinitions(): array
-	{
-		return array_map(fn (RuleInterface $rule) => $rule->toArray(), $this->getRules());
-	}
+    protected RuleFactoryInterface $ruleFactory;
+
+    /**
+     * Set or remove a RuleFactory.
+     *
+     * @param \FigTree\Validation\Contracts\RuleFactoryInterface $ruleFactory
+     *
+     * @return $this
+     */
+    public function setRuleFactory(RuleFactoryInterface $ruleFactory): FilterInterface
+    {
+        $this->ruleFactory = $ruleFactory;
+
+        return $this;
+    }
+
+    /**
+     * Filter a single value against the Filter.
+     *
+     * @param string $field
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    public function filterValue(string $field, mixed $value, $default = null): mixed
+    {
+        $definition = $this->getDefinition($field);
+
+        if (empty($definition)) {
+            return $default;
+        }
+
+        $filter = $definition['filter'] ?? null;
+
+        return filter_var($value, $filter, $definition);
+    }
+
+    /**
+     * Filter a single input field against the Filter.
+     *
+     * @param integer $type
+     * @param string $field
+     *
+     * @return mixed
+     */
+    public function filterInput(int $type, string $field, $default = null): mixed
+    {
+        $definition = $this->getDefinition($field);
+
+        if (empty($definition)) {
+            return $default;
+        }
+
+        $filter = $definition['filter'] ?? null;
+
+        return filter_input($type, $field, $filter, $definition);
+    }
+
+    /**
+     * Filter an array of values against the Filter.
+     *
+     * @param array $data
+     * @param boolean $addEmpty
+     *
+     * @return mixed
+     */
+    public function filterArray(array $data, bool $addEmpty = true): array
+    {
+        return filter_var_array($data, $this->getDefinitions(), $addEmpty);
+    }
+
+    /**
+     * Filter an array of input values against the Filter.
+     *
+     * @param integer $type
+     * @param boolean $addEmpty
+     *
+     * @return mixed
+     */
+    public function filterInputArray(int $type, bool $addEmpty = true): array
+    {
+        return filter_input_array($type, $this->getDefinitions(), $addEmpty);
+    }
+
+    /**
+     * Get a single Rule as a native filter definition.
+     *
+     * @param string $field
+     *
+     * @return array|null
+     */
+    protected function getDefinition(string $field): ?array
+    {
+        $rules = $this->getRules();
+
+        $rule = $rules[$field] ?? null;
+
+        if (!($rule instanceof RuleInterface)) {
+            return null;
+        }
+
+        return $rule->toArray();
+    }
+
+    /**
+     * Get the Rules as a native filter definition.
+     *
+     * @return array
+     */
+    protected function getDefinitions(): array
+    {
+        return array_map(fn (RuleInterface $rule) => $rule->toArray(), $this->getRules());
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -121,6 +121,6 @@
 	 */
 	protected function getDefinitions(): array
 	{
-		return array_map(fn (RuleInterface $rule) => $rule->toArray(), $this->getRules());
+		return array_map(fn(RuleInterface $rule) => $rule->toArray(), $this->getRules());
 	}
 }

src/Contracts/FilterInterface.php

Indentation +52 added lines, -52 removed lines

@@ -4,61 +4,61 @@
 
 interface FilterInterface
 {
-	/**
-	 * Set or remove a RuleFactory.
-	 *
-	 * @param \FigTree\Validation\Contracts\RuleFactoryInterface $ruleFactory
-	 *
-	 * @return \FigTree\Validation\Contracts\FilterInterface
-	 */
-	public function setRuleFactory(RuleFactoryInterface $ruleFactory): FilterInterface;
+    /**
+     * Set or remove a RuleFactory.
+     *
+     * @param \FigTree\Validation\Contracts\RuleFactoryInterface $ruleFactory
+     *
+     * @return \FigTree\Validation\Contracts\FilterInterface
+     */
+    public function setRuleFactory(RuleFactoryInterface $ruleFactory): FilterInterface;
 
-	/**
-	 * Get the set of Rules for this Filter.
-	 *
-	 * @return array
-	 */
-	public function getRules(): array;
+    /**
+     * Get the set of Rules for this Filter.
+     *
+     * @return array
+     */
+    public function getRules(): array;
 
-	/**
-	 * Filter a single value against the Filter.
-	 *
-	 * @param string $field
-	 * @param mixed $value
-	 * @param mixed $default
-	 *
-	 * @return mixed
-	 */
-	public function filterValue(string $field, mixed $value, $default = null): mixed;
+    /**
+     * Filter a single value against the Filter.
+     *
+     * @param string $field
+     * @param mixed $value
+     * @param mixed $default
+     *
+     * @return mixed
+     */
+    public function filterValue(string $field, mixed $value, $default = null): mixed;
 
-	/**
-	 * Filter a single input field against the Filter.
-	 *
-	 * @param integer $type
-	 * @param string $field
-	 * @param mixed $default
-	 *
-	 * @return mixed
-	 */
-	public function filterInput(int $type, string $field, $default = null): mixed;
+    /**
+     * Filter a single input field against the Filter.
+     *
+     * @param integer $type
+     * @param string $field
+     * @param mixed $default
+     *
+     * @return mixed
+     */
+    public function filterInput(int $type, string $field, $default = null): mixed;
 
-	/**
-	 * Filter an array of values against the Filter.
-	 *
-	 * @param array $data
-	 * @param boolean $addEmpty
-	 *
-	 * @return mixed
-	 */
-	public function filterArray(array $data, bool $addEmpty = true): array;
+    /**
+     * Filter an array of values against the Filter.
+     *
+     * @param array $data
+     * @param boolean $addEmpty
+     *
+     * @return mixed
+     */
+    public function filterArray(array $data, bool $addEmpty = true): array;
 
-	/**
-	 * Filter an array of input values against the Filter.
-	 *
-	 * @param integer $type
-	 * @param boolean $addEmpty
-	 *
-	 * @return mixed
-	 */
-	public function filterInputArray(int $type, bool $addEmpty = true): array;
+    /**
+     * Filter an array of input values against the Filter.
+     *
+     * @param integer $type
+     * @param boolean $addEmpty
+     *
+     * @return mixed
+     */
+    public function filterInputArray(int $type, bool $addEmpty = true): array;
 }

src/Contracts/RuleInterface.php

Indentation +96 added lines, -96 removed lines

@@ -6,112 +6,112 @@
 
 interface RuleInterface
 {
-	/**
-	 * Get the Rule filter type.
-	 *
-	 * @return integer
-	 */
-	public function getFilterType(): int;
+    /**
+     * Get the Rule filter type.
+     *
+     * @return integer
+     */
+    public function getFilterType(): int;
 
-	/**
-	 * Get the Rule flags.
-	 *
-	 * @return integer
-	 */
-	public function getFlags(): int;
+    /**
+     * Get the Rule flags.
+     *
+     * @return integer
+     */
+    public function getFlags(): int;
 
-	/**
-	 * Check if a Rule flag is set.
-	 *
-	 * @param integer $flag
-	 *
-	 * @return boolean
-	 */
-	public function hasFlag(int $flag): bool;
+    /**
+     * Check if a Rule flag is set.
+     *
+     * @param integer $flag
+     *
+     * @return boolean
+     */
+    public function hasFlag(int $flag): bool;
 
-	/**
-	 * Add a Rule flag.
-	 *
-	 * @param integer $flag
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function addFlag(int $flag): RuleInterface;
+    /**
+     * Add a Rule flag.
+     *
+     * @param integer $flag
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function addFlag(int $flag): RuleInterface;
 
-	/**
-	 * Remove a Rule flag.
-	 *
-	 * @param integer $flag
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function removeFlag(int $flag): RuleInterface;
+    /**
+     * Remove a Rule flag.
+     *
+     * @param integer $flag
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function removeFlag(int $flag): RuleInterface;
 
-	/**
-	 * Get the Rule options.
-	 *
-	 * @return array
-	 */
-	public function getOptions(): array;
+    /**
+     * Get the Rule options.
+     *
+     * @return array
+     */
+    public function getOptions(): array;
 
-	/**
-	 * Check if a given Rule option exists.
-	 *
-	 * @param string $name
-	 *
-	 * @return boolean
-	 */
-	public function hasOption(string $name): bool;
+    /**
+     * Check if a given Rule option exists.
+     *
+     * @param string $name
+     *
+     * @return boolean
+     */
+    public function hasOption(string $name): bool;
 
-	/**
-	 * Get the value of a given Rule option.
-	 *
-	 * @param string $name
-	 * @param mixed $default
-	 *
-	 * @return mixed
-	 */
-	public function getOption(string $name, $default = null);
+    /**
+     * Get the value of a given Rule option.
+     *
+     * @param string $name
+     * @param mixed $default
+     *
+     * @return mixed
+     */
+    public function getOption(string $name, $default = null);
 
-	/**
-	 * Set the value of a given Rule option.
-	 *
-	 * @param string $name
-	 * @param mixed $value
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function setOption(string $name, $value): RuleInterface;
+    /**
+     * Set the value of a given Rule option.
+     *
+     * @param string $name
+     * @param mixed $value
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function setOption(string $name, $value): RuleInterface;
 
-	/**
-	 * Remove the given option from the Rule.
-	 *
-	 * @param string $name
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function removeOption(string $name): RuleInterface;
+    /**
+     * Remove the given option from the Rule.
+     *
+     * @param string $name
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function removeOption(string $name): RuleInterface;
 
-	/**
-	 * Get the Rule callback.
-	 *
-	 * @return \Closure|null
-	 */
-	public function getCallback(): ?Closure;
+    /**
+     * Get the Rule callback.
+     *
+     * @return \Closure|null
+     */
+    public function getCallback(): ?Closure;
 
-	/**
-	 * Get the Rule callback.
-	 *
-	 * @param \Closure|null $callback
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function setCallback(?Closure $callback): RuleInterface;
+    /**
+     * Get the Rule callback.
+     *
+     * @param \Closure|null $callback
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function setCallback(?Closure $callback): RuleInterface;
 
-	/**
-	 * Cast the Rule into an array.
-	 *
-	 * @return array
-	 */
-	public function toArray(): array;
+    /**
+     * Cast the Rule into an array.
+     *
+     * @return array
+     */
+    public function toArray(): array;
 }

src/Contracts/RuleFactoryInterface.php

Indentation +14 added lines, -14 removed lines

@@ -6,18 +6,18 @@
 
 interface RuleFactoryInterface
 {
-	/**
-	 * Create a new Rule.
-	 *
-	 * @param int $filterType The filter type.
-	 * @param int $flags Bitewise set of filter flags.
-	 * @param array $options Filter options.
-	 * @param \Closure|null Callback method.
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 *
-	 * @see https://www.php.net/manual/en/filter.filters.php
-	 * @see https://www.php.net/manual/en/filter.filters.flags.php
-	 */
-	public function create(int $filterType, int $flags = 0, array $options = [], ?Closure $callback = null): RuleInterface;
+    /**
+     * Create a new Rule.
+     *
+     * @param int $filterType The filter type.
+     * @param int $flags Bitewise set of filter flags.
+     * @param array $options Filter options.
+     * @param \Closure|null Callback method.
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     *
+     * @see https://www.php.net/manual/en/filter.filters.php
+     * @see https://www.php.net/manual/en/filter.filters.flags.php
+     */
+    public function create(int $filterType, int $flags = 0, array $options = [], ?Closure $callback = null): RuleInterface;
 }

src/Concerns/CreatesProgrammaticRules.php

Indentation +24 added lines, -24 removed lines

@@ -7,29 +7,29 @@
 
 trait CreatesProgrammaticRules
 {
-	/**
-	 * Create a Rule for a valid boolean.
-	 *
-	 * @param callable $callback
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function withCallable(callable $callback): RuleInterface
-	{
-		return $this->create(FILTER_CALLBACK)
-			->setCallback(Closure::fromCallable($callback));
-	}
+    /**
+     * Create a Rule for a valid boolean.
+     *
+     * @param callable $callback
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function withCallable(callable $callback): RuleInterface
+    {
+        return $this->create(FILTER_CALLBACK)
+            ->setCallback(Closure::fromCallable($callback));
+    }
 
-	/**
-	 * Create a Rule for a valid boolean.
-	 *
-	 * @param \Closure $callback
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function withClosure(Closure $callback): RuleInterface
-	{
-		return $this->create(FILTER_CALLBACK)
-			->setCallback($callback);
-	}
+    /**
+     * Create a Rule for a valid boolean.
+     *
+     * @param \Closure $callback
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function withClosure(Closure $callback): RuleInterface
+    {
+        return $this->create(FILTER_CALLBACK)
+            ->setCallback($callback);
+    }
 }

src/Concerns/CreatesSanitationRules.php

Indentation +124 added lines, -124 removed lines

@@ -6,169 +6,169 @@
 
 trait CreatesSanitationRules
 {
-	public function addSlashes(): RuleInterface
-	{
-		return $this->create(FILTER_SANITIZE_ADD_SLASHES);
-	}
+    public function addSlashes(): RuleInterface
+    {
+        return $this->create(FILTER_SANITIZE_ADD_SLASHES);
+    }
 
-	public function cleanEmail(): RuleInterface
-	{
-		return $this->create(FILTER_SANITIZE_EMAIL);
-	}
+    public function cleanEmail(): RuleInterface
+    {
+        return $this->create(FILTER_SANITIZE_EMAIL);
+    }
 
-	public function cleanEncodedString(bool $stripLow = false, bool $stripHigh = false, bool $stripBacktick = false, bool $encodeLow = false, bool $encodeHigh = false): RuleInterface
-	{
-		$flags = 0;
+    public function cleanEncodedString(bool $stripLow = false, bool $stripHigh = false, bool $stripBacktick = false, bool $encodeLow = false, bool $encodeHigh = false): RuleInterface
+    {
+        $flags = 0;
 
-		if ($stripLow) {
-			$flags |= FILTER_FLAG_STRIP_LOW;
-		}
+        if ($stripLow) {
+            $flags |= FILTER_FLAG_STRIP_LOW;
+        }
 
-		if ($stripHigh) {
-			$flags |= FILTER_FLAG_STRIP_HIGH;
-		}
+        if ($stripHigh) {
+            $flags |= FILTER_FLAG_STRIP_HIGH;
+        }
 
-		if ($stripBacktick) {
-			$flags |= FILTER_FLAG_STRIP_BACKTICK;
-		}
+        if ($stripBacktick) {
+            $flags |= FILTER_FLAG_STRIP_BACKTICK;
+        }
 
-		if ($encodeLow) {
-			$flags |= FILTER_FLAG_ENCODE_LOW;
-		}
+        if ($encodeLow) {
+            $flags |= FILTER_FLAG_ENCODE_LOW;
+        }
 
-		if ($encodeHigh) {
-			$flags |= FILTER_FLAG_ENCODE_HIGH;
-		}
+        if ($encodeHigh) {
+            $flags |= FILTER_FLAG_ENCODE_HIGH;
+        }
 
-		return $this->create(FILTER_SANITIZE_ENCODED, $flags);
-	}
+        return $this->create(FILTER_SANITIZE_ENCODED, $flags);
+    }
 
-	public function cleanFloat(bool $allowFractions = false, bool $allowThousands = false, $allowScientific = false): RuleInterface
-	{
-		$flags = 0;
+    public function cleanFloat(bool $allowFractions = false, bool $allowThousands = false, $allowScientific = false): RuleInterface
+    {
+        $flags = 0;
 
-		if ($allowFractions) {
-			$flags |= FILTER_FLAG_ALLOW_FRACTION;
-		}
+        if ($allowFractions) {
+            $flags |= FILTER_FLAG_ALLOW_FRACTION;
+        }
 
-		if ($allowThousands) {
-			$flags |= FILTER_FLAG_ALLOW_THOUSAND;
-		}
+        if ($allowThousands) {
+            $flags |= FILTER_FLAG_ALLOW_THOUSAND;
+        }
 
-		if ($allowScientific) {
-			$flags |= FILTER_FLAG_ALLOW_SCIENTIFIC;
-		}
+        if ($allowScientific) {
+            $flags |= FILTER_FLAG_ALLOW_SCIENTIFIC;
+        }
 
-		return $this->create(FILTER_SANITIZE_NUMBER_FLOAT, $flags);
-	}
+        return $this->create(FILTER_SANITIZE_NUMBER_FLOAT, $flags);
+    }
 
-	public function cleanFullSpecialChars(bool $encodeQuotes = true): RuleInterface
-	{
-		$flags = 0;
+    public function cleanFullSpecialChars(bool $encodeQuotes = true): RuleInterface
+    {
+        $flags = 0;
 
-		if (!$encodeQuotes) {
-			$flags |= FILTER_FLAG_NO_ENCODE_QUOTES;
-		}
+        if (!$encodeQuotes) {
+            $flags |= FILTER_FLAG_NO_ENCODE_QUOTES;
+        }
 
-		return $this->create(FILTER_SANITIZE_FULL_SPECIAL_CHARS, $flags);
-	}
+        return $this->create(FILTER_SANITIZE_FULL_SPECIAL_CHARS, $flags);
+    }
 
-	public function cleanInt(): RuleInterface
-	{
-		return $this->create(FILTER_SANITIZE_NUMBER_INT);
-	}
+    public function cleanInt(): RuleInterface
+    {
+        return $this->create(FILTER_SANITIZE_NUMBER_INT);
+    }
 
-	public function cleanSpecialChars(bool $stripLow = false, bool $stripHigh = false, bool $stripBacktick = false, bool $encodeHigh = false): RuleInterface
-	{
-		$flags = 0;
+    public function cleanSpecialChars(bool $stripLow = false, bool $stripHigh = false, bool $stripBacktick = false, bool $encodeHigh = false): RuleInterface
+    {
+        $flags = 0;
 
-		if ($stripLow) {
-			$flags |= FILTER_FLAG_STRIP_LOW;
-		}
+        if ($stripLow) {
+            $flags |= FILTER_FLAG_STRIP_LOW;
+        }
 
-		if ($stripHigh) {
-			$flags |= FILTER_FLAG_STRIP_HIGH;
-		}
+        if ($stripHigh) {
+            $flags |= FILTER_FLAG_STRIP_HIGH;
+        }
 
-		if ($stripBacktick) {
-			$flags |= FILTER_FLAG_STRIP_BACKTICK;
-		}
+        if ($stripBacktick) {
+            $flags |= FILTER_FLAG_STRIP_BACKTICK;
+        }
 
-		if ($encodeHigh) {
-			$flags |= FILTER_FLAG_ENCODE_HIGH;
-		}
+        if ($encodeHigh) {
+            $flags |= FILTER_FLAG_ENCODE_HIGH;
+        }
 
-		return $this->create(FILTER_SANITIZE_SPECIAL_CHARS, $flags);
-	}
+        return $this->create(FILTER_SANITIZE_SPECIAL_CHARS, $flags);
+    }
 
-	public function cleanString(bool $encodeQuotes = true, bool $stripLow = false, bool $stripHigh = false, bool $stripBacktick = false, bool $encodeLow = false, bool $encodeHigh = false, bool $encodeAmp = false): RuleInterface
-	{
-		$flags = 0;
+    public function cleanString(bool $encodeQuotes = true, bool $stripLow = false, bool $stripHigh = false, bool $stripBacktick = false, bool $encodeLow = false, bool $encodeHigh = false, bool $encodeAmp = false): RuleInterface
+    {
+        $flags = 0;
 
-		if (!$encodeQuotes) {
-			$flags |= FILTER_FLAG_NO_ENCODE_QUOTES;
-		}
+        if (!$encodeQuotes) {
+            $flags |= FILTER_FLAG_NO_ENCODE_QUOTES;
+        }
 
-		if ($stripLow) {
-			$flags |= FILTER_FLAG_STRIP_LOW;
-		}
+        if ($stripLow) {
+            $flags |= FILTER_FLAG_STRIP_LOW;
+        }
 
-		if ($stripHigh) {
-			$flags |= FILTER_FLAG_STRIP_HIGH;
-		}
+        if ($stripHigh) {
+            $flags |= FILTER_FLAG_STRIP_HIGH;
+        }
 
-		if ($stripBacktick) {
-			$flags |= FILTER_FLAG_STRIP_BACKTICK;
-		}
+        if ($stripBacktick) {
+            $flags |= FILTER_FLAG_STRIP_BACKTICK;
+        }
 
-		if ($encodeLow) {
-			$flags |= FILTER_FLAG_ENCODE_LOW;
-		}
+        if ($encodeLow) {
+            $flags |= FILTER_FLAG_ENCODE_LOW;
+        }
 
-		if ($encodeHigh) {
-			$flags |= FILTER_FLAG_ENCODE_HIGH;
-		}
+        if ($encodeHigh) {
+            $flags |= FILTER_FLAG_ENCODE_HIGH;
+        }
 
-		if ($encodeAmp) {
-			$flags |= FILTER_FLAG_ENCODE_AMP;
-		}
+        if ($encodeAmp) {
+            $flags |= FILTER_FLAG_ENCODE_AMP;
+        }
 
-		return $this->create(FILTER_SANITIZE_STRING, $flags);
-	}
+        return $this->create(FILTER_SANITIZE_STRING, $flags);
+    }
 
-	public function cleanUnsafe(bool $stripLow = false, bool $stripHigh = false, bool $stripBacktick = false, bool $encodeLow = false, bool $encodeHigh = false, bool $encodeAmp = false): RuleInterface
-	{
-		$flags = 0;
+    public function cleanUnsafe(bool $stripLow = false, bool $stripHigh = false, bool $stripBacktick = false, bool $encodeLow = false, bool $encodeHigh = false, bool $encodeAmp = false): RuleInterface
+    {
+        $flags = 0;
 
-		if ($stripLow) {
-			$flags |= FILTER_FLAG_STRIP_LOW;
-		}
+        if ($stripLow) {
+            $flags |= FILTER_FLAG_STRIP_LOW;
+        }
 
-		if ($stripHigh) {
-			$flags |= FILTER_FLAG_STRIP_HIGH;
-		}
+        if ($stripHigh) {
+            $flags |= FILTER_FLAG_STRIP_HIGH;
+        }
 
-		if ($stripBacktick) {
-			$flags |= FILTER_FLAG_STRIP_BACKTICK;
-		}
+        if ($stripBacktick) {
+            $flags |= FILTER_FLAG_STRIP_BACKTICK;
+        }
 
-		if ($encodeLow) {
-			$flags |= FILTER_FLAG_ENCODE_LOW;
-		}
+        if ($encodeLow) {
+            $flags |= FILTER_FLAG_ENCODE_LOW;
+        }
 
-		if ($encodeHigh) {
-			$flags |= FILTER_FLAG_ENCODE_HIGH;
-		}
+        if ($encodeHigh) {
+            $flags |= FILTER_FLAG_ENCODE_HIGH;
+        }
 
-		if ($encodeAmp) {
-			$flags |= FILTER_FLAG_ENCODE_AMP;
-		}
+        if ($encodeAmp) {
+            $flags |= FILTER_FLAG_ENCODE_AMP;
+        }
 
-		return $this->create(FILTER_UNSAFE_RAW, $flags);
-	}
+        return $this->create(FILTER_UNSAFE_RAW, $flags);
+    }
 
-	public function cleanUrl(): RuleInterface
-	{
-		return $this->create(FILTER_SANITIZE_URL);
-	}
+    public function cleanUrl(): RuleInterface
+    {
+        return $this->create(FILTER_SANITIZE_URL);
+    }
 }

src/Concerns/CreatesValidationRules.php

Indentation +201 added lines, -201 removed lines

@@ -6,205 +6,205 @@
 
 trait CreatesValidationRules
 {
-	/**
-	 * Create a Rule for a valid boolean.
-	 *
-	 * @param mixed $default
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function validBool($default = null): RuleInterface
-	{
-		return $this->applyDefault($this->create(FILTER_VALIDATE_BOOL, FILTER_NULL_ON_FAILURE), $default);
-	}
-
-	/**
-	 * Create a Rule for a valid domain name.
-	 *
-	 * @param boolean $checkHostname Adds ability to specifically validate hostnames (they must start with an alphanumeric character and contain only alphanumerics or hyphens).
-	 * @param mixed $default
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function validDomain(bool $checkHostname = false, $default = null): RuleInterface
-	{
-		$flags = 0;
-
-		if ($checkHostname) {
-			$flags |= FILTER_FLAG_HOSTNAME;
-		}
-
-		return $this->applyDefault($this->create(FILTER_VALIDATE_DOMAIN, $flags), $default);
-	}
-
-	/**
-	 * Create a Rule for a valid e-mail address.
-	 *
-	 * @param boolean $checkUnicode
-	 * @param mixed $default
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function validEmail(bool $checkUnicode = false, $default = null): RuleInterface
-	{
-		$flags = 0;
-
-		if ($checkUnicode) {
-			$flags |= FILTER_FLAG_EMAIL_UNICODE;
-		}
-
-		return $this->applyDefault($this->create(FILTER_VALIDATE_EMAIL, $flags), $default);
-	}
-
-	/**
-	 * Create a Rule for a valid floating-point value.
-	 *
-	 * @param float|null $min
-	 * @param float|null $max
-	 * @param integer|null $decimals
-	 * @param boolean $allowThousands Allow thousand separators (commas).
-	 * @param mixed $default
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function validFloat(?float $min = null, ?float $max = null, ?int $decimals = null, bool $allowThousands = false, $default = null): RuleInterface
-	{
-		$flags = 0;
-		$options = [];
-
-		if (!is_null($min)) {
-			$options['min_range'] = $min;
-		}
-
-		if (!is_null($max)) {
-			$options['max_range'] = $max;
-		}
-
-		if (!is_null($decimals)) {
-			$options['decimal'] = $decimals;
-		}
-
-		if ($allowThousands) {
-			$flags |= FILTER_FLAG_ALLOW_THOUSAND;
-		}
-
-		return $this->applyDefault($this->create(FILTER_VALIDATE_FLOAT, $flags, $options), $default);
-	}
-
-	/**
-	 * Create a Rule for a valid integer.
-	 *
-	 * @param integer|null $min
-	 * @param integer|null $max
-	 * @param boolean $allowOctal
-	 * @param boolean $allowHex
-	 * @param mixed $default
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function validInt(?int $min = null, ?int $max = null, bool $allowOctal = false, bool $allowHex = false, $default = null): RuleInterface
-	{
-		$flags = 0;
-		$options = [];
-
-		if (!is_null($min)) {
-			$options['min_range'] = $min;
-		}
-
-		if (!is_null($max)) {
-			$options['max_range'] = $max;
-		}
-
-		if ($allowOctal) {
-			$flags |= FILTER_FLAG_ALLOW_OCTAL;
-		}
-
-		if ($allowHex) {
-			$flags |= FILTER_FLAG_ALLOW_HEX;
-		}
-
-		return $this->applyDefault($this->create(FILTER_VALIDATE_INT, $flags, $options), $default);
-	}
-
-	/**
-	 * Create a Rule for a valid IP address.
-	 *
-	 * @param boolean $allowV4
-	 * @param boolean $allowV6
-	 * @param boolean $allowPrivateRange Allow IP addresses within private ranges.
-	 * @param boolean $allowReservedRange Allow IP addresses within other reserved ranges.
-	 * @param mixed $default
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 *
-	 * @see https://en.wikipedia.org/wiki/Reserved_IP_addresses
-	 */
-	public function validIpAddress(bool $allowV4 = false, bool $allowV6 = false, bool $allowPrivateRange = true, bool $allowReservedRange = true, $default = null): RuleInterface
-	{
-		$flags = 0;
-
-		if ($allowV4) {
-			$flags |= FILTER_FLAG_IPV4;
-		}
-
-		if ($allowV6) {
-			$flags |= FILTER_FLAG_IPV6;
-		}
-
-		if (!$allowPrivateRange) {
-			$flags |= FILTER_FLAG_NO_PRIV_RANGE;
-		}
-
-		if (!$allowReservedRange) {
-			$flags |= FILTER_FLAG_NO_RES_RANGE;
-		}
-
-		return $this->applyDefault($this->create(FILTER_VALIDATE_IP, $flags), $default);
-	}
-
-	/**
-	 * Create a Rule for a valid MAC address.
-	 *
-	 * @param mixed $default
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function validMacAddress($default = null): RuleInterface
-	{
-		return $this->applyDefault($this->create(FILTER_VALIDATE_MAC), $default);
-	}
-
-	/**
-	 * Create a Rule for a valid regular expression match.
-	 *
-	 * @param string $regex
-	 * @param mixed $default
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	public function validRegExp(string $regex, $default = null): RuleInterface
-	{
-		$options = [
-			'regexp' => $regex,
-		];
-
-		return $this->applyDefault($this->create(FILTER_VALIDATE_REGEXP, 0, $options), $default);
-	}
-
-	/**
-	 * Apply default option to the Rule.
-	 *
-	 * @param \FigTree\Validation\Contracts\RuleInterface $rule
-	 * @param mixed $default
-	 *
-	 * @return \FigTree\Validation\Contracts\RuleInterface
-	 */
-	protected function applyDefault(RuleInterface $rule, $default = null): RuleInterface
-	{
-		if (!is_null($default)) {
-			$rule->setOption('default', $default);
-		}
-
-		return $rule;
-	}
+    /**
+     * Create a Rule for a valid boolean.
+     *
+     * @param mixed $default
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function validBool($default = null): RuleInterface
+    {
+        return $this->applyDefault($this->create(FILTER_VALIDATE_BOOL, FILTER_NULL_ON_FAILURE), $default);
+    }
+
+    /**
+     * Create a Rule for a valid domain name.
+     *
+     * @param boolean $checkHostname Adds ability to specifically validate hostnames (they must start with an alphanumeric character and contain only alphanumerics or hyphens).
+     * @param mixed $default
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function validDomain(bool $checkHostname = false, $default = null): RuleInterface
+    {
+        $flags = 0;
+
+        if ($checkHostname) {
+            $flags |= FILTER_FLAG_HOSTNAME;
+        }
+
+        return $this->applyDefault($this->create(FILTER_VALIDATE_DOMAIN, $flags), $default);
+    }
+
+    /**
+     * Create a Rule for a valid e-mail address.
+     *
+     * @param boolean $checkUnicode
+     * @param mixed $default
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function validEmail(bool $checkUnicode = false, $default = null): RuleInterface
+    {
+        $flags = 0;
+
+        if ($checkUnicode) {
+            $flags |= FILTER_FLAG_EMAIL_UNICODE;
+        }
+
+        return $this->applyDefault($this->create(FILTER_VALIDATE_EMAIL, $flags), $default);
+    }
+
+    /**
+     * Create a Rule for a valid floating-point value.
+     *
+     * @param float|null $min
+     * @param float|null $max
+     * @param integer|null $decimals
+     * @param boolean $allowThousands Allow thousand separators (commas).
+     * @param mixed $default
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function validFloat(?float $min = null, ?float $max = null, ?int $decimals = null, bool $allowThousands = false, $default = null): RuleInterface
+    {
+        $flags = 0;
+        $options = [];
+
+        if (!is_null($min)) {
+            $options['min_range'] = $min;
+        }
+
+        if (!is_null($max)) {
+            $options['max_range'] = $max;
+        }
+
+        if (!is_null($decimals)) {
+            $options['decimal'] = $decimals;
+        }
+
+        if ($allowThousands) {
+            $flags |= FILTER_FLAG_ALLOW_THOUSAND;
+        }
+
+        return $this->applyDefault($this->create(FILTER_VALIDATE_FLOAT, $flags, $options), $default);
+    }
+
+    /**
+     * Create a Rule for a valid integer.
+     *
+     * @param integer|null $min
+     * @param integer|null $max
+     * @param boolean $allowOctal
+     * @param boolean $allowHex
+     * @param mixed $default
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function validInt(?int $min = null, ?int $max = null, bool $allowOctal = false, bool $allowHex = false, $default = null): RuleInterface
+    {
+        $flags = 0;
+        $options = [];
+
+        if (!is_null($min)) {
+            $options['min_range'] = $min;
+        }
+
+        if (!is_null($max)) {
+            $options['max_range'] = $max;
+        }
+
+        if ($allowOctal) {
+            $flags |= FILTER_FLAG_ALLOW_OCTAL;
+        }
+
+        if ($allowHex) {
+            $flags |= FILTER_FLAG_ALLOW_HEX;
+        }
+
+        return $this->applyDefault($this->create(FILTER_VALIDATE_INT, $flags, $options), $default);
+    }
+
+    /**
+     * Create a Rule for a valid IP address.
+     *
+     * @param boolean $allowV4
+     * @param boolean $allowV6
+     * @param boolean $allowPrivateRange Allow IP addresses within private ranges.
+     * @param boolean $allowReservedRange Allow IP addresses within other reserved ranges.
+     * @param mixed $default
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     *
+     * @see https://en.wikipedia.org/wiki/Reserved_IP_addresses
+     */
+    public function validIpAddress(bool $allowV4 = false, bool $allowV6 = false, bool $allowPrivateRange = true, bool $allowReservedRange = true, $default = null): RuleInterface
+    {
+        $flags = 0;
+
+        if ($allowV4) {
+            $flags |= FILTER_FLAG_IPV4;
+        }
+
+        if ($allowV6) {
+            $flags |= FILTER_FLAG_IPV6;
+        }
+
+        if (!$allowPrivateRange) {
+            $flags |= FILTER_FLAG_NO_PRIV_RANGE;
+        }
+
+        if (!$allowReservedRange) {
+            $flags |= FILTER_FLAG_NO_RES_RANGE;
+        }
+
+        return $this->applyDefault($this->create(FILTER_VALIDATE_IP, $flags), $default);
+    }
+
+    /**
+     * Create a Rule for a valid MAC address.
+     *
+     * @param mixed $default
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function validMacAddress($default = null): RuleInterface
+    {
+        return $this->applyDefault($this->create(FILTER_VALIDATE_MAC), $default);
+    }
+
+    /**
+     * Create a Rule for a valid regular expression match.
+     *
+     * @param string $regex
+     * @param mixed $default
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    public function validRegExp(string $regex, $default = null): RuleInterface
+    {
+        $options = [
+            'regexp' => $regex,
+        ];
+
+        return $this->applyDefault($this->create(FILTER_VALIDATE_REGEXP, 0, $options), $default);
+    }
+
+    /**
+     * Apply default option to the Rule.
+     *
+     * @param \FigTree\Validation\Contracts\RuleInterface $rule
+     * @param mixed $default
+     *
+     * @return \FigTree\Validation\Contracts\RuleInterface
+     */
+    protected function applyDefault(RuleInterface $rule, $default = null): RuleInterface
+    {
+        if (!is_null($default)) {
+            $rule->setOption('default', $default);
+        }
+
+        return $rule;
+    }
 }

src/Filter.php

Indentation +13 added lines, -13 removed lines

@@ -4,18 +4,18 @@
 
 class Filter extends AbstractFilter
 {
-	public function __construct(protected array $rules)
-	{
-		//
-	}
+    public function __construct(protected array $rules)
+    {
+        //
+    }
 
-	/**
-	 * Get the set of Rules for this Filter.
-	 *
-	 * @return array
-	 */
-	public function getRules(): array
-	{
-		return $this->rules;
-	}
+    /**
+     * Get the set of Rules for this Filter.
+     *
+     * @return array
+     */
+    public function getRules(): array
+    {
+        return $this->rules;
+    }
 }