Allows for strict boolean validation (#56313)

Author: peterfox

src/Illuminate/Validation/Concerns/ValidatesAttributes.php

@@ -486,12 +486,17 @@ public function validateBetween($attribute, $value, $parameters)
  *
  * @param string $attribute
  * @param mixed $value
+ * @param array{0: 'strict'} $parameters
  * @return bool
  */
- public function validateBoolean($attribute, $value)
+ public function validateBoolean($attribute, $value, $parameters)
  {
  $acceptable = [true, false, 0, 1, '0', '1'];
 
+ if (($parameters[0] ?? null) === 'strict') {
+ $acceptable = [true, false];
+ }
+
  return in_array($value, $acceptable, true);
  }
 

tests/Validation/ValidationValidatorTest.php

@@ -3116,6 +3116,44 @@ public function testValidateBoolean()
  $this->assertTrue($v->passes());
  }
 
+ public function testValidateBooleanStrict()
+ {
+ $trans = $this->getIlluminateArrayTranslator();
+
+ $v = new Validator($trans, ['foo' => false], ['foo' => 'Boolean:strict']);
+ $this->assertTrue($v->passes());
+
+ $v = new Validator($trans, ['foo' => true], ['foo' => 'Boolean:strict']);
+ $this->assertTrue($v->passes());
+
+ $v = new Validator($trans, ['foo' => 'no'], ['foo' => 'Boolean:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, ['foo' => 'yes'], ['foo' => 'Boolean:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, ['foo' => 'false'], ['foo' => 'Boolean:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, ['foo' => 'true'], ['foo' => 'Boolean:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, [], ['foo' => 'Boolean:strict']);
+ $this->assertTrue($v->passes());
+
+ $v = new Validator($trans, ['foo' => '1'], ['foo' => 'Boolean:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, ['foo' => 1], ['foo' => 'Boolean:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, ['foo' => '0'], ['foo' => 'Boolean:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, ['foo' => 0], ['foo' => 'Boolean:strict']);
+ $this->assertFalse($v->passes());
+ }
+
  public function testValidateBool()
  {
  $trans = $this->getIlluminateArrayTranslator();
@@ -3153,6 +3191,44 @@ public function testValidateBool()
  $this->assertTrue($v->passes());
  }
 
+ public function testValidateBoolStrict()
+ {
+ $trans = $this->getIlluminateArrayTranslator();
+
+ $v = new Validator($trans, ['foo' => false], ['foo' => 'Bool:strict']);
+ $this->assertTrue($v->passes());
+
+ $v = new Validator($trans, ['foo' => true], ['foo' => 'Bool:strict']);
+ $this->assertTrue($v->passes());
+
+ $v = new Validator($trans, ['foo' => 'no'], ['foo' => 'Bool:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, ['foo' => 'yes'], ['foo' => 'Bool']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, ['foo' => 'false'], ['foo' => 'Bool:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, ['foo' => 'true'], ['foo' => 'Bool:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, [], ['foo' => 'Bool:strict']);
+ $this->assertTrue($v->passes());
+
+ $v = new Validator($trans, ['foo' => '1'], ['foo' => 'Bool:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, ['foo' => 1], ['foo' => 'Bool:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, ['foo' => '0'], ['foo' => 'Bool:strict']);
+ $this->assertFalse($v->passes());
+
+ $v = new Validator($trans, ['foo' => 0], ['foo' => 'Bool:strict']);
+ $this->assertFalse($v->passes());
+ }
+
  public function testValidateNumeric()
  {
  $trans = $this->getIlluminateArrayTranslator();