pass attribute to methods even though we aren't using it now

miken32 · Oct 23, 2023 · e4dfda2 · e4dfda2
1 parent 473ed1c
commit e4dfda2
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 18 deletions.
diff --git a/src/Rules/BaseRule.php b/src/Rules/BaseRule.php
@@ -40,7 +40,7 @@ public function extend(string $attribute, string $value, array $parameters, Vali
             static::class
         );
 
-        return $this->doValidation($value, ...$parameters);
+        return $this->doValidation($attribute, $value, ...$parameters);
     }
 
     /**
@@ -66,7 +66,7 @@ public function setValidator($validator): static
      */
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        if (!$this->doValidation($value)) {
+        if (!$this->doValidation($attribute, $value)) {
             $fail($this->message());
         }
     }
@@ -80,7 +80,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
      */
     public function passes($attribute, $value): bool
     {
-        return $this->doValidation($value);
+        return $this->doValidation($attribute, $value);
     }
 
     /**
@@ -101,11 +101,12 @@ public function replace(string $message, string $attribute, string $rule, array
     /**
      * Do the actual validation; used by both instance and extend methods
      *
+     * @param string $attribute
      * @param string $value the value to be checked
      * @param mixed ...$parameters for string methods, the paramater array
      * @return bool
      */
-    abstract public function doValidation(string $value, ...$parameters): bool;
+    abstract public function doValidation(string $attribute, string $value, ...$parameters): bool;
 
     /**
      * Return the validation error message

diff --git a/src/Rules/InNetwork.php b/src/Rules/InNetwork.php
@@ -14,7 +14,7 @@ public function __construct(string|array|null $network = null)
         $this->networks = Arr::wrap($network);
     }
 
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         if ($this->extended) {
             $this->networks = $parameters;

diff --git a/src/Rules/IpOrNet.php b/src/Rules/IpOrNet.php
@@ -6,7 +6,7 @@
 
 class IpOrNet extends BaseRule
 {
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         return Util::validIPAddress($value) || Util::validIPNetwork($value);
     }

diff --git a/src/Rules/Netv4.php b/src/Rules/Netv4.php
@@ -14,7 +14,7 @@ public function __construct(
     {
     }
 
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         if ($this->extended) {
             // called by string method

diff --git a/src/Rules/Netv6.php b/src/Rules/Netv6.php
@@ -16,7 +16,7 @@ public function __construct(
     {
     }
 
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         if ($this->extended) {
             // called by string method

diff --git a/src/Rules/PrivateIp.php b/src/Rules/PrivateIp.php
@@ -6,7 +6,7 @@
 
 class PrivateIp extends BaseRule
 {
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         return Util::validPrivateIPAddress($value);
     }

diff --git a/src/Rules/PrivateIpv4.php b/src/Rules/PrivateIpv4.php
@@ -6,7 +6,7 @@
 
 class PrivateIpv4 extends BaseRule
 {
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         return Util::validPrivateIPv4Address($value);
     }

diff --git a/src/Rules/PrivateIpv6.php b/src/Rules/PrivateIpv6.php
@@ -6,7 +6,7 @@
 
 class PrivateIpv6 extends BaseRule
 {
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         return Util::validPrivateIPv6Address($value);
     }

diff --git a/src/Rules/PrivateNet.php b/src/Rules/PrivateNet.php
@@ -6,7 +6,7 @@
 
 class PrivateNet extends BaseRule
 {
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         return Util::validPrivateIPNetwork($value);
     }

diff --git a/src/Rules/RoutableIp.php b/src/Rules/RoutableIp.php
@@ -6,7 +6,7 @@
 
 class RoutableIp extends BaseRule
 {
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         return Util::validRoutableIPAddress($value);
     }

diff --git a/src/Rules/RoutableIpv4.php b/src/Rules/RoutableIpv4.php
@@ -6,7 +6,7 @@
 
 class RoutableIpv4 extends BaseRule
 {
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         return Util::validRoutableIPv4Address($value);
     }

diff --git a/src/Rules/RoutableIpv6.php b/src/Rules/RoutableIpv6.php
@@ -6,7 +6,7 @@
 
 class RoutableIpv6 extends BaseRule
 {
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         return Util::validRoutableIPv6Address($value);
     }

diff --git a/src/Rules/RoutableNet.php b/src/Rules/RoutableNet.php
@@ -6,7 +6,7 @@
 
 class RoutableNet extends BaseRule
 {
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         return Util::validRoutableIPNetwork($value);
     }

diff --git a/src/Rules/RoutableNetv4.php b/src/Rules/RoutableNetv4.php
@@ -16,7 +16,7 @@ public function __construct(
     {
     }
 
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         if ($this->extended) {
             // called by string method

diff --git a/src/Rules/RoutableNetv6.php b/src/Rules/RoutableNetv6.php
@@ -16,7 +16,7 @@ public function __construct(
     {
     }
 
-    public function doValidation(string $value, ...$parameters): bool
+    public function doValidation(string $attribute, string $value, ...$parameters): bool
     {
         if ($this->extended) {
             // called by string method