From 460135db1101957a3233b7d78fb2bb78e3508f75 Mon Sep 17 00:00:00 2001
From: George Petculescu <gxgpet@gmail.com>
Date: Mon, 31 May 2021 13:16:33 +0300
Subject: Travis: PHP 7.4 seems to fail if XDEBUG_MODE=coverage is not set

---
 .travis.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 5070c24c2..031aba6c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,13 +11,15 @@ php:
   - 7.4
   - nightly
 
-env:
-  - DB=mysqli
-  - DB=pgsql
-  - DB=sqlite
-  - DB=pdo/mysql
-  - DB=pdo/pgsql
-  - DB=pdo/sqlite
+  global:
+    - XDEBUG_MODE=coverage
+  jobs:
+    - DB=mysqli
+    - DB=pgsql
+    - DB=sqlite
+    - DB=pdo/mysql
+    - DB=pdo/pgsql
+    - DB=pdo/sqlite
 
 services:
   - mysql
-- 
cgit v1.2.3-24-g4f1b


From 5fe5a94930d58f2d6dcdda2a3b0d97978b3c3c8d Mon Sep 17 00:00:00 2001
From: George Petculescu <gxgpet@gmail.com>
Date: Mon, 31 May 2021 13:17:51 +0300
Subject: Travis: ignore mbstring.func_overload=7 for PHP >= 7.3

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 031aba6c7..8657358ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ before_script:
   - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'mysqli' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi"
 
-script: php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7 -d mbstring.internal_encoding=UTF-8 vendor/bin/phpunit --coverage-text --configuration tests/travis/$DB.phpunit.xml
+script: test $(php -r 'echo PHP_VERSION_ID;') -lt 70300 && php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7 -d mbstring.internal_encoding=UTF-8 vendor/bin/phpunit --coverage-text --configuration tests/travis/$DB.phpunit.xml || php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.internal_encoding=UTF-8 vendor/bin/phpunit --coverage-text --configuration tests/travis/$DB.phpunit.xml
 
 jobs:
   allow_failures:
-- 
cgit v1.2.3-24-g4f1b


From c7e171e0d83d7092d459c2754a1ee3aba33e43ef Mon Sep 17 00:00:00 2001
From: George Petculescu <gxgpet@gmail.com>
Date: Mon, 31 May 2021 13:49:15 +0300
Subject: Fixes travis yml

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 8657358ed..bf86bace1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ php:
   - 7.4
   - nightly
 
+env:
   global:
     - XDEBUG_MODE=coverage
   jobs:
-- 
cgit v1.2.3-24-g4f1b