From d6f4e098a4c6163428da445f00ee044c0758c291 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 2 Dec 2016 15:18:33 +0100 Subject: [PATCH 1/9] tests --- tests/ValidatorTest.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php index 5c0e69f..4c8c617 100644 --- a/tests/ValidatorTest.php +++ b/tests/ValidatorTest.php @@ -16,6 +16,24 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase $validator->isValid(); } + public function testExpectedLegend() + { + $parser = $this->generateParser('example.csv'); + $parser->setHasLegend(true); + + $validator = $this->generateValidator(); + $validator->setExpectedLegend(['foo', 'bar', 'boo']); + $validator->validate($parser); + $this->assertEquals(true, $validator->isValid()); + $this->assertEquals(0, count($validator->getErrors())); + + $validator = $this->generateValidator(); + $validator->setExpectedLegend(['bad', 'legend']); + $validator->validate($parser); + $this->assertEquals(false, $validator->isValid()); + $this->assertEquals(1, count($validator->getErrors())); + } + public function testNoConstraint() { $parser = $this->generateParser('example.csv'); From 3cb4894bd0643cb4b53482636b50c20cfd35d429 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sat, 3 Dec 2016 18:41:54 +0100 Subject: [PATCH 2/9] phpci file --- phpci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 phpci.yml diff --git a/phpci.yml b/phpci.yml new file mode 100644 index 0000000..01be34a --- /dev/null +++ b/phpci.yml @@ -0,0 +1,14 @@ +build_settings: + verbose: false + prefer_symlink: false + +setup: + composer: + action: "install" + +test: + php_unit: + directory: "tests/" + args: "--configuration 'phpunit.xml'" + +complete: From 104b25d17c6aab0981fda760ab85c46fefce9a4a Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sat, 3 Dec 2016 18:46:28 +0100 Subject: [PATCH 3/9] README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3a76ce9..60a693c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ csv-validator ============= +![](https://phpci.gitnet.fr//build-status/image/1) + CSV validator library That uses the constraints of Symfony framework: [http://symfony.com/doc/current/reference/constraints.html](http://symfony.com/doc/current/reference/constraints.html). From 31adc51188d52a4ddb630e94c8371ea75caadd1f Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 12 Mar 2017 19:22:52 +0100 Subject: [PATCH 4/9] deblan/csv upgraded to the v2 and more units tests --- README.md | 41 ++++++++++++++++++++++--- composer.json | 2 +- example.php | 12 ++++---- src/Deblan/CsvValidator/Validator.php | 19 ++++++------ tests/ExampleTest.php | 44 +++++++++++++++++++++++++++ tests/ValidatorTest.php | 34 ++++++++++----------- 6 files changed, 114 insertions(+), 38 deletions(-) create mode 100644 tests/ExampleTest.php diff --git a/README.md b/README.md index 60a693c..3b2a3d3 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ $validator->addFieldConstraint(0, new Email()); $validator->addFieldConstraint(1, new Date()); // Validate the legend -$validator->setExpectedLegend(array('foo', 'bar', 'bim')); +$validator->setExpectedHeaders(['foo', 'bar', 'bim']); // An line must contain 3 columns $validator->addDataConstraint(new Callback(function($data, ExecutionContextInterface $context) { @@ -55,10 +55,10 @@ $validator->addDataConstraint(new Callback(function($data, ExecutionContextInter })); // Initialisation of the parser -$parser = new CsvParser(__DIR__.'/tests/fixtures/example.csv'); -$parser->setHasLegend(true); +$parser = new CsvParser(); +$parser->setHasHeaders(true); -$validator->validate($parser); +$validator->validate($parser->parseFile(__DIR__.'/tests/fixtures/example.csv')); if ($validator->isValid() === false) { foreach ($validator->getErrors() as $error) { @@ -80,6 +80,39 @@ EOF; } ``` +Run `example.php` and see results: + +``` +
    +
  • Line: 1
    • +
  • Column:
    • +
  • +

    Invalid legend.

    +
    • +
+
    +
  • Line: 4
    • +
  • Column:
    • +
  • +

    The line must contain 3 columns

    +
    • +
+
    +
  • Line: 2
    • +
  • Column: 1
    • +
  • +

    This value is not a valid email address.

    +
    • +
+
    +
  • Line: 3
    • +
  • Column: 2
    • +
  • +

    This value is not a valid date.

    +
    • +
+``` + Contributors ------------ diff --git a/composer.json b/composer.json index c9aa77f..4e8a836 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,6 @@ "require": { "php": ">=5.6.0", "symfony/validator": "2.*", - "deblan/csv": "v1.1" + "deblan/csv": "v2.0.*" } } diff --git a/example.php b/example.php index 48250f6..595e5c5 100644 --- a/example.php +++ b/example.php @@ -20,7 +20,7 @@ $validator->addFieldConstraint(0, new Email()); $validator->addFieldConstraint(1, new Date()); // Validate the legend -$validator->setExpectedLegend(array('foo', 'bar', 'bim')); +$validator->setExpectedHeaders(['foo', 'bar', 'bim']); // An line must contain 3 columns $validator->addDataConstraint(new Callback(function($data, ExecutionContextInterface $context) { @@ -30,17 +30,17 @@ $validator->addDataConstraint(new Callback(function($data, ExecutionContextInter })); // Initialisation of the parser -$parser = new CsvParser(__DIR__.'/tests/fixtures/example.csv'); -$parser->setHasLegend(true); +$parser = new CsvParser(); +$parser->setHasHeaders(true); -$validator->validate($parser); +$validator->validate($parser->parseFile(__DIR__.'/tests/fixtures/example.csv')); if ($validator->isValid() === false) { foreach ($validator->getErrors() as $error) { - $line = $error->getLine(); + $line = $error->getLine(); $column = $error->getColumn(); $message = $error->getViolation()->getMessage(); - + echo <<
  • Line: $line
    • diff --git a/src/Deblan/CsvValidator/Validator.php b/src/Deblan/CsvValidator/Validator.php index ee22932..6374910 100644 --- a/src/Deblan/CsvValidator/Validator.php +++ b/src/Deblan/CsvValidator/Validator.php @@ -49,7 +49,7 @@ class Validator /** * @var array */ - protected $expectedLegend = []; + protected $expectedHeaders = []; /** * Constructor. @@ -105,9 +105,9 @@ class Validator * * @return Validator */ - public function setExpectedLegend(array $legend) + public function setExpectedHeaders(array $legend) { - $this->expectedLegend = $legend; + $this->expectedHeaders = $legend; return $this; } @@ -121,13 +121,12 @@ class Validator { if ($this->parser !== $parser) { $this->parser = $parser; - $this->parser->parse(); $this->errors = []; } elseif ($this->hasValidate) { return; } - $this->validateLegend(); + $this->validateHeaders(); $this->validateDatas(); $this->validateFields(); @@ -137,17 +136,17 @@ class Validator /** * Validates the legend. */ - protected function validateLegend() + protected function validateHeaders() { - if (!$this->parser->getHasLegend()) { + if (!$this->parser->getHasHeaders()) { return; } - if (empty($this->expectedLegend)) { + if (empty($this->expectedHeaders)) { return; } - if ($this->parser->getLegend() !== $this->expectedLegend) { + if ($this->parser->getHeaders() !== $this->expectedHeaders) { $this->mergeErrorMessage('Invalid legend.', 1); } } @@ -294,7 +293,7 @@ class Validator */ protected function getTrueLine($line) { - if ($this->parser->getHasLegend()) { + if ($this->parser->getHasHeaders()) { ++$line; } diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php new file mode 100644 index 0000000..4d0705f --- /dev/null +++ b/tests/ExampleTest.php @@ -0,0 +1,44 @@ + + */ +class ExampleTest extends \PHPUnit_Framework_TestCase +{ + public function testExemple() + { + $content = shell_exec('php -f '.__DIR__.'/../example.php'); + + $this->assertEquals('
      +
    • Line: 1
      • +
    • Column:
      • +
    • +

      Invalid legend.

      +
      • +
    +
      +
    • Line: 4
      • +
    • Column:
      • +
    • +

      The line must contain 3 columns

      +
      • +
    +
      +
    • Line: 2
      • +
    • Column: 1
      • +
    • +

      This value is not a valid email address.

      +
      • +
    +
      +
    • Line: 3
      • +
    • Column: 2
      • +
    • +

      This value is not a valid date.

      +
      • +
    +', $content); + } +} diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php index 4c8c617..f3d75ac 100644 --- a/tests/ValidatorTest.php +++ b/tests/ValidatorTest.php @@ -16,20 +16,20 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase $validator->isValid(); } - public function testExpectedLegend() + public function testExpectedHeaders() { $parser = $this->generateParser('example.csv'); - $parser->setHasLegend(true); + $parser->setHasHeaders(true); $validator = $this->generateValidator(); - $validator->setExpectedLegend(['foo', 'bar', 'boo']); - $validator->validate($parser); + $validator->setExpectedHeaders(['foo', 'bar', 'boo']); + $validator->validate($parser->parseFile(__DIR__.'/fixtures/example.csv')); $this->assertEquals(true, $validator->isValid()); $this->assertEquals(0, count($validator->getErrors())); $validator = $this->generateValidator(); - $validator->setExpectedLegend(['bad', 'legend']); - $validator->validate($parser); + $validator->setExpectedHeaders(['bad', 'legend']); + $validator->validate($parser->parseFile(__DIR__.'/fixtures/example.csv')); $this->assertEquals(false, $validator->isValid()); $this->assertEquals(1, count($validator->getErrors())); } @@ -38,7 +38,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase { $parser = $this->generateParser('example.csv'); $validator = $this->generateValidator(); - $validator->validate($parser); + $validator->validate($parser->parseFile(__DIR__.'/fixtures/example.csv')); $this->assertEquals(true, $validator->isValid()); } @@ -47,14 +47,14 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase $parser = $this->generateParser('example.csv'); $validator = $this->generateValidator(); $validator->addFieldConstraint(0, new NotBlank()); - $validator->validate($parser); + $validator->validate($parser->parseFile(__DIR__.'/fixtures/example.csv')); $this->assertEquals(true, $validator->isValid()); $this->assertEquals(0, count($validator->getErrors())); $parser = $this->generateParser('example.csv'); $validator = $this->generateValidator(); $validator->addFieldConstraint(1, new NotBlank()); - $validator->validate($parser); + $validator->validate($parser->parseFile(__DIR__.'/fixtures/example.csv')); $this->assertEquals(true, $validator->isValid()); $this->assertEquals(0, count($validator->getErrors())); @@ -62,24 +62,24 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase $validator = $this->generateValidator(); $validator->addFieldConstraint(0, new NotBlank()); $validator->addFieldConstraint(1, new NotBlank()); - $validator->validate($parser); + $validator->validate($parser->parseFile(__DIR__.'/fixtures/example.csv')); $this->assertEquals(true, $validator->isValid()); $this->assertEquals(0, count($validator->getErrors())); } public function testFieldContraintsKo() { - $parser = $this->generateParser('example.csv'); + $parser = $this->generateParser(); $validator = $this->generateValidator(); $validator->addFieldConstraint(0, new Email()); - $validator->validate($parser); + $validator->validate($parser->parseFile(__DIR__.'/fixtures/example.csv')); $this->assertEquals(false, $validator->isValid()); $this->assertEquals(2, count($validator->getErrors())); - $parser = $this->generateParser('example.csv'); + $parser = $this->generateParser(); $validator = $this->generateValidator(); $validator->addFieldConstraint(1, new Email()); - $validator->validate($parser); + $validator->validate($parser->parseFile(__DIR__.'/fixtures/example.csv')); $this->assertEquals(false, $validator->isValid()); $this->assertEquals(5, count($validator->getErrors())); @@ -87,14 +87,14 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase $validator = $this->generateValidator(); $validator->addFieldConstraint(0, new Email()); $validator->addFieldConstraint(1, new Email()); - $validator->validate($parser); + $validator->validate($parser->parseFile(__DIR__.'/fixtures/example.csv')); $this->assertEquals(false, $validator->isValid()); $this->assertEquals(7, count($validator->getErrors())); } - protected function generateParser($file) + protected function generateParser() { - return new CsvParser(__DIR__.'/fixtures/'.$file); + return new CsvParser(); } protected function generateValidator() From 1e6ed3d204fc6fdc38891a75c3008ea09123980f Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 13 Mar 2017 15:53:14 +0100 Subject: [PATCH 5/9] Insight analyse fixes --- .gitignore | 2 -- LICENSE | 3 ++- example.php | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3e52175..22d0d82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -*.swp -tags vendor diff --git a/LICENSE b/LICENSE index b57a6c2..80445fb 100644 --- a/LICENSE +++ b/LICENSE @@ -20,4 +20,5 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/example.php b/example.php index 595e5c5..e764726 100644 --- a/example.php +++ b/example.php @@ -2,7 +2,6 @@ use Deblan\Csv\CsvParser; use Deblan\CsvValidator\Validator; -use Symfony\Component\Validator\Validation; use Symfony\Component\Validator\Constraints\Email; use Symfony\Component\Validator\Constraints\Date; use Symfony\Component\Validator\Constraints\Callback; @@ -23,7 +22,7 @@ $validator->addFieldConstraint(1, new Date()); $validator->setExpectedHeaders(['foo', 'bar', 'bim']); // An line must contain 3 columns -$validator->addDataConstraint(new Callback(function($data, ExecutionContextInterface $context) { +$validator->addDataConstraint(new Callback(function ($data, ExecutionContextInterface $context) { if (count($data) !== 6) { // 6 because of the legend (3 fields * 2) $context->addViolation('The line must contain 3 columns'); } From 8ee01fc2098a8b704c840245304eb76a74587a33 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 15 Mar 2017 00:39:46 +0100 Subject: [PATCH 6/9] CI --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b2a3d3..683aa00 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ csv-validator ============= -![](https://phpci.gitnet.fr//build-status/image/1) +[![](https://phpci.gitnet.fr/build-status/image/2)](https://phpci.gitnet.fr/build-status/view/2) CSV validator library From 78610d50ea3f35de57d7f4d72acf88c2e1b0ebea Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 15 Mar 2017 00:42:28 +0100 Subject: [PATCH 7/9] CI --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 683aa00..a83c640 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ csv-validator ============= -[![](https://phpci.gitnet.fr/build-status/image/2)](https://phpci.gitnet.fr/build-status/view/2) +[![](https://phpci.gitnet.fr/build-status/image/2?branch=master&label=PHPCensor&style=flat-square)](https://phpci.gitnet.fr/build-status/view/2) CSV validator library From 3276b3fb1eb327e465051f4a2ad27448406e2050 Mon Sep 17 00:00:00 2001 From: kalpaitch Date: Wed, 7 Mar 2018 13:42:54 +0100 Subject: [PATCH 8/9] Update 'composer.json' --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 4e8a836..13cfab6 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "deblan/csv-validator", + "name": "kalpaitch/csv-validator", "description": "CSV validator library", "license": "BSD-2-Clause", "authors": [ @@ -16,7 +16,7 @@ "minimum-stability": "dev", "require": { "php": ">=5.6.0", - "symfony/validator": "2.*", + "symfony/validator": "3.*", "deblan/csv": "v2.0.*" } } From f9553115ee03606efee4000434fe0988fe0d18e1 Mon Sep 17 00:00:00 2001 From: kalpaitch Date: Wed, 7 Mar 2018 13:43:19 +0100 Subject: [PATCH 9/9] Update 'composer.json' --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 13cfab6..4e561ff 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "kalpaitch/csv-validator", + "name": "deblan/csv-validator", "description": "CSV validator library", "license": "BSD-2-Clause", "authors": [