Merge pull request #225 from stof/update_travis

Update the Travis setup

Author: stof

.travis.yml

@@ -6,7 +6,7 @@ cache:
   directories:
     - $HOME/.composer/cache/files
 
-php: [5.3, 5.4, 5.5, 5.6, hhvm]
+php: [5.3, 5.4, 5.5, 5.6, 7, hhvm]
 
 env:
   - WEBDRIVER=selenium

bin/run-phantomjs.sh

@@ -3,8 +3,8 @@ set -e
 
 if [ "2" = "$PHANTOM_VERSION" ]; then
     mkdir travis-phantomjs
-    wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
-    tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
+    wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
+    tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
     export PATH=$PWD/travis-phantomjs:$PATH
 fi
 

bin/run-selenium.sh

@@ -7,6 +7,6 @@ export DISPLAY=:99.0
 sleep 4
 
 echo '    Downloading selenium'
-curl -L http://selenium-release.storage.googleapis.com/2.46/selenium-server-standalone-2.46.0.jar > selenium.jar
+curl -L http://selenium-release.storage.googleapis.com/2.49/selenium-server-standalone-2.49.1.jar > selenium.jar
 echo '    Running selenium'
-java -jar selenium.jar > /dev/null 2>&1 &
+java -jar selenium.jar -log /tmp/webdriver.log > /tmp/webdriver_output.txt 2>&1 &