public-mirrors
/
docker-php-extension-installer
mirror of https://github.com/mlocati/docker-php-extension-installer
1
0
Fork 0
Code

Merge pull request #34 from mlocati/ssh2 

Add support for SSH2 on PHP 7.3
pull/35/head
Michele Locati 2019-10-09 14:11:12 +02:00 committed by GitHub
parent 28e4e28cb9 14e886a16f
commit 0823bd223c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/supported-extensions
View File

@ -42,7 +42,7 @@ soap 5.6 7.0 7.1 7.2 7.3
sockets 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 solr 5.6 7.0 7.1
sqlsrv 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 ssh2 5.6 7.0 7.1 7.2 7.3
sybase_ct 5.6 sybase_ct 5.6
sysvmsg 5.6 7.0 7.1 7.2 7.3 sysvmsg 5.6 7.0 7.1 7.2 7.3
sysvsem 5.6 7.0 7.1 7.2 7.3 sysvsem 5.6 7.0 7.1 7.2 7.3

16
install-php-extensions
View File

@ -423,6 +423,7 @@ installModuleFromSource () {
installPECLModule () { installPECLModule () {
printf '### INSTALLING PECL MODULE %s ###\n' "${2}" printf '### INSTALLING PECL MODULE %s ###\n' "${2}"
installPECLModule_actual="${2}" installPECLModule_actual="${2}"
installPECLModule_stdin=''
case "${2}" in case "${2}" in
mcrypt) mcrypt)
if test $1 -ge 702; then if test $1 -ge 702; then
@ -451,8 +452,13 @@ installPECLModule () {
fi fi
;; ;;
ssh2) ssh2)
if test $1 -ge 700; then if test $1 -le 506; then
installPECLModule_actual="${2}-1.1.2" installPECLModule_stdin='autodetect'
installPECLModule_actual="${2}-0.13"
else
installPECLModule_stdin='autodetect'
# see https://bugs.php.net/bug.php?id=78560
installPECLModule_actual='https://pecl.php.net/get/ssh2'
fi fi
;; ;;
xdebug) xdebug)
@ -482,7 +488,11 @@ installPECLModule () {
if test "${2}" != "${installPECLModule_actual}"; then if test "${2}" != "${installPECLModule_actual}"; then
printf ' (installing version %s)\n' "${installPECLModule_actual}" printf ' (installing version %s)\n' "${installPECLModule_actual}"
fi fi
pecl install "${installPECLModule_actual}" if test -z "$installPECLModule_stdin"; then
pecl install "${installPECLModule_actual}"
else
printf '%s\n' "$installPECLModule_stdin" | pecl install "${installPECLModule_actual}"
fi
docker-php-ext-enable "${2}" docker-php-ext-enable "${2}"
} }