Merge pull request #19 from HMAZonderland/patch-1

[plcapi.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 7fb78ce..a40322b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.2
   - 5.3
   - 5.4
   - 5.5
@@ -9,22 +8,17 @@ php:
   - hhvm
 
 install:
-  composer install
+  - composer self-update && composer install
 
 before_script:
-  # before php 5.4, we can not use the built-in webserver. So we rely on apache
-  - sudo apt-get install apache2
-  - sudo a2enmod actions
-  - sudo a2enmod rewrite
-  - echo "export PATH=/home/vagrant/.phpenv/bin:$PATH" | sudo tee -a /etc/apache2/envvars > /dev/null
-  - echo "$(curl -fsSL https://gist.github.com/roderik/16d751c979fdeb5a14e3/raw/gistfile1.txt)" | sudo tee /etc/apache2/conf.d/phpconfig > /dev/null
-  - echo "$(curl -fsSL https://gist.github.com/roderik/2eb301570ed4a1f4c33d/raw/gistfile1.txt)" | sed -e "s,PATH,`pwd`/web,g" | sudo tee /etc/apache2/sites-available/default > /dev/null
-  - sudo service apache2 restart
+  # Disable xdebug. NB: this should NOT be done for hhvm...
+  - if [ $TRAVIS_PHP_VERSION != "hhvm" ]; then phpenv config-rm xdebug.ini; fi
 
-script:
   # TODO: we should set up an Apache instance inside the Travis VM and test it.
   # But it looks a bit complex, esp. as it seems that php has to be set up differently (cgi vs fpm) depending on version
   # So for now we just take an easy way out using a known remote server.
   # See: https://gist.github.com/roderik/3123962
   # See: http://docs.travis-ci.com/user/languages/php/#Apache-%2B-PHP
-  php -d "include_path=.;./lib;./test" test/testsuite.php LOCALSERVER=gggeek.altervista.org URI=/sw/xmlrpc/demo/server/server.php HTTPSSERVER=gggeek.ssl.altervista.org HTTPSURI=/sw/xmlrpc/demo/server/server.php
+
+script:
+  php -d "include_path=.:./lib:./test" test/testsuite.php LOCALSERVER=gggeek.altervista.org URI=/sw/xmlrpc/demo/server/server.php HTTPSSERVER=gggeek.ssl.altervista.org HTTPSURI=/sw/xmlrpc/demo/server/server.php NOPROXY=1