Refactoring, tests
This commit is contained in:
parent
852c359f86
commit
8210838485
|
@ -27,7 +27,7 @@ class Validator
|
||||||
/**
|
/**
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $fieldsConstraints = [];
|
protected $fieldConstraints = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var array
|
* @var array
|
||||||
|
@ -66,11 +66,11 @@ class Validator
|
||||||
*/
|
*/
|
||||||
public function addFieldConstraint($key, Constraint $constraint)
|
public function addFieldConstraint($key, Constraint $constraint)
|
||||||
{
|
{
|
||||||
if (!array_key_exists($key, $this->fieldsConstraints)) {
|
if (!array_key_exists($key, $this->fieldConstraints)) {
|
||||||
$this->fieldsConstraints[$key] = [];
|
$this->fieldConstraints[$key] = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->fieldsConstraints[$key][] = $constraint;
|
$this->fieldConstraints[$key][] = $constraint;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
@ -98,14 +98,42 @@ class Validator
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->validateDatas();
|
||||||
|
$this->validateFields();
|
||||||
|
|
||||||
|
|
||||||
|
$this->hasValidate = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validates datas
|
||||||
|
*/
|
||||||
|
protected function validateDatas()
|
||||||
|
{
|
||||||
|
if (empty($this->dataConstraints)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
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->validateValue($data, $constraint);
|
||||||
|
|
||||||
$this->mergeViolationsMessages($violations, $line);
|
$this->mergeViolationsMessages($violations, $line);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($this->fieldsConstraints as $key => $constraints) {
|
/**
|
||||||
|
* Validates fields
|
||||||
|
*/
|
||||||
|
protected function validateFields()
|
||||||
|
{
|
||||||
|
if (empty($this->fieldConstraints)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->parser->getDatas() as $line => $data) {
|
||||||
|
foreach ($this->fieldConstraints as $key => $constraints) {
|
||||||
if (!isset($data[$key])) {
|
if (!isset($data[$key])) {
|
||||||
$this->mergeErrorMessage(sprintf('Field "%s" does not exist.', $key + 1), $line, $key);
|
$this->mergeErrorMessage(sprintf('Field "%s" does not exist.', $key + 1), $line, $key);
|
||||||
} else {
|
} else {
|
||||||
|
@ -117,8 +145,6 @@ class Validator
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->hasValidate = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -139,7 +165,7 @@ class Validator
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($violations as $violation) {
|
foreach ($violations as $violation) {
|
||||||
$this->errors[] = new Violation($line + 1, $key, $violation);
|
$this->errors[] = $this->generateViolation($line + 1, $key, $violation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -160,8 +186,8 @@ class Validator
|
||||||
$key++;
|
$key++;
|
||||||
}
|
}
|
||||||
|
|
||||||
$violation = new ConstraintViolation($message, $message, [], null, '', null);
|
$violation = $this->generateConstraintViolation($message);
|
||||||
$this->errors[] = new Violation($line + 1, $key, $violation);
|
$this->errors[] = $this->generateViolation($line + 1, $key, $violation);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -188,4 +214,28 @@ class Validator
|
||||||
{
|
{
|
||||||
return $this->errors;
|
return $this->errors;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generate a ConstraintViolation
|
||||||
|
*
|
||||||
|
* @param string $message The error message
|
||||||
|
* @return ConstraintViolation
|
||||||
|
*/
|
||||||
|
protected function generateConstraintViolation($message)
|
||||||
|
{
|
||||||
|
return new ConstraintViolation($message, $message, [], null, '', null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generate a Violation
|
||||||
|
*
|
||||||
|
* @param string $message The error message
|
||||||
|
* @param integer $line The line of the violations
|
||||||
|
* @param integer|null $key The column of the violations
|
||||||
|
* @return Violation
|
||||||
|
*/
|
||||||
|
protected function generateViolation($line, $key, ConstraintViolation $violation)
|
||||||
|
{
|
||||||
|
return new Violation($line, $key, $violation);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
class ValidatorTest extends \PHPUnit_Framework_TestCase
|
|
||||||
{
|
|
||||||
public function testAddLine()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
23
tests/ViolationTest.php
Normal file
23
tests/ViolationTest.php
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use Symfony\Component\Validator\ConstraintViolation;
|
||||||
|
use Deblan\CsvValidator\Violation;
|
||||||
|
|
||||||
|
class ViolationTest extends \PHPUnit_Framework_TestCase
|
||||||
|
{
|
||||||
|
public function testViolation()
|
||||||
|
{
|
||||||
|
$constraintViolation = $this->generateConstraintViolation();
|
||||||
|
|
||||||
|
$violation = new Violation(1, 2, $constraintViolation);
|
||||||
|
|
||||||
|
$this->assertEquals(1, $violation->getLine());
|
||||||
|
$this->assertEquals(2, $violation->getColumn());
|
||||||
|
$this->assertEquals($constraintViolation, $violation->getViolation());
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function generateConstraintViolation()
|
||||||
|
{
|
||||||
|
return new ConstraintViolation('foo', 'foo', [], null, '', null);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue