Home
DevCentral
Search
Configure Global Search
Log In
Transactions
P148
Change Details
Change Details
Old
New
Diff
diff --git a/build.xml b/build.xml index 4716f9c..ae15ea1 100644 --- a/build.xml +++ b/build.xml @@ -9,15 +9,6 @@ <property name="phpmd" value="phpmd"/> <property name="phpunit" value="phpunit"/> - <!-- Use this when the tools are located as PHARs in ${basedir}/build/tools - <property name="pdepend" value="${basedir}/build/tools/pdepend.phar"/> - <property name="phpcpd" value="${basedir}/build/tools/phpcpd.phar"/> - <property name="phpcs" value="${basedir}/build/tools/phpcs.phar"/> - <property name="phpdox" value="${basedir}/build/tools/phpdox.phar"/> - <property name="phploc" value="${basedir}/build/tools/phploc.phar"/> - <property name="phpmd" value="${basedir}/build/tools/phpmd.phar"/> - <property name="phpunit" value="${basedir}/build/tools/phpunit.phar"/> --> - <!-- Use this when the tools are managed by Composer in ${basedir}/vendor/bin <property name="pdepend" value="${basedir}/vendor/bin/pdepend"/> <property name="phpcpd" value="${basedir}/vendor/bin/phpcpd"/> @@ -163,7 +154,7 @@ <exec executable="${phpmd}" taskname="phpmd"> <arg path="${basedir}/src" /> <arg value="xml" /> - <arg path="${basedir}/build/phpmd.xml" /> + <arg path="${basedir}/ruleset.xml" /> <arg value="--reportfile" /> <arg path="${basedir}/build/logs/pmd.xml" /> </exec> @@ -231,7 +222,7 @@ description="Run unit tests with PHPUnit"> <exec executable="${phpunit}" resultproperty="result.phpunit" taskname="phpunit"> <arg value="--configuration"/> - <arg path="${basedir}/build/phpunit.xml"/> + <arg path="${basedir}/phpunit.xml"/> </exec> <property name="phpunit.done" value="true"/> @@ -243,7 +234,7 @@ description="Run unit tests with PHPUnit (without generating code coverage reports)"> <exec executable="${phpunit}" failonerror="true" taskname="phpunit"> <arg value="--configuration"/> - <arg path="${basedir}/build/phpunit.xml"/> + <arg path="${basedir}/phpunit.xml"/> <arg value="--no-coverage"/> </exec>
diff --git a/build.xml b/build.xml index 4716f9c..ae15ea1 100644 --- a/build.xml +++ b/build.xml @@ -9,15 +9,6 @@ <property name="phpmd" value="phpmd"/> <property name="phpunit" value="phpunit"/> - <!-- Use this when the tools are located as PHARs in ${basedir}/build/tools - <property name="pdepend" value="${basedir}/build/tools/pdepend.phar"/> - <property name="phpcpd" value="${basedir}/build/tools/phpcpd.phar"/> - <property name="phpcs" value="${basedir}/build/tools/phpcs.phar"/> - <property name="phpdox" value="${basedir}/build/tools/phpdox.phar"/> - <property name="phploc" value="${basedir}/build/tools/phploc.phar"/> - <property name="phpmd" value="${basedir}/build/tools/phpmd.phar"/> - <property name="phpunit" value="${basedir}/build/tools/phpunit.phar"/> --> - <!-- Use this when the tools are managed by Composer in ${basedir}/vendor/bin <property name="pdepend" value="${basedir}/vendor/bin/pdepend"/> <property name="phpcpd" value="${basedir}/vendor/bin/phpcpd"/> @@ -163,7 +154,7 @@ <exec executable="${phpmd}" taskname="phpmd"> <arg path="${basedir}/src" /> <arg value="xml" /> - <arg path="${basedir}/build/phpmd.xml" /> + <arg path="${basedir}/ruleset.xml" /> <arg value="--reportfile" /> <arg path="${basedir}/build/logs/pmd.xml" /> </exec> @@ -231,7 +222,7 @@ description="Run unit tests with PHPUnit"> <exec executable="${phpunit}" resultproperty="result.phpunit" taskname="phpunit"> <arg value="--configuration"/> - <arg path="${basedir}/build/phpunit.xml"/> + <arg path="${basedir}/phpunit.xml"/> </exec> <property name="phpunit.done" value="true"/> @@ -243,7 +234,7 @@ description="Run unit tests with PHPUnit (without generating code coverage reports)"> <exec executable="${phpunit}" failonerror="true" taskname="phpunit"> <arg value="--configuration"/> - <arg path="${basedir}/build/phpunit.xml"/> + <arg path="${basedir}/phpunit.xml"/> <arg value="--no-coverage"/> </exec>
Continue