From 316febbb28045b4ff1afc0f3b1a35da70a28bc7d Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Thu, 26 Aug 2021 09:14:04 +0200
Subject: [PATCH 1/3] Fix variable name in getAllPHPVersionsForExtension

---
 scripts/ci-test-extensions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/ci-test-extensions b/scripts/ci-test-extensions
index 5cd7199..ab63c78 100755
--- a/scripts/ci-test-extensions
+++ b/scripts/ci-test-extensions
@@ -248,11 +248,11 @@ getAllPHPVersionsForExtension() {
 		done
 	done <"$CI_BUILD_DIR/data/supported-extensions"
 
-	filterUnsupportedExensionsForDistro_reqs="$CI_BUILD_DIR/data/special-requirements"
-	if test -f "$filterUnsupportedExensionsForDistro_reqs"; then
+	getAllPHPVersionsForExtension_reqs="$CI_BUILD_DIR/data/special-requirements"
+	if test -f "$getAllPHPVersionsForExtension_reqs"; then
 		getAllPHPVersionsForExtension_filtered_result=''
 		for getAllPHPVersionsForExtension_result_filter in $getAllPHPVersionsForExtension_result; do
-			if stringInList "!$getAllPHPVersionsForExtension_result_filter-$IPETEST_DOCKER_DISTRO" "$(cat "$filterUnsupportedExensionsForDistro_reqs" | grep -E "^$1[ \t]")"; then
+			if stringInList "!$getAllPHPVersionsForExtension_result_filter-$IPETEST_DOCKER_DISTRO" "$(cat "$getAllPHPVersionsForExtension_reqs" | grep -E "^$1[ \t]")"; then
 				printf 'Note: extension "%s" is not supported for distro "%s" using php "%s"\n' "$1" "$IPETEST_DOCKER_DISTRO" "$getAllPHPVersionsForExtension_result_filter" >/dev/stderr
 			else
 				getAllPHPVersionsForExtension_filtered_result="$getAllPHPVersionsForExtension_filtered_result $getAllPHPVersionsForExtension_result_filter"

From 69e11af30748143cbf3ee00677b1a0516cd3fa77 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Thu, 26 Aug 2021 09:24:53 +0200
Subject: [PATCH 2/3] Fix sqlsrv test script

---
 scripts/tests/sqlsrv | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/tests/sqlsrv b/scripts/tests/sqlsrv
index afc53ea..6609305 100755
--- a/scripts/tests/sqlsrv
+++ b/scripts/tests/sqlsrv
@@ -29,11 +29,14 @@ sqlsrv_connect(
         'PWD' => 'password',
     ]
 );
+$rc = 0;
 $errors = sqlsrv_errors(SQLSRV_ERR_ALL);
 if (is_array($errors)) {
     foreach ($errors as $error) {
         if (isset($error['message']) && stripos($error['message'], 'This extension requires the Microsoft ODBC Driver for SQL Server') !== false) {
             fwrite(STDERR, trim($error['message']) . "\n");
+            $rc = 1;
         }
     }
 }
+exit($rc);

From d305065edd69e94b1f7bb9a941312c63fa0d72be Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Thu, 26 Aug 2021 08:52:15 +0200
Subject: [PATCH 3/3] Simplify exclusion of whole distros

Test: pdo_sqlsrv, sqlsrv, vips
---
 data/special-requirements | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/special-requirements b/data/special-requirements
index a89d721..9011d85 100644
--- a/data/special-requirements
+++ b/data/special-requirements
@@ -1,5 +1,5 @@
 parallel zts
-pdo_sqlsrv !7.0-alpine3.7 !7.1-alpine3.7 !7.2-alpine3.7 !7.1-alpine3.8 !7.2-alpine3.8 !7.3-alpine3.8 !7.3-bullseye !7.4-bullseye !8.0-bullseye !8.1-bullseye
+pdo_sqlsrv !alpine3.7 !alpine3.8 !bullseye
 pthreads zts
-sqlsrv     !7.0-alpine3.7 !7.1-alpine3.7 !7.2-alpine3.7 !7.1-alpine3.8 !7.2-alpine3.8 !7.3-alpine3.8 !7.1-alpine3.9 !7.1-alpine3.10 !7.3-bullseye !7.4-bullseye !8.0-bullseye !8.1-bullseye
-vips !7.0-alpine3.7 !7.1-alpine3.7 !7.2-alpine3.7 !7.1-alpine3.8 !7.2-alpine3.8 !7.3-alpine3.8 !7.1-alpine3.9 !7.2-alpine3.9 !7.3-alpine3.9 !7.0-jessie !7.1-jessie !7.2-jessie
+sqlsrv !alpine3.7 !alpine3.8 !7.1-alpine3.9 !7.1-alpine3.10 !bullseye
+vips !alpine3.7 !alpine3.8 !alpine3.9 !jessie