diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-29 23:53:07 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-29 23:53:07 +0100 |
| commit | 387ed37b318bc47f35eaaec732644f5dac710032 (patch) | |
| tree | 6befe24d2b3b24eae9059c359603ee548e2667ea /build | |
| parent | 02e9f6e2840d7227f158b4baf96fd9c0f6207531 (diff) | |
| download | forums-387ed37b318bc47f35eaaec732644f5dac710032.tar forums-387ed37b318bc47f35eaaec732644f5dac710032.tar.gz forums-387ed37b318bc47f35eaaec732644f5dac710032.tar.bz2 forums-387ed37b318bc47f35eaaec732644f5dac710032.tar.xz forums-387ed37b318bc47f35eaaec732644f5dac710032.zip | |
[task/code-sniffer] Do not abort immediately on PHP Code Sniffer failure.
PHPBB3-11980
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index c033b1fefd..39a6333b5e 100644 --- a/build/build.xml +++ b/build/build.xml @@ -81,7 +81,7 @@ --standard=build/code_sniffer/ruleset-php-strict.xml --ignore=phpBB/phpbb/db/migration/data/v30x/* phpBB/phpbb" - dir="." checkreturn="true" passthru="true" /> + dir="." returnProperty="retval-php-strict" passthru="true" /> <exec command="phpBB/vendor/bin/phpcs -s --extensions=php @@ -95,7 +95,16 @@ --ignore=phpBB/phpbb/* --ignore=phpBB/vendor/* phpBB" - dir="." checkreturn="true" passthru="true" /> + dir="." returnProperty="retval-php-legacy" passthru="true" /> + <if> + <or> + <not><equals arg1="${retval-php-strict}" arg2="0" /></not> + <not><equals arg1="${retval-php-legacy}" arg2="0" /></not> + </or> + <then> + <fail message="PHP Code Sniffer failed." /> + </then> + </if> </target> <target name="docs"> |