Remove duplicated rule name definition (#85)

yiisoft · Oct 5, 2020 · e74480c · e74480c
1 parent 910a93d
commit e74480c
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 96 deletions.
diff --git a/src/Rule/AtLeast.php b/src/Rule/AtLeast.php
@@ -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.
@@ -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(

diff --git a/src/Rule/Boolean.php b/src/Rule/Boolean.php
@@ -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.
@@ -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(

diff --git a/src/Rule/Callback.php b/src/Rule/Callback.php
@@ -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
 {
@@ -39,9 +39,4 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
         }
         return $result;
     }
-
-    public function getName(): string
-    {
-        return 'callback';
-    }
 }
diff --git a/src/Rule/CompareTo.php b/src/Rule/CompareTo.php
@@ -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.
@@ -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(

diff --git a/src/Rule/Each.php b/src/Rule/Each.php
@@ -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
@@ -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();

diff --git a/src/Rule/Email.php b/src/Rule/Email.php
@@ -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.
@@ -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(

diff --git a/src/Rule/HasLength.php b/src/Rule/HasLength.php
@@ -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.
@@ -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(

diff --git a/src/Rule/InRange.php b/src/Rule/InRange.php
@@ -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;
 
@@ -83,11 +83,6 @@ public function not(): self
         return $new;
     }
 
-    public function getName(): string
-    {
-        return 'inRange';
-    }
-
     public function getOptions(): array
     {
         return array_merge(

diff --git a/src/Rule/Ip.php b/src/Rule/Ip.php
@@ -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;
 
 /**
@@ -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(

diff --git a/src/Rule/Json.php b/src/Rule/Json.php
@@ -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
@@ -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(

diff --git a/src/Rule/MatchRegularExpression.php b/src/Rule/MatchRegularExpression.php
@@ -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]].
@@ -57,11 +57,6 @@ public function not(): self
         return $new;
     }
 
-    public function getName(): string
-    {
-        return 'matchRegularExpression';
-    }
-
     public function getOptions(): array
     {
         return array_merge(

diff --git a/src/Rule/Number.php b/src/Rule/Number.php
@@ -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.
@@ -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(

diff --git a/src/Rule/Required.php b/src/Rule/Required.php
@@ -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.
@@ -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(

diff --git a/src/Rule/Url.php b/src/Rule/Url.php
@@ -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(