aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-13 22:30:48 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-13 22:30:48 +0200
commit99c3ca18be101ee414125335dee34dbf952fd05d (patch)
treeaf9ae81c28086065c8100570920a324b63aa881c
parenta262bfc78f9b36fd1268288ea2867bd98ef1087c (diff)
parentf2e57d339e7f05a201f7b50461b9d93b0dc7e480 (diff)
downloadforums-99c3ca18be101ee414125335dee34dbf952fd05d.tar
forums-99c3ca18be101ee414125335dee34dbf952fd05d.tar.gz
forums-99c3ca18be101ee414125335dee34dbf952fd05d.tar.bz2
forums-99c3ca18be101ee414125335dee34dbf952fd05d.tar.xz
forums-99c3ca18be101ee414125335dee34dbf952fd05d.zip
Merge pull request #2582 from bantu/ticket/12682
[ticket/12682] Make Code Sniffer run properly on Travis CI again. * bantu/ticket/12682: [ticket/12682] Make Code Sniffer run properly on Travis CI again.
-rw-r--r--build/build.xml20
1 files changed, 10 insertions, 10 deletions
diff --git a/build/build.xml b/build/build.xml
index ec94cf3ea6..510e7d0955 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -78,22 +78,22 @@
-s
--extensions=php
--standard=build/code_sniffer/ruleset-php-strict.xml
- --ignore=phpBB/phpbb/db/migration/data/v30x/*
+ --ignore=${project.basedir}/phpBB/phpbb/db/migration/data/v30x/*
phpBB/phpbb"
dir="." returnProperty="retval-php-strict" passthru="true" />
<exec command="phpBB/vendor/bin/phpcs
-s
--extensions=php
--standard=build/code_sniffer/ruleset-php-legacy.xml
- --ignore=phpBB/cache/*
- --ignore=phpBB/develop/*
- --ignore=phpBB/includes/diff/*.php
- --ignore=phpBB/includes/sphinxapi.php
- --ignore=phpBB/includes/utf/data/*
- --ignore=phpBB/install/data/*
- --ignore=phpBB/install/database_update.php
- --ignore=phpBB/phpbb/*
- --ignore=phpBB/vendor/*
+ --ignore=${project.basedir}/phpBB/cache/*
+ --ignore=${project.basedir}/phpBB/develop/*
+ --ignore=${project.basedir}/phpBB/includes/diff/*.php
+ --ignore=${project.basedir}/phpBB/includes/sphinxapi.php
+ --ignore=${project.basedir}/phpBB/includes/utf/data/*
+ --ignore=${project.basedir}/phpBB/install/data/*
+ --ignore=${project.basedir}/phpBB/install/database_update.php
+ --ignore=${project.basedir}/phpBB/phpbb/*
+ --ignore=${project.basedir}/phpBB/vendor/*
phpBB"
dir="." returnProperty="retval-php-legacy" passthru="true" />
<if>