fixes for php 8

[plcapi.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 673d0ba..c270357 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,24 @@
 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 - there are projects that seem to use a different base dist depending on php version...)
+# (nb: this is not necessarily true yet - and we can use a different base for each php version, but we'll have to
+# adapt composer.json plus the apache / env setup scripts to accommodate that...)
 dist: xenial
 
+env:
+    global:
+        - LOCALSERVER=localhost
+        - URI=/demo/server/server.php
+        - HTTPSSERVER=localhost
+        - HTTPSURI=/demo/server/server.php
+        - PROXYSERVER=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
@@ -13,6 +28,8 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
+  - 8.0
 
 before_install:
   # This is mandatory or the 'apt-get install' calls following will fail
@@ -30,7 +47,7 @@ install:
 
   # Re-enable xdebug for when we need to generate code coverage
   - export COVERAGE_OPTS=""
-  - if [ "$TRAVIS_PHP_VERSION" = "7.3" -a "$XDEBUG_INI" != "" ]; then mv "$XDEBUG_INI.bak" "$XDEBUG_INI" && export COVERAGE_OPTS="--coverage-clover=coverage.clover"; fi
+  - if [ "$TRAVIS_PHP_VERSION" = "7.4" -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
@@ -42,9 +59,7 @@ before_script:
   - 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=0 DEBUG=0
+  vendor/bin/phpunit $COVERAGE_OPTS tests
 
 after_failure:
   # Save as much info as we can to help developers
@@ -55,9 +70,9 @@ 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