Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.xml6
-rw-r--r--composer.json2
2 files changed, 4 insertions, 4 deletions
diff --git a/build.xml b/build.xml
index c0e5575768..88b4d260d2 100644
--- a/build.xml
+++ b/build.xml
@@ -24,19 +24,19 @@
</target>
<target name="phpunit" description="Run unit tests using PHPUnit and generates junit.xml and clover.xml">
- <exec executable="phpunit" failonerror="true">
+ <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
<arg line="--configuration ${env.PHPUNIT_XML} ${env.PHPUNIT_ARGS}"/>
</exec>
</target>
<target name="phpunit-nocoverage" description="Run unit tests using PHPUnit and generates junit.xml">
- <exec executable="phpunit" failonerror="true">
+ <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
<arg line="--configuration ${env.PHPUNIT_XML_NOCOVERAGE} ${env.PHPUNIT_ARGS}"/>
</exec>
</target>
<target name="phpunit-hhvm" description="Run unit tests using PHPUnit with HHVM specific config">
- <exec executable="phpunit" failonerror="true">
+ <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
<arg line="--configuration ${env.PHPUNIT_XML_HHVM} ${env.PHPUNIT_ARGS}"/>
</exec>
</target>
diff --git a/composer.json b/composer.json
index e5c79ed78c..117a2c855c 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
},
"require-dev": {
"satooshi/php-coveralls": ">=0.6",
- "phpunit/phpunit": ">=3.7",
+ "phpunit/phpunit": "<4.2",
"phpunit/phpunit-selenium": ">=1.2"
}
}