From 15b6358cc285365970b6e9bd9d44e7f9b739db6d Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Wed, 14 Apr 2021 13:58:24 +0200
Subject: [PATCH 1/4] Revert "Revert "[6.x] Fix required_if boolean
 validation"" (#36969)

---
 .../Validation/Concerns/ValidatesAttributes.php     | 13 ++++++++++++-
 tests/Validation/ValidationValidatorTest.php        | 11 +++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
index 13fe1a648108..68b38aa8491c 100644
--- a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
+++ b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -1475,13 +1475,24 @@ protected function prepareValuesAndOther($parameters)
 
         $values = array_slice($parameters, 1);
 
-        if (is_bool($other)) {
+        if ($this->shouldConvertToBoolean($parameters[0]) || is_bool($other)) {
             $values = $this->convertValuesToBoolean($values);
         }
 
         return [$values, $other];
     }
 
+    /**
+     * Check if parameter should be converted to boolean.
+     *
+     * @param  string  $parameter
+     * @return bool
+     */
+    protected function shouldConvertToBoolean($parameter)
+    {
+        return in_array('boolean', Arr::get($this->rules, $parameter, []));
+    }
+
     /**
      * Convert the given values to boolean if they are string "true" / "false".
      *
diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
index 4ac71213c984..2938f18e92b0 100755
--- a/tests/Validation/ValidationValidatorTest.php
+++ b/tests/Validation/ValidationValidatorTest.php
@@ -1090,6 +1090,17 @@ public function testRequiredIf()
         $v = new Validator($trans, ['first' => 'dayle', 'last' => ''], ['last' => 'RequiredIf:first,taylor,dayle']);
         $this->assertFalse($v->passes());
         $this->assertSame('The last field is required when first is dayle.', $v->messages()->first('last'));
+
+        $trans = $this->getIlluminateArrayTranslator();
+        $trans->addLines(['validation.required_if' => 'The :attribute field is required when :other is :value.'], 'en');
+        $v = new Validator($trans, ['foo' => 0], [
+            'foo' => 'required|boolean',
+            'bar' => 'required_if:foo,true',
+            'baz' => 'required_if:foo,false',
+        ]);
+        $this->assertTrue($v->fails());
+        $this->assertCount(1, $v->messages());
+        $this->assertSame('The baz field is required when foo is 0.', $v->messages()->first('baz'));
     }
 
     public function testRequiredUnless()

From 5531a599e15ff3c3acc0affa18e3824242b52ba3 Mon Sep 17 00:00:00 2001
From: Tetiana Blindaruk <t.blindaruk@gmail.com>
Date: Thu, 15 Apr 2021 23:51:22 +0300
Subject: [PATCH 2/4] [6.x] update changelog

---
 CHANGELOG-6.x.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
index c88ba87c7212..614783adc58f 100644
--- a/CHANGELOG-6.x.md
+++ b/CHANGELOG-6.x.md
@@ -1,6 +1,11 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.20.22...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.20.23...6.x)
+
+
+## [v6.20.23 (2021-04-13)](https://github.com/laravel/framework/compare/v6.20.22...v6.20.23)
+
+### Added strings to the `DetectsLostConnections.php` ([4210258](https://github.com/laravel/framework/commit/42102589bc7f7b8533ee1b815ef0cc18017d4e45))
 
 
 ## [v6.20.22 (2021-03-31)](https://github.com/laravel/framework/compare/v6.20.21...v6.20.22)

From 402ca919344c25c67b487a12e4a8b6edb0cdfc57 Mon Sep 17 00:00:00 2001
From: Tetiana Blindaruk <t.blindaruk@gmail.com>
Date: Thu, 15 Apr 2021 23:51:45 +0300
Subject: [PATCH 3/4] [6.x] update changelog

---
 CHANGELOG-6.x.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
index 614783adc58f..0a43e37ec935 100644
--- a/CHANGELOG-6.x.md
+++ b/CHANGELOG-6.x.md
@@ -5,7 +5,8 @@
 
 ## [v6.20.23 (2021-04-13)](https://github.com/laravel/framework/compare/v6.20.22...v6.20.23)
 
-### Added strings to the `DetectsLostConnections.php` ([4210258](https://github.com/laravel/framework/commit/42102589bc7f7b8533ee1b815ef0cc18017d4e45))
+### Added 
+- Added strings to the `DetectsLostConnections.php` ([4210258](https://github.com/laravel/framework/commit/42102589bc7f7b8533ee1b815ef0cc18017d4e45))
 
 
 ## [v6.20.22 (2021-03-31)](https://github.com/laravel/framework/compare/v6.20.21...v6.20.22)

From addc44fce390c783b2dee0d617300dce97e895f4 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Tue, 20 Apr 2021 08:46:19 -0500
Subject: [PATCH 4/4] patch

---
 src/Illuminate/Foundation/Application.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
index 9e37bd61811d..477a7f05c0f2 100755
--- 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.23';
+    const VERSION = '6.20.24';
 
     /**
      * The base path for the Laravel installation.