Merge remote-tracking branch 'upstream/master'

fix branch sync issue
2016-08-30 14:48:03 +02:00 · 2016-08-30 14:48:03 +02:00 · 2967b7763b
parent 18b1fe5c2c 6fad572eb7
commit 2967b7763b
1 changed files with 2 additions and 1 deletions
--- a/tests/bin/travis.sh
+++ b/tests/bin/travis.sh
@ -22,6 +22,7 @@ elif [ $1 == 'after' ]; then

 	# get scrutinizer ocular and run it
 	wget https://scrutinizer-ci.com/ocular.phar
-	ocular.phar code-coverage:upload --format=php-clover ./tmp/clover.xml
+	chmod +x ocular.phar
+	php ocular.phar code-coverage:upload --format=php-clover ./tmp/clover.xml

 fi