From 4cb3ef5125599c2ffdb3745e973e713cc0d6b5dd Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 20 Mar 2016 21:10:17 +0100 Subject: [PATCH] Put more validations on travis Run php-cs-fixer to avoid CS on commits Add a check on translation message using the built-in yaml validator. It'll avoid typo in translation yaml files. --- .travis.yml | 6 ++++++ bin/php-cs-fixer | 1 + composer.json | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 120000 bin/php-cs-fixer diff --git a/.travis.yml b/.travis.yml index 5741b533..e2bf90ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ addons: # cache vendor dirs cache: + apt: true directories: - vendor - $HOME/.composer/cache @@ -28,6 +29,9 @@ env: matrix: fast_finish: true + include: + - php: 7.0 + env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite exclude: - php: hhvm env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency @@ -53,3 +57,5 @@ script: - travis_wait composer install --no-interaction --no-progress --prefer-dist -o - ant prepare-$DB - bin/phpunit -v + - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; + - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations ; fi; diff --git a/bin/php-cs-fixer b/bin/php-cs-fixer new file mode 120000 index 00000000..902e8f5f --- /dev/null +++ b/bin/php-cs-fixer @@ -0,0 +1 @@ +../vendor/fabpot/php-cs-fixer/php-cs-fixer \ No newline at end of file diff --git a/composer.json b/composer.json index a1a7ebb4..1abf6f20 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,8 @@ "doctrine/doctrine-fixtures-bundle": "~2.2", "sensio/generator-bundle": "^3.0", "phpunit/phpunit": "~4.4", - "symfony/phpunit-bridge": "^2.7" + "symfony/phpunit-bridge": "^2.7", + "fabpot/php-cs-fixer": "~1.9" }, "scripts": { "build-parameters": [ -- 2.41.0