diff --git a/.travis.yml b/.travis.yml index 5efc9f08..c67f155e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ script: - if [[ $TEST_SUITE == "monaco" ]]; then ./utils/specialphrases.php --wiki-import | psql -d test_api_nominatim >/dev/null; fi - cd $TRAVIS_BUILD_DIR/test/php - if [[ $TEST_SUITE == "tests" ]]; then phpunit ./ ; fi - - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 */**.php ; fi + - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 . ; fi - cd $TRAVIS_BUILD_DIR/test/bdd - # behave --format=progress3 api - if [[ $TEST_SUITE == "tests" ]]; then behave --format=progress3 db ; fi diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a00d0ed3..dc5be190 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -82,7 +82,7 @@ are in process of consolodating the style. The following rules apply: The coding style is enforced with PHPCS and can be tested with: ``` - phpcs --report-width=120 --colors */**.php + phpcs --report-width=120 --colors . ``` ## Testing diff --git a/phpcs.xml b/phpcs.xml index 8f92f7c9..dd71c5b8 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -8,6 +8,12 @@ + ./lib/template/*html* + ./lib/template/includes/ + ./module/ + ./website/css + ./website/js +