Allow multiple parameters for required_if

anlutro · anlutro · commit 4bc806c6fc57 · 2014-03-29T09:16:49.000+01:00
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -562,7 +562,10 @@ protected function validateRequiredIf($attribute, $value, $parameters)
 	{
 		$this->requireParameterCount(2, $parameters, 'required_if');
 
-		if ($parameters[1] == array_get($this->data, $parameters[0]))
+		$data = array_get($this->data, $parameters[0]);
+		$values = array_slice($parameters, 1);
+
+		if (in_array($data, $values))
 		{
 			return $this->validateRequired($attribute, $value);
 		}
diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -345,6 +345,14 @@ public function testRequiredIf()
 		$trans = $this->getRealTranslator();
 		$v = new Validator($trans, array('first' => 'taylor', 'last' => 'otwell'), array('last' => 'required_if:first,taylor'));
 		$this->assertTrue($v->passes());
+
+		$trans = $this->getRealTranslator();
+		$v = new Validator($trans, array('first' => 'taylor', 'last' => 'otwell'), array('last' => 'required_if:first,taylor,dayle'));
+		$this->assertTrue($v->passes());
+
+		$trans = $this->getRealTranslator();
+		$v = new Validator($trans, array('first' => 'dayle', 'last' => 'rees'), array('last' => 'required_if:first,taylor,dayle'));
+		$this->assertTrue($v->passes());
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,10 @@ protected function validateRequiredIf($attribute, $value, $parameters)`
`562`	`562`	`{`
`563`	`563`	`$this->requireParameterCount(2, $parameters, 'required_if');`
`564`	`564`
`565`		`- if ($parameters[1] == array_get($this->data, $parameters[0]))`
	`565`	`+ $data = array_get($this->data, $parameters[0]);`
	`566`	`+ $values = array_slice($parameters, 1);`
	`567`	`+`
	`568`	`+ if (in_array($data, $values))`
`566`	`569`	`{`
`567`	`570`	`return $this->validateRequired($attribute, $value);`
`568`	`571`	`}`