diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 6e0cddf..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,25 +0,0 @@ -pipeline { - agent any - - stages { - stage('PHP 7.1') { - steps { - sh '/usr/local/bin/composer-php7.1 install' - sh 'php7.1 /usr/local/bin/phpunit-7' - } - } - stage('PHP 7.3') { - steps { - sh '/usr/local/bin/composer-php7.3 update' - sh 'php7.3 /usr/local/bin/phpunit-9' - } - } - stage('PHP 7.4') { - steps { - sh '/usr/local/bin/composer-php7.4 update' - sh 'php7.4 /usr/local/bin/phpunit-9' - } - } - } -} - diff --git a/Makefile b/Makefile deleted file mode 100644 index 990a451..0000000 --- a/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -.PHONY: tests - -tests: - phpunit diff --git a/README.md b/README.md index 48d866e..a83c640 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ csv-validator ============= -[![Build Status](https://ci.gitnet.fr/buildStatus/icon?job=Gitnet%2Fcsv-validator%2F3)](https://ci.gitnet.fr/job/Gitnet/job/csv-validator/job/3/) +[![](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 diff --git a/composer.json b/composer.json index dd0a7c3..4e561ff 100644 --- a/composer.json +++ b/composer.json @@ -15,8 +15,8 @@ }, "minimum-stability": "dev", "require": { - "php": "^7.1.3", - "symfony/validator": "^4", - "deblan/csv": "v2.0.*|v3.*" + "php": ">=5.6.0", + "symfony/validator": "3.*", + "deblan/csv": "v2.0.*" } } diff --git a/.php-censor.yml b/phpci.yml similarity index 100% rename from .php-censor.yml rename to phpci.yml diff --git a/phpunit.xml b/phpunit.xml index eb8c372..eabb967 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,6 +7,7 @@ convertWarningsToExceptions = "true" processIsolation = "false" stopOnFailure = "false" + syntaxCheck = "false" bootstrap = "vendor/autoload.php" > diff --git a/src/Deblan/CsvValidator/Validator.php b/src/Deblan/CsvValidator/Validator.php index b590c9f..6374910 100644 --- a/src/Deblan/CsvValidator/Validator.php +++ b/src/Deblan/CsvValidator/Validator.php @@ -122,7 +122,6 @@ class Validator if ($this->parser !== $parser) { $this->parser = $parser; $this->errors = []; - $this->hasValidate = false; } elseif ($this->hasValidate) { return; } diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php index 0be5792..4d0705f 100644 --- a/tests/ExampleTest.php +++ b/tests/ExampleTest.php @@ -1,13 +1,11 @@ */ -class ExampleTest extends TestCase +class ExampleTest extends \PHPUnit_Framework_TestCase { public function testExemple() { diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php index 13d6462..f3d75ac 100644 --- a/tests/ValidatorTest.php +++ b/tests/ValidatorTest.php @@ -1,19 +1,18 @@ generateParser('example.csv'); $validator = $this->generateValidator($parser); - $this->expectException('\RuntimeException'); + $this->setExpectedException('\RuntimeException'); $validator->isValid(); } diff --git a/tests/ViolationTest.php b/tests/ViolationTest.php index c798ab4..1fd0484 100644 --- a/tests/ViolationTest.php +++ b/tests/ViolationTest.php @@ -1,10 +1,9 @@