From 6c83f5a829eb75065191618652c22111d9d779c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Sat, 6 Jun 2020 19:05:16 +0200
Subject: [PATCH] Report coverage unconditionally on Travis

pcov is fast enough for this to be acceptable.
---
 .travis.yml | 63 ++++++++++++++++++++++-------------------------------
 1 file changed, 26 insertions(+), 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 68e57663255..341e475d264 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,7 @@ cache:
 
 before_install:
   - phpenv config-rm xdebug.ini || true
-  - |
-    if [ "x$COVERAGE" == "xyes" ]; then
-      pecl install pcov-1.0.0
-    fi
+  - pecl install pcov
 
 before_script:
   - |
@@ -24,25 +21,17 @@ install:
   - travis_retry composer -n install --prefer-dist
 
 script:
-  - |
-    if [ "x$COVERAGE" == "xyes" ]; then
-       ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml --coverage-clover clover.xml
-    else
-       ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml
-    fi
+  - ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml --coverage-clover clover.xml
 
 after_success:
-  - |
-    if [ "x$COVERAGE" == "xyes" ]; then
-      bash <(curl -s https://codecov.io/bash)
-    fi
+  - bash <(curl -s https://codecov.io/bash)
 
 jobs:
   include:
 
     - stage: Smoke Testing
       php: 7.3
-      env: DB=sqlite COVERAGE=yes
+      env: DB=sqlite
 
     - stage: Test
       php: 7.2
@@ -83,44 +72,44 @@ jobs:
         - bash ./tests/travis/install-mssql.sh
     - stage: Test
       php: 7.3
-      env: DB=mysql.docker IMAGE=mysql:5.7 COVERAGE=yes
+      env: DB=mysql.docker IMAGE=mysql:5.7
     - stage: Test
       php: 7.3
-      env: DB=mysql.docker IMAGE=mysql:8.0 COVERAGE=yes
+      env: DB=mysql.docker IMAGE=mysql:8.0
     - stage: Test
       php: 7.3
-      env: DB=mysqli.docker IMAGE=mysql:5.7 COVERAGE=yes
+      env: DB=mysqli.docker IMAGE=mysql:5.7
     - stage: Test
       php: 7.3
-      env: DB=mysqli.docker IMAGE=mysql:8.0 COVERAGE=yes
+      env: DB=mysqli.docker IMAGE=mysql:8.0
     - stage: Test
       php: 7.3
-      env: DB=mariadb.docker IMAGE=mariadb:10.0 COVERAGE=yes
+      env: DB=mariadb.docker IMAGE=mariadb:10.0
     - stage: Test
       php: 7.3
-      env: DB=mariadb.docker IMAGE=mariadb:10.1 COVERAGE=yes
+      env: DB=mariadb.docker IMAGE=mariadb:10.1
     - stage: Test
       php: 7.3
-      env: DB=mariadb.docker IMAGE=mariadb:10.2 COVERAGE=yes
+      env: DB=mariadb.docker IMAGE=mariadb:10.2
     - stage: Test
       php: 7.3
-      env: DB=mariadb.docker IMAGE=mariadb:10.3 COVERAGE=yes
+      env: DB=mariadb.docker IMAGE=mariadb:10.3
     - stage: Test
       php: 7.3
-      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.0 COVERAGE=yes
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.0
     - stage: Test
       php: 7.3
-      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.1 COVERAGE=yes
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.1
     - stage: Test
       php: 7.3
-      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.2 COVERAGE=yes
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.2
     - stage: Test
       php: 7.3
-      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.3 COVERAGE=yes
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.3
     - stage: Test
       dist: trusty
       php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=9.2 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=9.2
       services:
         - postgresql
       addons:
@@ -128,29 +117,29 @@ jobs:
     - stage: Test
       dist: trusty
       php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=9.3 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=9.3
       services:
         - postgresql
       addons:
         postgresql: "9.3"
     - stage: Test
       php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=9.4 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=9.4
       addons:
         postgresql: "9.4"
     - stage: Test
       php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=9.5 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
       addons:
         postgresql: "9.5"
     - stage: Test
       php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=9.6 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=9.6
       addons:
         postgresql: "9.6"
     - stage: Test
       php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=10.0 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=10.0
       sudo: required
       addons:
         postgresql: "10"
@@ -158,13 +147,13 @@ jobs:
         - bash ./tests/travis/install-postgres-10.sh
     - stage: Test
       php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=11.0 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=11.0
       sudo: required
       before_script:
         - bash ./tests/travis/install-postgres-11.sh
     - stage: Test
       php: 7.3
-      env: DB=sqlsrv COVERAGE=yes
+      env: DB=sqlsrv
       sudo: required
       before_script:
         - bash ./tests/travis/install-sqlsrv-dependencies.sh
@@ -172,7 +161,7 @@ jobs:
         - bash ./tests/travis/install-mssql.sh
     - stage: Test
       php: 7.3
-      env: DB=pdo_sqlsrv COVERAGE=yes
+      env: DB=pdo_sqlsrv
       sudo: required
       before_script:
         - bash ./tests/travis/install-sqlsrv-dependencies.sh
@@ -180,7 +169,7 @@ jobs:
         - bash ./tests/travis/install-mssql.sh
     - stage: Test
       php: 7.3
-      env: DB=ibm_db2 COVERAGE=yes
+      env: DB=ibm_db2
       sudo: required
       before_script:
         - bash ./tests/travis/install-db2.sh