Commit d1c4ed2d authored by Bas de Nooijer's avatar Bas de Nooijer

Merge branch 'develop' of github.com:basdenooijer/solarium into develop

parents 682b4d00 d4250540
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
you could also write the switches here) you could also write the switches here)
--> -->
<target name="phpunit"> <target name="phpunit">
<exec executable="phpunit" /> <exec executable="${basedir}/vendor/bin/phpunit" />
</target> </target>
<!-- Run pdepend, phpmd, phpcpd, and phpcs in parallel --> <!-- Run pdepend, phpmd, phpcpd, and phpcs in parallel -->
...@@ -56,8 +56,12 @@ you could also write the switches here) ...@@ -56,8 +56,12 @@ you could also write the switches here)
<!-- Generate checkstyle.xml --> <!-- Generate checkstyle.xml -->
<target name="phpcs"> <target name="phpcs">
<exec executable="phpcs" output="/dev/null"> <exec executable="${basedir}/vendor/bin/phpcs">
<arg line="--report=checkstyle --report-file=${basedir}/build/logs/checkstyle.xml --standard=Symfony2 library" /> <arg value="--report=checkstyle" />
<arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
<arg value="--standard=PSR2" />
<arg value="--extensions=php" />
<arg path="library" />
</exec> </exec>
</target> </target>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment