From 3454c8f7d7caee5b90998ae45ae7a8734ac4815c Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Sun, 16 Feb 2020 18:28:30 +0100
Subject: [PATCH 1/3] Add support for oauth extension

---
 data/supported-extensions |  1 +
 install-php-extensions    | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/data/supported-extensions b/data/supported-extensions
index 921cbc5..a69724b 100644
--- a/data/supported-extensions
+++ b/data/supported-extensions
@@ -30,6 +30,7 @@ msgpack 5.5 5.6 7.0 7.1 7.2 7.3 7.4
 mssql 5.5 5.6
 mysql 5.5 5.6
 mysqli 5.5 5.6 7.0 7.1 7.2 7.3 7.4
+oauth 5.5 5.6 7.0 7.1 7.2 7.3 7.4
 odbc 5.5 5.6 7.0 7.1 7.2 7.3 7.4
 opcache 5.5 5.6 7.0 7.1 7.2 7.3 7.4
 opencensus 7.0 7.1 7.2 7.3 7.4
diff --git a/install-php-extensions b/install-php-extensions
index 8e51b80..d192b96 100755
--- a/install-php-extensions
+++ b/install-php-extensions
@@ -428,6 +428,16 @@ buildRequiredPackageLists() {
 				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libsybdb5"
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile freetds-dev"
 				;;
+			oauth@alpine)
+				if test $buildRequiredPackageLists_phpv -ge 700; then
+					buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile pcre-dev"
+				fi
+				;;
+			oauth@debian)
+				if test $buildRequiredPackageLists_phpv -ge 700; then
+					buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpcre3-dev"
+				fi
+				;;
 			odbc@alpine)
 				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent unixodbc"
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile unixodbc-dev"
@@ -1107,6 +1117,11 @@ installPECLModule() {
 				installPECLModule_actual="$2-0.5.7"
 			fi
 			;;
+		oauth)
+			if test $1 -le 506; then
+				installPECLModule_actual="$2-1.2.3"
+			fi
+			;;
 		opencensus)
 			if test $1 -le 702; then
 				installPECLModule_actual="$2-alpha"

From 3e14522293b7cb3222f2e145043c508435dd05e8 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Sun, 16 Feb 2020 18:39:57 +0100
Subject: [PATCH 2/3] Fix extraction of extensions to be tested from
 data/supported-extensions

---
 scripts/ci-test-extensions | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ci-test-extensions b/scripts/ci-test-extensions
index e9fdc93..7f302cf 100755
--- a/scripts/ci-test-extensions
+++ b/scripts/ci-test-extensions
@@ -66,6 +66,7 @@ extractExtensionsFromData() {
 				fi
 			elif test -z "${extractExtensionsFromData_line##+*}"; then
 				extractExtensionsFromData_extension="${extractExtensionsFromData_line%% *}"
+				extractExtensionsFromData_extension="${extractExtensionsFromData_extension#+}"
 				if ! stringInList "$extractExtensionsFromData_extension" "$EXTENSIONS_TO_BE_TESTED"; then
 					EXTENSIONS_TO_BE_TESTED="$EXTENSIONS_TO_BE_TESTED $extractExtensionsFromData_extension"
 				fi

From dc8ae7f6662fbf6164bfeeda23ac5f977653471f Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Sun, 16 Feb 2020 18:48:55 +0100
Subject: [PATCH 3/3] Show duration of extension tests

---
 scripts/ci-test-extensions | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/ci-test-extensions b/scripts/ci-test-extensions
index 7f302cf..5558a1e 100755
--- a/scripts/ci-test-extensions
+++ b/scripts/ci-test-extensions
@@ -237,9 +237,12 @@ testExtensionFor() {
 	fi
 	printf ' - Docker image: %s\n' "$testExtensionFor_Image"
 	testExtensionFor_out="$(mktemp)"
+	testExtensionFor_start=$(date +%s)
 	if $(docker run --rm --volume "$CI_BUILD_DIR:/app" --workdir /app "$testExtensionFor_Image" sh -c "./install-php-extensions $1 && php ./scripts/check-installed-extension.php $1" >"$testExtensionFor_out" 2>&1); then
+		testExtensionFor_end=$(date +%s)
+		testExtensionFor_delta=$(expr $testExtensionFor_end - $testExtensionFor_start)
 		rm -rf "$testExtensionFor_out"
-		printf ' - Passed\n'
+		printf ' - Passed in %s seconds\n' $testExtensionFor_delta
 		return 0
 	fi
 	printf ' - FAILED!\n' >&2