Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed duplicated rule name definition #85

Merged
merged 1 commit into from
Oct 5, 2020
Merged

Removed duplicated rule name definition #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/Rule/AtLeast.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

namespace Yiisoft\Validator\Rule;

use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\HasValidationErrorMessage;
use Yiisoft\Validator\Rule;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\Rule;

/**
* AtLeastValidator checks if at least $min of many attributes are filled.
Expand Down Expand Up @@ -77,11 +77,6 @@ public function min(int $value): self
return $new;
}

public function getName(): string
{
return 'atLeast';
}

public function getOptions(): array
{
return array_merge(
Expand Down
9 changes: 2 additions & 7 deletions src/Rule/Boolean.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

namespace Yiisoft\Validator\Rule;

use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\HasValidationErrorMessage;
use Yiisoft\Validator\Rule;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\Rule;

/**
* BooleanValidator checks if the attribute value is a boolean value or a value corresponding to it.
Expand Down Expand Up @@ -78,11 +78,6 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
return $result;
}

public function getName(): string
{
return 'boolean';
}

public function getOptions(): array
{
return array_merge(
Expand Down
9 changes: 2 additions & 7 deletions src/Rule/Callback.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

namespace Yiisoft\Validator\Rule;

use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\Exception\CallbackRuleException;
use Yiisoft\Validator\Rule;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\Rule;

class Callback extends Rule
{
Expand Down Expand Up @@ -39,9 +39,4 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
}
return $result;
}

public function getName(): string
{
return 'callback';
}
}
9 changes: 2 additions & 7 deletions src/Rule/CompareTo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace Yiisoft\Validator\Rule;

use Yiisoft\Validator\Rule;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\Rule;

/**
* CompareValidator compares the specified attribute value with another value.
Expand Down Expand Up @@ -191,11 +191,6 @@ protected function compareValues(string $operator, string $type, $value, $compar
}
}

public function getName(): string
{
return 'compareTo';
}

public function getOptions(): array
{
return array_merge(
Expand Down
9 changes: 2 additions & 7 deletions src/Rule/Each.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

namespace Yiisoft\Validator\Rule;

use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\HasValidationErrorMessage;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\Rule;
use Yiisoft\Validator\Rules;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\DataSetInterface;

/**
* Each validator validates an array by checking each of its elements against a set of rules
Expand Down Expand Up @@ -62,11 +62,6 @@ public function incorrectInputMessage(string $message): self
return $new;
}

public function getName(): string
{
return 'each';
}

public function getOptions(): array
{
return $this->rules->asArray();
Expand Down
9 changes: 2 additions & 7 deletions src/Rule/Email.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

namespace Yiisoft\Validator\Rule;

use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\HasValidationErrorMessage;
use Yiisoft\Validator\Rule;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\Rule;

/**
* EmailValidator validates that the attribute value is a valid email address.
Expand Down Expand Up @@ -127,11 +127,6 @@ public function enableIDN(bool $enableIDN): self
return $new;
}

public function getName(): string
{
return 'email';
}

public function getOptions(): array
{
return array_merge(
Expand Down
9 changes: 2 additions & 7 deletions src/Rule/HasLength.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

namespace Yiisoft\Validator\Rule;

use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\HasValidationErrorMessage;
use Yiisoft\Validator\Rule;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\Rule;

/**
* StringValidator validates that the attribute value is of certain length.
Expand Down Expand Up @@ -102,11 +102,6 @@ public function tooLongMessage(string $message): self
return $new;
}

public function getName(): string
{
return 'hasLength';
}

public function getOptions(): array
{
return array_merge(
Expand Down
11 changes: 3 additions & 8 deletions src/Rule/InRange.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

namespace Yiisoft\Validator\Rule;

use Yiisoft\Validator\HasValidationErrorMessage;
use Yiisoft\Validator\Rule;
use Yiisoft\Arrays\ArrayHelper;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\HasValidationErrorMessage;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\Rule;

use function is_iterable;

Expand Down Expand Up @@ -83,11 +83,6 @@ public function not(): self
return $new;
}

public function getName(): string
{
return 'inRange';
}

public function getOptions(): array
{
return array_merge(
Expand Down
7 changes: 1 addition & 6 deletions src/Rule/Ip.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace Yiisoft\Validator\Rule;

use Yiisoft\Validator\Result;
use Yiisoft\NetworkUtilities\IpHelper;
use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\Rule;

/**
Expand Down Expand Up @@ -455,11 +455,6 @@ public function getIpParsePattern(): string
) . ')?(?<ipCidr>(?<ip>(?:' . IpHelper::IPV4_PATTERN . ')|(?:' . IpHelper::IPV6_PATTERN . '))(?:\/(?<cidr>-?\d+))?)$/';
}

public function getName(): string
{
return 'ip';
}

public function getOptions(): array
{
return array_merge(
Expand Down
9 changes: 2 additions & 7 deletions src/Rule/Json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

namespace Yiisoft\Validator\Rule;

use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\HasValidationErrorMessage;
use Yiisoft\Validator\Rule;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\Rule;

/**
* JsonValidator validates that the attribute value is a valid json
Expand Down Expand Up @@ -51,11 +51,6 @@ private function isValidJson($value): bool
return is_string($value) && preg_match($regex, $value) === 1;
}

public function getName(): string
{
return 'json';
}

public function getOptions(): array
{
return array_merge(
Expand Down
9 changes: 2 additions & 7 deletions src/Rule/MatchRegularExpression.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

namespace Yiisoft\Validator\Rule;

use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\HasValidationErrorMessage;
use Yiisoft\Validator\Rule;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\Rule;

/**
* RegularExpressionValidator validates that the attribute value matches the specified [[pattern]].
Expand Down Expand Up @@ -57,11 +57,6 @@ public function not(): self
return $new;
}

public function getName(): string
{
return 'matchRegularExpression';
}

public function getOptions(): array
{
return array_merge(
Expand Down
9 changes: 2 additions & 7 deletions src/Rule/Number.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
namespace Yiisoft\Validator\Rule;

use Yiisoft\Strings\NumericHelper;
use Yiisoft\Validator\Rule;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\Rule;

/**
* NumberValidator validates that the attribute value is a number.
Expand Down Expand Up @@ -115,11 +115,6 @@ private function getNotANumberMessage(): string
return 'Value must be a number.';
}

public function getName(): string
{
return 'number';
}

public function getOptions(): array
{
return array_merge(
Expand Down
9 changes: 2 additions & 7 deletions src/Rule/Required.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

namespace Yiisoft\Validator\Rule;

use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\HasValidationErrorMessage;
use Yiisoft\Validator\Rule;
use Yiisoft\Validator\Result;
use Yiisoft\Validator\DataSetInterface;
use Yiisoft\Validator\Rule;

/**
* RequiredValidator validates that the specified attribute does not have null or empty value.
Expand All @@ -29,11 +29,6 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
return $result;
}

public function getName(): string
{
return 'required';
}

public function getOptions(): array
{
return array_merge(
Expand Down
5 changes: 0 additions & 5 deletions src/Rule/Url.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@ public function schemes(array $schemes): self
return $new;
}

public function getName(): string
{
return 'url';
}

public function getOptions(): array
{
return array_merge(
Expand Down