deblan-mirror/respect-validation
deblan-mirror/respect-validation
1
0
Fork 0
mirror of https://github.com/Respect/Validation.git synced 2024-06-06 15:52:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update the validation engine of the "Ip" rule

Browse source 
Signed-off-by: Henrique Moody <henriquemoody@gmail.com>
This commit is contained in:
Henrique Moody 2024-03-25 00:15:43 +01:00
parent dd3a87b2db
commit b653b055b4
No known key found for this signature in database
GPG key ID: 221E9281655813A6
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
library/Rules/Ip.php
View file

@ -11,6 +11,8 @@ namespace Respect\Validation\Rules;
use Respect\Validation\Exceptions\ComponentException;
use Respect\Validation\Message\Template;
use Respect\Validation\Result;
use Respect\Validation\Rules\Core\Standard;
use function bccomp;
use function explode;
@ -37,7 +39,7 @@ use const FILTER_VALIDATE_IP;
'{{name}} must not be an IP address in the {{range|raw}} range',
self::TEMPLATE_NETWORK_RANGE,
)]
final class Ip extends AbstractRule
final class Ip extends Standard
{
public const TEMPLATE_NETWORK_RANGE = '__network_range__';
@ -55,38 +57,27 @@ final class Ip extends AbstractRule
$this->range = $this->createRange();
}
public function validate(mixed $input): bool
public function evaluate(mixed $input): Result
{
$parameters = ['range' => $this->range];
$template = $this->range ? self::TEMPLATE_NETWORK_RANGE : self::TEMPLATE_STANDARD;
if (!is_string($input)) {
return false;
return Result::failed($input, $this, $parameters, $template);
}
if (!$this->verifyAddress($input)) {
return false;
return Result::failed($input, $this, $parameters, $template);
}
if ($this->mask) {
return $this->belongsToSubnet($input);
return new Result($this->belongsToSubnet($input), $input, $this, $parameters, $template);
}
if ($this->startAddress && $this->endAddress) {
return $this->verifyNetwork($input);
return new Result($this->verifyNetwork($input), $input, $this, $parameters, $template);
}
return true;
}
/**
* @return array<string, mixed>
*/
public function getParams(): array
{
return ['range' => $this->range];
}
protected function getStandardTemplate(mixed $input): string
{
return $this->range ? self::TEMPLATE_NETWORK_RANGE : self::TEMPLATE_STANDARD;
return Result::passed($input, $this, $parameters, $template);
}
private function createRange(): ?string