X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=365eb356cdfaad1faeab6bb1f5da050261d813c0;hb=98d4ea619cef778d0cbcc706ea9a157178f90da5;hp=81510da912014119b3a7416e2b67f955f4a11069;hpb=4bc4479a1d44d15b2ddd25ab84d64ed8a5dafea5;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index 81510da..365eb35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,24 +2,22 @@ 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...)
+# adapt composer.json plus 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
+env:
+    global:
+        - HTTPSERVER=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
@@ -40,6 +38,7 @@ before_install:
   - sudo apt-get install -y privoxy
 
   # Disable xdebug for speed (executing composer), but allow us to re-enable it later
+  # @todo move to setup_php
   - 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
@@ -49,19 +48,19 @@ 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
-  - ./tests/ci/travis/setup_php_fpm.sh
-  - ./tests/ci/travis/setup_apache.sh
-  - ./tests/ci/travis/setup_privoxy.sh
+  - sudo ./tests/ci/setup/setup_apache.sh
+  - sudo ./tests/ci/setup/setup_php.sh
+  - sudo ./tests/ci/setup/setup_privoxy.sh
 
   # output what version of phpunit we got going
   - vendor/bin/phpunit --version
 
 script:
-  vendor/bin/phpunit $COVERAGE_OPTS tests
+  ./vendor/bin/phpunit $COVERAGE_OPTS tests
 
 after_failure:
   # Save as much info as we can to help developers