Compare commits

..

No commits in common. "master" and "1.2" have entirely different histories.

View file

@ -53,6 +53,7 @@ class Validator
/**
* Constructor
*
* @param CsvParser $parser
* @param RecursiveValidator $validator
*/
public function __construct(RecursiveValidator $validator = null)
@ -67,7 +68,7 @@ class Validator
/**
* Append a constraint to a specific column
*
* @param integer $key The column number
* @param $key The column number
* @param Constraint $constraint The constraint
* @return Validator
*/
@ -85,6 +86,7 @@ class Validator
/**
* Append a constraint to a specific line
*
* @param $key The column number
* @param Constraint $constraint The constraint
* @return Validator
*/
@ -110,7 +112,6 @@ class Validator
/**
* Run the validation
* @param CsvParser $parser
*/
public function validate(CsvParser $parser)
{
@ -160,7 +161,7 @@ class Validator
foreach ($this->parser->getDatas() as $line => $data) {
foreach ($this->dataConstraints as $constraint) {
$violations = $this->validator->validate($data, $constraint);
$violations = $this->validator->validateValue($data, $constraint);
$this->mergeViolationsMessages($violations, $this->getTrueLine($line));
}
@ -187,7 +188,7 @@ class Validator
);
} else {
foreach ($constraints as $constraint) {
$violations = $this->validator->validate($data[$key], $constraint);
$violations = $this->validator->validateValue($data[$key], $constraint);
$this->mergeViolationsMessages(
$violations,