[12.x] Refine type hinting for condition rules (#56420)

michaelnabil230 · web-flow · commit 7ce337e48fb3 · 2025-07-25T20:51:52.000-06:00
* refine type hinting for condition in RequiredIf rule

* refine type hinting for callback parameters in validation rules

* Formatting
diff --git a/src/Illuminate/Validation/Rule.php b/src/Illuminate/Validation/Rule.php
@@ -144,7 +144,7 @@ public static function notIn($values)
     /**
      * Get a required_if rule builder instance.
      *
-     * @param  callable|bool  $callback
+     * @param  (\Closure(): bool)|bool  $callback
      * @return \Illuminate\Validation\Rules\RequiredIf
      */
     public static function requiredIf($callback)
@@ -155,7 +155,7 @@ public static function requiredIf($callback)
     /**
      * Get a exclude_if rule builder instance.
      *
-     * @param  callable|bool  $callback
+     * @param  (\Closure(): bool)|bool  $callback
      * @return \Illuminate\Validation\Rules\ExcludeIf
      */
     public static function excludeIf($callback)
@@ -166,7 +166,7 @@ public static function excludeIf($callback)
     /**
      * Get a prohibited_if rule builder instance.
      *
-     * @param  callable|bool  $callback
+     * @param  (\Closure(): bool)|bool  $callback
      * @return \Illuminate\Validation\Rules\ProhibitedIf
      */
     public static function prohibitedIf($callback)
diff --git a/src/Illuminate/Validation/Rules/ExcludeIf.php b/src/Illuminate/Validation/Rules/ExcludeIf.php
@@ -11,14 +11,14 @@ class ExcludeIf implements Stringable
     /**
      * The condition that validates the attribute.
      *
-     * @var \Closure|bool
+     * @var (\Closure(): bool)|bool
      */
     public $condition;
 
     /**
      * Create a new exclude validation rule based on a condition.
      *
-     * @param  \Closure|bool  $condition
+     * @param  (\Closure(): bool)|bool  $condition
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Illuminate/Validation/Rules/ProhibitedIf.php b/src/Illuminate/Validation/Rules/ProhibitedIf.php
@@ -11,14 +11,14 @@ class ProhibitedIf implements Stringable
     /**
      * The condition that validates the attribute.
      *
-     * @var \Closure|bool
+     * @var (\Closure(): bool)|bool
      */
     public $condition;
 
     /**
      * Create a new prohibited validation rule based on a condition.
      *
-     * @param  \Closure|bool  $condition
+     * @param  (\Closure(): bool)|bool  $condition
      * @return void
      *
      * @throws \InvalidArgumentException
diff --git a/src/Illuminate/Validation/Rules/RequiredIf.php b/src/Illuminate/Validation/Rules/RequiredIf.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Validation\Rules;
 
+use Closure;
 use InvalidArgumentException;
 use Stringable;
 
@@ -10,18 +11,18 @@ class RequiredIf implements Stringable
     /**
      * The condition that validates the attribute.
      *
-     * @var callable|bool
+     * @var (\Closure(): bool)|bool
      */
     public $condition;
 
     /**
      * Create a new required validation rule based on a condition.
      *
-     * @param  callable|bool  $condition
+     * @param  (\Closure(): bool)|bool  $condition
      */
     public function __construct($condition)
     {
-        if (! is_string($condition)) {
+        if ($condition instanceof Closure || is_bool($condition)) {
             $this->condition = $condition;
         } else {
             throw new InvalidArgumentException('The provided condition must be a callable or boolean.');

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@ class ExcludeIf implements Stringable`
`11`	`11`	`/**`
`12`	`12`	`* The condition that validates the attribute.`
`13`	`13`	`*`
`14`		`- * @var \Closure\|bool`
	`14`	`+ * @var (\Closure(): bool)\|bool`
`15`	`15`	`*/`
`16`	`16`	`public $condition;`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* Create a new exclude validation rule based on a condition.`
`20`	`20`	`*`
`21`		`- * @param \Closure\|bool $condition`
	`21`	`+ * @param (\Closure(): bool)\|bool $condition`
`22`	`22`	`*`
`23`	`23`	`* @throws \InvalidArgumentException`
`24`	`24`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@ class ProhibitedIf implements Stringable`
`11`	`11`	`/**`
`12`	`12`	`* The condition that validates the attribute.`
`13`	`13`	`*`
`14`		`- * @var \Closure\|bool`
	`14`	`+ * @var (\Closure(): bool)\|bool`
`15`	`15`	`*/`
`16`	`16`	`public $condition;`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* Create a new prohibited validation rule based on a condition.`
`20`	`20`	`*`
`21`		`- * @param \Closure\|bool $condition`
	`21`	`+ * @param (\Closure(): bool)\|bool $condition`
`22`	`22`	`* @return void`
`23`	`23`	`*`
`24`	`24`	`* @throws \InvalidArgumentException`