phpcs instructions only searched one level deep

diff --git a/.travis.yml b/.travis.yml
index 5efc9f083171489a6d391896047c52afb322cdda..c67f155e4240a1b5e2a0e0e08d0b1937143f36c7 100644 (file)
--- 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 == "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
   - 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 a00d0ed354aa68ac5ffe4a00d107253f4c62874d..dc5be190ad7633ec325241f48fd977b65f786f75 100644 (file)
--- 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:
 
 ```
 The coding style is enforced with PHPCS and can be tested with:
 
 ```

-  phpcs --report-width=120 --colors */**.php
+  phpcs --report-width=120 --colors .

 ```
 
 ## Testing
 ```
 
 ## Testing

diff --git a/phpcs.xml b/phpcs.xml
index 8f92f7c99078b87ca7f0bfd213fe93bfe5c44315..dd71c5b8cbcfdff2471f675a886b264cebcbc098 100644 (file)
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,6 +8,12 @@
   <!-- https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/PSR2/ruleset.xml -->
   <rule ref="PSR2"/>
 
   <!-- https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/PSR2/ruleset.xml -->
   <rule ref="PSR2"/>
 

+  <exclude-pattern>./lib/template/*html*</exclude-pattern>
+  <exclude-pattern>./lib/template/includes/</exclude-pattern>
+  <exclude-pattern>./module/</exclude-pattern>
+  <exclude-pattern>./website/css</exclude-pattern>
+  <exclude-pattern>./website/js</exclude-pattern>
+

   <rule ref="Generic.Files.LineLength">
     <properties>
      <property name="lineLimit" value="194"/>
   <rule ref="Generic.Files.LineLength">
     <properties>
      <property name="lineLimit" value="194"/>