Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Illuminate/Validation/Concerns/ValidatesAttributes.php
Original file line number Diff line number Diff line change
Expand Up @@ -482,12 +482,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);
}

Expand Down
76 changes: 76 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3117,6 +3117,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();
Expand Down Expand Up @@ -3154,6 +3192,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();
Expand Down