From 88c48d72f569b0f1e54584bd538d4e4f22447014 Mon Sep 17 00:00:00 2001 From: John Saigle <4022790+johnsaigle@users.noreply.github.com> Date: Tue, 17 Dec 2019 14:57:33 -0500 Subject: [PATCH] Move config files for static analysis tools to test/ directory (#5871) Moves the config files for PHPCS and PHPMD to the test/ folder instead of the docs/ folder. These files aren't documents so they shouldn't be in this folder. --- {docs => test}/LorisCS.xml | 0 {docs => test}/LorisPHPMD.xml | 0 {docs => test}/SrcCS.xml | 0 test/run-php-linter.sh | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename {docs => test}/LorisCS.xml (100%) rename {docs => test}/LorisPHPMD.xml (100%) rename {docs => test}/SrcCS.xml (100%) diff --git a/docs/LorisCS.xml b/test/LorisCS.xml similarity index 100% rename from docs/LorisCS.xml rename to test/LorisCS.xml diff --git a/docs/LorisPHPMD.xml b/test/LorisPHPMD.xml similarity index 100% rename from docs/LorisPHPMD.xml rename to test/LorisPHPMD.xml diff --git a/docs/SrcCS.xml b/test/SrcCS.xml similarity index 100% rename from docs/SrcCS.xml rename to test/SrcCS.xml diff --git a/test/run-php-linter.sh b/test/run-php-linter.sh index e98d5692615..cf479c90ccc 100755 --- a/test/run-php-linter.sh +++ b/test/run-php-linter.sh @@ -9,12 +9,12 @@ find docs modules htdocs php src -name '*.class.inc' -print0 -o -name '*.php' -p # php/ # htdocs/ # modules/ -vendor/bin/phpcs --standard=docs/LorisCS.xml --extensions=php,inc php/ htdocs/ modules/ || exit $?; +vendor/bin/phpcs --standard=test/LorisCS.xml --extensions=php,inc php/ htdocs/ modules/ || exit $?; # Run PHPCS on some scripts -- fixing the files format later # vendor/bin/phpcs --standard=docs/LorisCS.xml tools/CouchDB_Confirm_Integrity.php # Run PHPCS on src/ directory using a different ruleset conforming to PSR2. -vendor/bin/phpcs --standard=docs/SrcCS.xml --extensions=php/php src/ || exit $?; +vendor/bin/phpcs --standard=test/SrcCS.xml --extensions=php/php src/ || exit $?; -vendor/bin/phpmd php/libraries text docs/LorisPHPMD.xml || exit $?; +vendor/bin/phpmd php/libraries text 'test/LorisPHPMD.xml' || exit $?;