From 6999f0f927e81fcc89420e4d9839c54905dbe717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kocsis=20M=C3=A1t=C3=A9?= Date: Sun, 15 Nov 2015 10:15:30 +0100 Subject: [PATCH] Updated gitattributes and PHP CS config --- .gitattributes | 3 +++ .travis.yml | 2 +- phpcs.xml | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 8960baac..277e04ae 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,8 +3,11 @@ /examples export-ignore /tests export-ignore /vendor export-ignore +.coveralls.yml export-ignore +.editorconfig export-ignore .gitattributes export-ignore .gitignore export-ignore .scrutinizer.yml export-ignore .travis.yml export-ignore +phpcs.xml export-ignore phpunit.xml.dist export-ignore diff --git a/.travis.yml b/.travis.yml index 99e0be74..c8c84496 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ install: script: - if [[ $EXECUTE_COVERAGE == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover coverage.clover ; fi - if [[ $EXECUTE_COVERAGE != 'true' ]]; then ./vendor/bin/phpunit ; fi - - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs; fi + - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs ; fi after_script: - if [[ $EXECUTE_COVERAGE == 'true' ]]; then wget https://scrutinizer-ci.com/ocular.phar ; fi diff --git a/phpcs.xml b/phpcs.xml index e61212ab..8b587009 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -2,13 +2,15 @@ Woohoo Labs. Coding Standard + + - + src tests