Merge branch 'MAINT_4_2_13' into QA_4_2

.travis.yml

@@ -9,6 +9,9 @@ php:
   - "5.4"
   - "5.3"
   - hhvm
+
+sudo: false
+
 env:
   matrix:
     - PHPUNIT_ARGS="--exclude-group selenium"
@@ -20,8 +23,12 @@ env:
     - TESTSUITE_PASSWORD=root
     - TESTSUITE_SELENIUM_COVERAGE=http://127.0.0.1:8000/phpunit_coverage.php
 before_script:
+  - export PATH=~/.composer/vendor/bin/:$PATH
   - mysql -uroot -e "SET PASSWORD = PASSWORD('$TESTSUITE_PASSWORD')" ;
   - set -e ; if [[ -z "$LINT" ]] ; then
+
+    composer install --dev --no-interaction ;
+
     if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then
 
     git clone --depth=1 git://github.com/zenovich/runkit.git ;
@@ -34,10 +41,6 @@ before_script:
 
     phpenv config-add test/travis.php.ini ;
 
-    pear channel-discover pear.phpunit.de ;
-    pear install phpunit/PHPUnit_Selenium ;
-
-    composer install --dev --no-interaction ;
 
     fi ;
 

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>
@@ -55,7 +55,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
-              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib,recaptchalib.php,swekey.php
+              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib,recaptchalib.php,swekey.php,vendor
               --reportfile '${basedir}/build/logs/pmd.xml'" />
   </exec>
  </target>
@@ -66,6 +66,7 @@
               --exclude test
               --exclude PMAStandard
               --exclude build
+              --exclude vendor
               --exclude libraries/tcpdf
               --exclude libraries/php-gettext
               --exclude libraries/bfShapeFiles
@@ -82,6 +83,7 @@
               --exclude test
               --exclude PMAStandard
               --exclude build
+              --exclude vendor
               --exclude libraries/tcpdf
               --exclude libraries/php-gettext
               --exclude libraries/bfShapeFiles
@@ -95,7 +97,7 @@
  <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding third party libraries">
   <exec executable="phpcs">
    <arg line="
-              --ignore=*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*,*/phpseclib/*,*/recaptchalib.php,*/swekey.php
+              --ignore=*/php-gettext/*,*/vendor/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*,*/phpseclib/*,*/recaptchalib.php,*/swekey.php
               --report=checkstyle
               --extensions=php
               --report-file='${basedir}/build/logs/checkstyle.xml'

composer.json

@@ -22,6 +22,8 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "satooshi/php-coveralls": ">=0.6"
+        "satooshi/php-coveralls": ">=0.6",
+        "phpunit/phpunit": "<4.2",
+        "phpunit/phpunit-selenium": ">=1.2"
     }
 }