From 6821d4f848b4acb7d26e688ce56a6aa48a281f51 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Thu, 10 Oct 2019 17:52:10 +0200
Subject: [PATCH] Add support for PHP 7.4

---
 data/supported-extensions            | 46 ++++++++++++++--------------
 scripts/travisci-test-new-extensions |  9 ++++--
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/data/supported-extensions b/data/supported-extensions
index 5a149a5..5fd7e8d 100644
--- a/data/supported-extensions
+++ b/data/supported-extensions
@@ -30,30 +30,30 @@ pdo_firebird 5.6 7.0 7.1 7.2 7.3 7.4
 pdo_mysql 5.6 7.0 7.1 7.2 7.3 7.4
 pdo_odbc 5.6 7.0 7.1 7.2 7.3 7.4
 pdo_pgsql 5.6 7.0 7.1 7.2 7.3 7.4
-pdo_sqlsrv 7.0 7.1 7.2 7.3
-pgsql 5.6 7.0 7.1 7.2 7.3
-pspell 5.6 7.0 7.1 7.2 7.3
+pdo_sqlsrv 7.0 7.1 7.2 7.3 7.4
+pgsql 5.6 7.0 7.1 7.2 7.3 7.4
+pspell 5.6 7.0 7.1 7.2 7.3 7.4
 pthreads 5.6 7.0
 recode 5.6 7.0 7.1 7.2 7.3
-redis 5.6 7.0 7.1 7.2 7.3
-shmop 5.6 7.0 7.1 7.2 7.3
-snmp 5.6 7.0 7.1 7.2 7.3
-soap 5.6 7.0 7.1 7.2 7.3
-sockets 5.6 7.0 7.1 7.2 7.3
-solr 5.6 7.0 7.1 7.2 7.3
-sqlsrv 7.0 7.1 7.2 7.3
-ssh2 5.6 7.0 7.1 7.2 7.3
+redis 5.6 7.0 7.1 7.2 7.3 7.4
+shmop 5.6 7.0 7.1 7.2 7.3 7.4
+snmp 5.6 7.0 7.1 7.2 7.3 7.4
+soap 5.6 7.0 7.1 7.2 7.3 7.4
+sockets 5.6 7.0 7.1 7.2 7.3 7.4
+solr 5.6 7.0 7.1 7.2 7.3 7.4
+sqlsrv 7.0 7.1 7.2 7.3 7.4
+ssh2 5.6 7.0 7.1 7.2 7.3 7.4
 sybase_ct 5.6
-sysvmsg 5.6 7.0 7.1 7.2 7.3
-sysvsem 5.6 7.0 7.1 7.2 7.3
-sysvshm 5.6 7.0 7.1 7.2 7.3
-tidy 5.6 7.0 7.1 7.2 7.3
-timezonedb 5.6 7.0 7.1 7.2 7.3
-uopz 5.6 7.0 7.1 7.2 7.3
-uuid 5.6 7.0 7.1 7.2 7.3
+sysvmsg 5.6 7.0 7.1 7.2 7.3 7.4
+sysvsem 5.6 7.0 7.1 7.2 7.3 7.4
+sysvshm 5.6 7.0 7.1 7.2 7.3 7.4
+tidy 5.6 7.0 7.1 7.2 7.3 7.4
+timezonedb 5.6 7.0 7.1 7.2 7.3 7.4
+uopz 5.6 7.0 7.1 7.2 7.3 7.4
+uuid 5.6 7.0 7.1 7.2 7.3 7.4
 wddx 5.6 7.0 7.1 7.2 7.3
-xdebug 5.6 7.0 7.1 7.2 7.3
-xmlrpc 5.6 7.0 7.1 7.2 7.3
-xsl 5.6 7.0 7.1 7.2 7.3
-yaml 5.6 7.0 7.1 7.2 7.3
-zip 5.6 7.0 7.1 7.2 7.3
+xdebug 5.6 7.0 7.1 7.2 7.3 7.4
+xmlrpc 5.6 7.0 7.1 7.2 7.3 7.4
+xsl 5.6 7.0 7.1 7.2 7.3 7.4
+yaml 5.6 7.0 7.1 7.2 7.3 7.4
+zip 5.6 7.0 7.1 7.2 7.3 7.4
diff --git a/scripts/travisci-test-new-extensions b/scripts/travisci-test-new-extensions
index 4a7c894..3aae496 100755
--- a/scripts/travisci-test-new-extensions
+++ b/scripts/travisci-test-new-extensions
@@ -27,11 +27,16 @@ fi
 # Outputs:
 # the full docker image ID
 getExtensionImage () {
-	getExtensionImage_result="php:${2}-cli"
+	if test "${2}" = '7.4'; then
+		getExtensionImage_version='7.4.0RC3'
+	else
+		getExtensionImage_version="${2}"
+	fi
+	getExtensionImage_result="php:${getExtensionImage_version}-cli"
 	getExtensionImage_reqs="${TRAVIS_BUILD_DIR}/data/special-requirements"
 	if test -f "${getExtensionImage_reqs}"; then
 		if test -n "$(cat "${getExtensionImage_reqs}" | grep -E "^${1}[ \t]+zts[ \t]*$")"; then
-			getExtensionImage_result="php:${2}-zts"
+			getExtensionImage_result="php:${getExtensionImage_version}-zts"
 		fi
 	fi
 	printf '%s' "${getExtensionImage_result}"