Use phpunit from composer if available

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

.drone.yml

@@ -1846,7 +1846,7 @@ steps:
       XDEBUG_MODE: coverage
   commands:
     - phpenmod xdebug
-    - PHPUNIT_EXE=build/integration/vendor/bin/phpunit TEST_SELECTION=NODB ./autotest.sh sqlite
+    - TEST_SELECTION=NODB ./autotest.sh sqlite
     - wget https://codecov.io/bash -O codecov.sh
     - bash codecov.sh -Z -C $DRONE_COMMIT -f tests/autotest-clover-sqlite.xml
 
@@ -1878,7 +1878,7 @@ steps:
       XDEBUG_MODE: coverage
   commands:
     - phpenmod xdebug
-    - PHPUNIT_EXE=build/integration/vendor/bin/phpunit TEST_SELECTION=QUICKDB ./autotest.sh sqlite
+    - TEST_SELECTION=QUICKDB ./autotest.sh sqlite
     - wget https://codecov.io/bash -O codecov.sh
     - bash codecov.sh -Z -C $DRONE_COMMIT -f tests/autotest-clover-sqlite.xml
 
@@ -1920,7 +1920,7 @@ steps:
   commands:
     - phpenmod xdebug
     - ./tests/drone-wait-objectstore.sh
-    - PHPUNIT_EXE=build/integration/vendor/bin/phpunit TEST_SELECTION=PRIMARY-s3 ./autotest.sh sqlite
+    - TEST_SELECTION=PRIMARY-s3 ./autotest.sh sqlite
     - wget https://codecov.io/bash -O codecov.sh
     - bash codecov.sh -C $DRONE_COMMIT -f tests/autotest-clover-sqlite.xml
 
@@ -1950,7 +1950,7 @@ steps:
   commands:
     - phpenmod xdebug
     - ./tests/drone-wait-objectstore.sh
-    - PHPUNIT_EXE=build/integration/vendor/bin/phpunit TEST_SELECTION=PRIMARY-azure ./autotest.sh sqlite
+    - TEST_SELECTION=PRIMARY-azure ./autotest.sh sqlite
     - wget https://codecov.io/bash -O codecov.sh
     - bash codecov.sh -C $DRONE_COMMIT -f tests/autotest-clover-sqlite.xml
 
@@ -1982,7 +1982,7 @@ steps:
   commands:
     - phpenmod xdebug
     - service memcached restart
-    - PHPUNIT_EXE=build/integration/vendor/bin/phpunit ./autotest.sh sqlite tests/lib/Memcache/MemcachedTest.php
+    - ./autotest.sh sqlite tests/lib/Memcache/MemcachedTest.php
     - wget https://codecov.io/bash -O codecov.sh
     - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
     - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"

autotest.sh

@@ -32,7 +32,12 @@ PHP=$(which "$PHP_EXE")
 if [ -z "$PHPUNIT_EXE" ]; then
     PHPUNIT_EXE=phpunit
 fi
-PHPUNIT=$(which "$PHPUNIT_EXE")
+
+if [ -f "./build/integration/vendor/bin/phpunit" ]; then
+    PHPUNIT=$(which "./build/integration/vendor/bin/phpunit")
+else
+    PHPUNIT=$(which "$PHPUNIT_EXE")
+fi
 
 set -e