forked from deblan/csv-validator
Mettre à jour 'src/Deblan/CsvValidator/Validator.php'
This commit is contained in:
parent
6be22908dc
commit
cbd3ce7e69
|
@ -53,7 +53,6 @@ class Validator
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*
|
*
|
||||||
* @param CsvParser $parser
|
|
||||||
* @param RecursiveValidator $validator
|
* @param RecursiveValidator $validator
|
||||||
*/
|
*/
|
||||||
public function __construct(RecursiveValidator $validator = null)
|
public function __construct(RecursiveValidator $validator = null)
|
||||||
|
@ -68,7 +67,7 @@ class Validator
|
||||||
/**
|
/**
|
||||||
* Append a constraint to a specific column
|
* Append a constraint to a specific column
|
||||||
*
|
*
|
||||||
* @param $key The column number
|
* @param integer $key The column number
|
||||||
* @param Constraint $constraint The constraint
|
* @param Constraint $constraint The constraint
|
||||||
* @return Validator
|
* @return Validator
|
||||||
*/
|
*/
|
||||||
|
@ -86,7 +85,6 @@ class Validator
|
||||||
/**
|
/**
|
||||||
* Append a constraint to a specific line
|
* Append a constraint to a specific line
|
||||||
*
|
*
|
||||||
* @param $key The column number
|
|
||||||
* @param Constraint $constraint The constraint
|
* @param Constraint $constraint The constraint
|
||||||
* @return Validator
|
* @return Validator
|
||||||
*/
|
*/
|
||||||
|
@ -112,6 +110,7 @@ class Validator
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Run the validation
|
* Run the validation
|
||||||
|
* @param CsvParser $parser
|
||||||
*/
|
*/
|
||||||
public function validate(CsvParser $parser)
|
public function validate(CsvParser $parser)
|
||||||
{
|
{
|
||||||
|
@ -161,7 +160,7 @@ class Validator
|
||||||
|
|
||||||
foreach ($this->parser->getDatas() as $line => $data) {
|
foreach ($this->parser->getDatas() as $line => $data) {
|
||||||
foreach ($this->dataConstraints as $constraint) {
|
foreach ($this->dataConstraints as $constraint) {
|
||||||
$violations = $this->validator->validateValue($data, $constraint);
|
$violations = $this->validator->validate($data, $constraint);
|
||||||
|
|
||||||
$this->mergeViolationsMessages($violations, $this->getTrueLine($line));
|
$this->mergeViolationsMessages($violations, $this->getTrueLine($line));
|
||||||
}
|
}
|
||||||
|
@ -188,7 +187,7 @@ class Validator
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
foreach ($constraints as $constraint) {
|
foreach ($constraints as $constraint) {
|
||||||
$violations = $this->validator->validateValue($data[$key], $constraint);
|
$violations = $this->validator->validate($data[$key], $constraint);
|
||||||
|
|
||||||
$this->mergeViolationsMessages(
|
$this->mergeViolationsMessages(
|
||||||
$violations,
|
$violations,
|
||||||
|
|
Loading…
Reference in a new issue