X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=81510da912014119b3a7416e2b67f955f4a11069;hb=e3bc20eb11b411ccb40cbb41bd0579eb045bd016;hp=a3641a4c107ef8d7a7847e355f1e5b06e531ff77;hpb=6be6c0c11d963a84b8180f0bba596c71470ecde9;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index a3641a4..81510da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,37 @@
 language: php
 
+# As of May 2019, Travis is deprecating VMs based on Precise, which means that we can only test on php >= 5.6 going forward
+# (nb: this is not necessarily true yet - and we can use a different base for each php version, but we'll have to
+# adapt the apache / env setup scripts to accommodate that...)
 dist: xenial
 
+
+global:
+    # temp workaround to xdebug 3.0.0 bug
+    - XDEBUG_MODE=coverage
+    - LOCALSERVER=localhost
+    - URI=/demo/server/server.php
+    - HTTPSSERVER=localhost
+    - HTTPSURI=/demo/server/server.php
+    - PROXY=localhost:8080
+    # Travis currently compiles PHP with an oldish cURL/GnuTLS combination;
+    # to make the tests pass when Apache has a bogus SSL cert whe need the full set of options below
+    - HTTPSVERIFYHOST=0
+    - HTTPSIGNOREPEER=1
+    - SSLVERSION=0
+    - DEBUG=0
+
 php:
-  - 5.3
-  - 5.4
-  - 5.5
+  #- 5.3
+  #- 5.4
+  #- 5.5
   - 5.6
   - 7.0
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
+  - 8.0
 
 before_install:
   # This is mandatory or the 'apt-get install' calls following will fail
@@ -19,46 +40,41 @@ before_install:
   - sudo apt-get install -y privoxy
 
   # Disable xdebug for speed (executing composer), but allow us to re-enable it later
-  # NB: 'php -i' does not work on hhvm
-  - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then export XDEBUG_INI=''; fi
-  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then export XDEBUG_INI=`php -i | grep xdebug.ini | grep home/travis | grep -v '=>' | head -1`; fi
+  - export XDEBUG_INI=`php -i | grep xdebug.ini | grep home/travis | grep -v '=>' | head -1`
   - export XDEBUG_INI=${XDEBUG_INI/,/}
   - if [ "$XDEBUG_INI" != "" ]; then mv "$XDEBUG_INI" "$XDEBUG_INI.bak"; fi
 
 install:
-  - composer self-update && composer install
+  - composer install
 
   # Re-enable xdebug for when we need to generate code coverage
   - export COVERAGE_OPTS=""
-  - if [ "$TRAVIS_PHP_VERSION" = "5.6" -a "$XDEBUG_INI" != "" ]; then mv "$XDEBUG_INI.bak" "$XDEBUG_INI" && export COVERAGE_OPTS="--coverage-clover=coverage.clover"; fi
+  - if [ "$TRAVIS_PHP_VERSION" = "7.3" -a "$XDEBUG_INI" != "" ]; then mv "$XDEBUG_INI.bak" "$XDEBUG_INI" && export COVERAGE_OPTS="--coverage-clover=coverage.clover"; fi
 
 before_script:
   # Set up Apache and Privoxy instances inside the Travis VM and use them for testing against
-  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./tests/ci/travis/setup_php_fpm.sh; ./tests/ci/travis/setup_apache.sh; fi
-  - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then ./tests/ci/travis/setup_hhvm.sh; ./tests/ci/travis/setup_apache_hhvm.sh; fi
+  - ./tests/ci/travis/setup_php_fpm.sh
+  - ./tests/ci/travis/setup_apache.sh
   - ./tests/ci/travis/setup_privoxy.sh
 
   # output what version of phpunit we got going
   - vendor/bin/phpunit --version
 
 script:
-  # Travis currently compiles PHP with an oldish cURL/GnuTLS combination;
-  # to make the tests pass when Apache has a bogus SSL cert whe need the full set of options below
-  vendor/bin/phpunit $COVERAGE_OPTS tests LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=localhost HTTPSURI=/demo/server/server.php PROXY=localhost:8080 HTTPSVERIFYHOST=0 HTTPSIGNOREPEER=1 SSLVERSION=3 DEBUG=1
+  vendor/bin/phpunit $COVERAGE_OPTS tests
 
 after_failure:
   # Save as much info as we can to help developers
   - cat apache_error.log
   - cat apache_access.log
-  #- if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then cat /var/log/hhvm/error.log; fi
 
 after_script:
   # Upload code-coverage to Scrutinizer
   - if [ -f coverage.clover ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
   - if [ -f coverage.clover ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
-  # Upload code-coverage CodeClimate
-  - if [ -f coverage.clover ]; then CODECLIMATE_REPO_TOKEN=7fa6ee01e345090e059e5e42f3bfbcc8692feb8340396382dd76390a3019ac13 ./vendor/bin/test-reporter --coverage-report=coverage.clover; fi
+  # Upload code-coverage CodeClimate - disabled as it does not support php 8 atm
+  #- if [ -f coverage.clover ]; then CODECLIMATE_REPO_TOKEN=7fa6ee01e345090e059e5e42f3bfbcc8692feb8340396382dd76390a3019ac13 ./vendor/bin/test-reporter --coverage-report=coverage.clover; fi
 
 # reduce depth (history) of git checkout
 git:
-    depth: 5
+    depth: 1