X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/443bfec0350085788ddcc6b5ca5a541e2321ec64..2c6b17f772fec2db0a8a8bac7462efecef92337e:/CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 04ed748b..d23b3392 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,7 +18,7 @@ are in process of consolodating the style. The following rules apply: * Python code uses the official Python style * indention * SQL use 2 spaces - * all other use files TABs + * all other file types use 4 spaces * [BSD style](https://en.wikipedia.org/wiki/Indent_style#Allman_style) for braces * spaces * spaces before and after equal signs and operators @@ -27,10 +27,11 @@ are in process of consolodating the style. The following rules apply: * leave out space between a function name and bracket but add one between control statement(if, while, etc.) and bracket +The coding style is enforced with PHPCS and can be tested with: -This coding style must be applied to any new or changed code. You are also -welcome to fix the coding style of existing code but please submit separate -PRs for this. +``` + phpcs --report-width=120 --colors */**.php +``` ## Testing @@ -38,7 +39,7 @@ Before submitting a pull request make sure that the following tests pass: ``` cd tests - NOMINATIM_DIR= lettuce -t -Fail features/db features/osm2pgsql + NOMINATIM_DIR= lettuce -t -Fail -t -Tiger features/db features/osm2pgsql ``` ```