From 7476e5eb489a17f271b4943bb2be958733c7e5eb Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Sat, 16 Jan 2021 21:01:03 +0100 Subject: [PATCH] Add support for sqlsrv/pdo_sqlsrv with PHP 8.0 --- data/supported-extensions | 4 ++-- install-php-extensions | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/supported-extensions b/data/supported-extensions index 5a83031..4ed3556 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -51,7 +51,7 @@ pdo_mysql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 pdo_oci 7.0 7.1 7.2 7.3 7.4 8.0 pdo_odbc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 pdo_pgsql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -pdo_sqlsrv 7.0 7.1 7.2 7.3 7.4 +pdo_sqlsrv 7.0 7.1 7.2 7.3 7.4 8.0 pgsql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 propro 5.5 5.6 7.0 7.1 7.2 7.3 7.4 protobuf 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 @@ -68,7 +68,7 @@ snuffleupagus 7.0 7.1 7.2 7.3 7.4 8.0 soap 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 sockets 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 solr 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -sqlsrv 7.0 7.1 7.2 7.3 7.4 +sqlsrv 7.0 7.1 7.2 7.3 7.4 8.0 ssh2 5.5 5.6 7.0 7.1 7.2 7.3 7.4 swoole 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 sybase_ct 5.5 5.6 diff --git a/install-php-extensions b/install-php-extensions index d7e5c80..d0e771c 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -1642,10 +1642,14 @@ installRemoteModule() { pdo_sqlsrv | sqlsrv) if test -z "$installRemoteModule_version"; then # https://docs.microsoft.com/it-it/sql/connect/php/system-requirements-for-the-php-sql-driver?view=sql-server-2017 - if test $PHP_MAJMIN_VERSION -le 700; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=3.0.1 + elif test $PHP_MAJMIN_VERSION -le 700; then installRemoteModule_version=5.3.0 elif test $PHP_MAJMIN_VERSION -le 701; then installRemoteModule_version=5.6.1 + elif test $PHP_MAJMIN_VERSION -le 702; then + installRemoteModule_version=5.8.1 fi fi ;; @@ -2098,7 +2102,7 @@ configureInstaller() { if ! stringInList 'zip' "$PHP_PREINSTALLED_MODULES"; then PHP_MODULES_TO_INSTALL="zip $(removeStringFromList 'zip' "$PHP_MODULES_TO_INSTALL")" fi - if anyStringInList 'swoole xdebug xhprof' "$PHP_MODULES_TO_INSTALL"; then + if anyStringInList 'swoole xdebug xhprof pdo_sqlsrv sqlsrv' "$PHP_MODULES_TO_INSTALL"; then USE_PICKLE=2 else curl -sSLf https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar -o /tmp/pickle