Removed unnecessary checks as is_callable would return false for lite…

…rals other than strings anyway, fixed tests (#37700)
laravel · Jun 16, 2021 · a048f99 · a048f99
1 parent c550e09
commit a048f99
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/Illuminate/Validation/Rules/RequiredIf.php b/src/Illuminate/Validation/Rules/RequiredIf.php
@@ -21,7 +21,7 @@ class RequiredIf
      */
     public function __construct($condition)
     {
-        if (! is_string($condition) && (is_bool($condition) || is_callable($condition))) {
+        if (! is_string($condition)) {
             $this->condition = $condition;
         } else {
             throw new InvalidArgumentException('The provided condition must be a callable or boolean.');

diff --git a/tests/Validation/ValidationRequiredIfTest.php b/tests/Validation/ValidationRequiredIfTest.php
@@ -39,10 +39,6 @@ public function testItOnlyCallableAndBooleanAreAcceptableArgumentsOfTheRule()
         $this->expectException(\InvalidArgumentException::class);
 
         $rule = new RequiredIf('phpinfo');
-
-        $rule = new RequiredIf(12.3);
-
-        $rule = new RequiredIf(new stdClass());
     }
 
     public function testItReturnedRuleIsNotSerializable()
@@ -52,7 +48,5 @@ public function testItReturnedRuleIsNotSerializable()
         $rule = serialize(new RequiredIf(function () {
             return true;
         }));
-
-        $rule = serialize(new RequiredIf());
     }
 }