Merge pull request #4070 from Feld0/4.1

taylorotwell · taylorotwell · commit 0c9a90505998 · 2014-04-07T16:31:03.000-05:00
Fix #4067: Acceptance validation not boolean true
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -648,7 +648,7 @@ protected function validateDifferent($attribute, $value, $parameters)
 	 */
 	protected function validateAccepted($attribute, $value)
 	{
-		$acceptable = array('yes', 'on', '1', 1);
+		$acceptable = array('yes', 'on', '1', 1, true, 'true');
 
 		return ($this->validateRequired($attribute, $value) && in_array($value, $acceptable, true));
 	}
diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -403,6 +403,12 @@ public function testValidateAccepted()
 		$v = new Validator($trans, array('foo' => 0), array('foo' => 'Accepted'));
 		$this->assertFalse($v->passes());
 
+		$v = new Validator($trans, array('foo' => false), array('foo' => 'Accepted'));
+		$this->assertFalse($v->passes());
+
+		$v = new Validator($trans, array('foo' => 'false'), array('foo' => 'Accepted'));
+		$this->assertFalse($v->passes());
+
 		$v = new Validator($trans, array('foo' => 'yes'), array('foo' => 'Accepted'));
 		$this->assertTrue($v->passes());
 
@@ -414,6 +420,12 @@ public function testValidateAccepted()
 
 		$v = new Validator($trans, array('foo' => 1), array('foo' => 'Accepted'));
 		$this->assertTrue($v->passes());
+
+		$v = new Validator($trans, array('foo' => true), array('foo' => 'Accepted'));
+		$this->assertTrue($v->passes());
+
+		$v = new Validator($trans, array('foo' => 'true'), array('foo' => 'Accepted'));
+		$this->assertTrue($v->passes());
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ protected function validateDifferent($attribute, $value, $parameters)`
`648`	`648`	`*/`
`649`	`649`	`protected function validateAccepted($attribute, $value)`
`650`	`650`	`{`
`651`		`- $acceptable = array('yes', 'on', '1', 1);`
	`651`	`+ $acceptable = array('yes', 'on', '1', 1, true, 'true');`
`652`	`652`
`653`	`653`	`return ($this->validateRequired($attribute, $value) && in_array($value, $acceptable, true));`
`654`	`654`	`}`