Merge pull request #72 from nextcloud/fix-travis

Use phpunit 5.7

.travis.yml

@@ -10,6 +10,12 @@ env:
         - CORE_BRANCH=stable11 DB=mysql 
 
 before_install:
+    - wget https://phar.phpunit.de/phpunit-5.7.phar
+    - chmod +x phpunit-5.7.phar
+    - mkdir bin
+    - sudo mv phpunit-5.7.phar bin/phpunit
+    - export PATH="$PWD/bin:$PATH"
+    - phpunit --version
     - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
     - bash ./before_install.sh deck $CORE_BRANCH $DB
     - cd ../server
@@ -18,7 +24,6 @@ before_install:
 
 before_script:
     - cd apps/deck
-    - make install-deps 
 
 script:
     - make test

Makefile

@@ -75,7 +75,7 @@ test:
 ifeq (, $(shell which phpunit 2> /dev/null))
 	@echo "No phpunit command available, downloading a copy from the web"
 	mkdir -p $(build_tools_directory)
-	curl -sSL https://phar.phpunit.de/phpunit.phar -o $(build_tools_directory)/phpunit.phar
+	curl -sSL https://phar.phpunit.de/phpunit-5.7.phar -o $(build_tools_directory)/phpunit.phar
 	php $(build_tools_directory)/phpunit.phar -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
 	php $(build_tools_directory)/phpunit.phar -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
 else