Merge remote-tracking branch 'upstream/6.x' into 6.x

dietercoopman · Jun 23, 2021 · 09feffb · 09feffb
2 parents 5c79528 + 00fa9c0
commit 09feffb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -31,7 +31,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
      *
      * @var string
      */
-    const VERSION = '6.20.28';
+    const VERSION = '6.20.29';
 
     /**
      * The base path for the Laravel installation.

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());
     }
 }