diff options
| author |   Andreas Fischer <bantu@phpbb.com> | 2014-06-13 13:32:19 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-13 13:32:19 +0200 |
| commit | f2e57d339e7f05a201f7b50461b9d93b0dc7e480 (patch) | |
| tree | fd9cd982909997fd8e269004e65feb9c581dc391 /build | |
| parent | Merge pull request #2580 from VSEphpbb/ticket/12697 (diff) | |
| download | phpbb-f2e57d339e7f05a201f7b50461b9d93b0dc7e480.tar.gz phpbb-f2e57d339e7f05a201f7b50461b9d93b0dc7e480.tar.bz2 phpbb-f2e57d339e7f05a201f7b50461b9d93b0dc7e480.zip | |
[ticket/12682] Make Code Sniffer run properly on Travis CI again.
The --ignore parameter takes a case-insensitive pattern and as such
'phpBB/phpbb/*' matches any '/home/travis/build/phpbb/phpbb/...' file name.
This results in nothing being checked against ruleset-php-legacy.xml.
Using absolute paths in the --ignore pattern fixes this issues.
PHPBB3-12682
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 20 |
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> |