From 8595a480f4583cd4e4913f9a3843768e2b6020b1 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Wed, 13 Dec 2023 20:14:33 +0100 Subject: [PATCH 01/17] Fix segmentation fault of swoole on PHP 8.3 (#847) --- install-php-extensions | 14 ++++++++++---- scripts/tests/swoole | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100755 scripts/tests/swoole diff --git a/install-php-extensions b/install-php-extensions index ff61ab44..e0a74de5 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -3598,6 +3598,12 @@ installRemoteModule() { fi ;; esac + if test $PHP_MAJMIN_VERSION -eq 803; then + # see https://github.com/swoole/docker-swoole/issues/45 + installRemoteModule_curl=no + else + installRemoteModule_curl=yes + fi if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 5.0.1) -ge 0; then # enable sockets supports? addConfigureOption enable-sockets $installRemoteModule_sockets @@ -3606,7 +3612,7 @@ installRemoteModule() { # enable mysqlnd support? addConfigureOption enable-mysqlnd yes # enable curl support? - addConfigureOption enable-swoole-curl yes + addConfigureOption enable-swoole-curl $installRemoteModule_curl # enable cares support? addConfigureOption enable-cares yes # enable brotli support? @@ -3619,7 +3625,7 @@ installRemoteModule() { # enable mysqlnd support? addConfigureOption enable-mysqlnd yes # enable curl support? - addConfigureOption enable-swoole-curl yes + addConfigureOption enable-swoole-curl $installRemoteModule_curl # enable cares support? addConfigureOption enable-cares yes elif test $(compareVersions "$installRemoteModule_version" 4.8.11) -ge 0; then @@ -3634,7 +3640,7 @@ installRemoteModule() { # enable json support? addConfigureOption enable-swoole-json yes # enable curl support? - addConfigureOption enable-swoole-curl yes + addConfigureOption enable-swoole-curl $installRemoteModule_curl # enable cares support? addConfigureOption enable-cares yes elif test $(compareVersions "$installRemoteModule_version" 4.6.1) -ge 0; then @@ -3649,7 +3655,7 @@ installRemoteModule() { # enable json support? addConfigureOption enable-swoole-json yes # enable curl support? - addConfigureOption enable-swoole-curl yes + addConfigureOption enable-swoole-curl $installRemoteModule_curl elif test $(compareVersions "$installRemoteModule_version" 4.4.0) -ge 0; then # enable sockets supports? addConfigureOption enable-sockets $installRemoteModule_sockets diff --git a/scripts/tests/swoole b/scripts/tests/swoole new file mode 100755 index 00000000..13d3eeaa --- /dev/null +++ b/scripts/tests/swoole @@ -0,0 +1,15 @@ +#!/usr/bin/env php + Date: Thu, 14 Dec 2023 15:35:39 +0100 Subject: [PATCH 02/17] Updated README.md (#849) Updated the README to use the latest version of the mlocati/php-extension-installer Docker image in the bind-mount example --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a2d2d2bd..5d116798 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ You may want to run `docker pull mlocati/php-extension-installer` in order to us ### Using the script of a Docker image ```Dockerfile -RUN --mount=type=bind,from=mlocati/php-extension-installer:1.5,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ +RUN --mount=type=bind,from=mlocati/php-extension-installer:latest,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ install-php-extensions gd xdebug ``` From 5f978218131e11a79b3435cbb653af210bb58858 Mon Sep 17 00:00:00 2001 From: "Roland Franssen :)" Date: Thu, 14 Dec 2023 16:00:29 +0100 Subject: [PATCH 03/17] Label `org.opencontainers.image.source` (#848) --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 09c662ae..0cbb001f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,4 +5,7 @@ RUN chmod +x /tmp/install-php-extensions FROM scratch +LABEL org.opencontainers.image.source="https://github.com/mlocati/docker-php-extension-installer" \ + org.opencontainers.image.licenses="MIT" + COPY --from=build /tmp/install-php-extensions /usr/bin/install-php-extensions From 9129367b1fb1ec81d891a287c09e80318e4807ee Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Thu, 14 Dec 2023 16:14:09 +0100 Subject: [PATCH 04/17] Test Dockerfile, add Dockerfile changes to release notes (#850) --- .github/workflows/readme-release.yml | 3 ++- .github/workflows/test-dockerfile.yml | 38 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/test-dockerfile.yml diff --git a/.github/workflows/readme-release.yml b/.github/workflows/readme-release.yml index f7fc1220..724cd36c 100644 --- a/.github/workflows/readme-release.yml +++ b/.github/workflows/readme-release.yml @@ -82,6 +82,7 @@ jobs: for CHANGED_FILE in $(git diff --name-only "refs/tags/$VERSIONTAG_LAST" HEAD); do case "$CHANGED_FILE" in install-php-extensions) + Dockerfile) CREATE_TAG=y ;; esac @@ -143,7 +144,7 @@ jobs: RELEASE_NOTES='First version' else printf 'Generating release notes for commits between %s and %s\n' "$VERSIONTAG_PREVIOUS" "$VERSIONTAG_THIS" - RELEASE_NOTES="$(git log --format='- %s' --no-merges --reverse "refs/tags/$VERSIONTAG_PREVIOUS...refs/tags/$VERSIONTAG_THIS" -- ./install-php-extensions | grep -vE '^- \[minor\]')" + RELEASE_NOTES="$(git log --format='- %s' --no-merges --reverse "refs/tags/$VERSIONTAG_PREVIOUS...refs/tags/$VERSIONTAG_THIS" -- ./install-php-extensions ./Dockerfile | grep -vE '^- \[minor\]')" fi printf 'Release notes:\n%s\n' "$RELEASE_NOTES" printf 'RELEASE_NAME=v%s\n' "$VERSIONTAG_THIS" >> "$GITHUB_ENV" diff --git a/.github/workflows/test-dockerfile.yml b/.github/workflows/test-dockerfile.yml new file mode 100644 index 00000000..31c71a67 --- /dev/null +++ b/.github/workflows/test-dockerfile.yml @@ -0,0 +1,38 @@ +name: Build Docker image + +on: + pull_request: + paths: + - Dockerfile + - .github/workflows/test-dockerfile.yml + +jobs: + build: + name: Build Docker image + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Build image + run: docker build --tag test:latest . + - + name: Save image contents + run: docker save --output /tmp/image.tar test:latest + - + name: Extract layer + run: tar -C /tmp -x -f /tmp/image.tar --wildcards '*layer.tar' --strip-components=1 + - + name: Check layer contents + run: | + ENTRY="$(tar -v -t -f /tmp/layer.tar --wildcards '*bin/install-php-extensions')" + if [ -z "$ENTRY" ]; then + echo 'File not found' + exit 1 + fi + if ! printf '%s' "$ENTRY" | grep -E '^.r.xr.xr.x '; then + printf 'Invalid entry permissions:\n%s\n' "$ENTRY" + exit 1 + fi + echo 'Entry is correct.' From 8150d17927d75f570ec0c99402835a19faf97f58 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Thu, 14 Dec 2023 16:16:19 +0100 Subject: [PATCH 05/17] Fix readme-release.yml --- .github/workflows/readme-release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/readme-release.yml b/.github/workflows/readme-release.yml index 724cd36c..5adba788 100644 --- a/.github/workflows/readme-release.yml +++ b/.github/workflows/readme-release.yml @@ -81,8 +81,7 @@ jobs: CREATE_TAG=n for CHANGED_FILE in $(git diff --name-only "refs/tags/$VERSIONTAG_LAST" HEAD); do case "$CHANGED_FILE" in - install-php-extensions) - Dockerfile) + install-php-extensions | Dockerfile) CREATE_TAG=y ;; esac From 87c38b8def9cc076f3cf95d46bc73046aa0ded4a Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Thu, 14 Dec 2023 18:04:14 +0100 Subject: [PATCH 06/17] Fix installing libssl on Alpine 3.19 (#852) --- install-php-extensions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-php-extensions b/install-php-extensions index e0a74de5..fe934088 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -671,7 +671,7 @@ buildRequiredPackageLists() { buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS" fi if test -z "$(apk info 2>/dev/null | grep -E ^libssl)"; then - buildRequiredPackageLists_libssl='libssl1.0' + buildRequiredPackageLists_libssl='^libssl[0-9]+(\.[0-9]+)*$' elif test -z "$(apk info 2>/dev/null | grep -E '^libressl.*-libtls')" && test -z "$(apk info 2>/dev/null | grep -E '^libressl.*-libssl')" && test -z "$(apk info 2>/dev/null | grep -E '^libretls-')"; then buildRequiredPackageLists_libssl=$(apk search -q libressl*-libtls) else @@ -1225,7 +1225,7 @@ buildRequiredPackageLists() { relay@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent lz4-libs zstd-libs" if test $DISTRO_MAJMIN_VERSION -ge 317; then - buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libssl1.1" + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent $buildRequiredPackageLists_libssl" fi ;; saxon@debian) From c56d451c97624e5d3dc816baaea9ea1e11ff0a73 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Fri, 15 Dec 2023 09:24:59 +0100 Subject: [PATCH 07/17] Add support for Alpine 3.19 (#853) * Add support for Alpine 3.19 * Temporarily drop support for imagick on Alpine 3.19 See https://github.com/mlocati/docker-php-extension-installer/issues/855 Test: imagick --- .github/workflows/monitor-php8.3.yml | 1 + .github/workflows/test-extensions.yml | 1 + .github/workflows/test-recent-extensions.yml | 1 + data/special-requirements | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/monitor-php8.3.yml b/.github/workflows/monitor-php8.3.yml index 7ccd706e..31e49d3d 100644 --- a/.github/workflows/monitor-php8.3.yml +++ b/.github/workflows/monitor-php8.3.yml @@ -15,6 +15,7 @@ jobs: distro: - alpine3.17 - alpine3.18 + - alpine3.19 - bullseye - bookworm name: Check on ${{ matrix.distro }} diff --git a/.github/workflows/test-extensions.yml b/.github/workflows/test-extensions.yml index 1d31b41d..102e4a78 100644 --- a/.github/workflows/test-extensions.yml +++ b/.github/workflows/test-extensions.yml @@ -72,6 +72,7 @@ jobs: - alpine3.16 - alpine3.17 - alpine3.18 + - alpine3.19 - jessie - stretch - buster diff --git a/.github/workflows/test-recent-extensions.yml b/.github/workflows/test-recent-extensions.yml index d2062315..405eb29c 100644 --- a/.github/workflows/test-recent-extensions.yml +++ b/.github/workflows/test-recent-extensions.yml @@ -47,6 +47,7 @@ jobs: - alpine3.16 - alpine3.17 - alpine3.18 + - alpine3.19 - jessie - stretch - buster diff --git a/data/special-requirements b/data/special-requirements index 9c45e5c1..e8b91192 100644 --- a/data/special-requirements +++ b/data/special-requirements @@ -2,6 +2,7 @@ cassandra !jessie !stretch !buster !bullseye !bookworm ddtrace !jessie ecma_intl !buster !bullseye geos !alpine3.9 !alpine3.10 +imagick !alpine3.19 lz4 !jessie memprof !alpine3.9 !alpine3.10 !alpine3.11 !alpine3.12 !alpine3.13 !alpine3.14 !alpine3.15 parallel zts From caaea30e1e44024b247edf8623a71d3dfdd4d86d Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Fri, 15 Dec 2023 08:25:16 +0000 Subject: [PATCH 08/17] [skip ci] Automatically update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d116798..dfb68956 100644 --- a/README.md +++ b/README.md @@ -237,7 +237,7 @@ install-php-extensions @fix_letsencrypt | grpc | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | http | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | igbinary | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | -| imagick | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | +| imagick[*](#special-requirements-for-imagick) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | imap | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | inotify | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | interbase | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | @@ -435,6 +435,7 @@ Some extensions have special requirements: | ddtrace | Not available in `jessie` docker images | | ecma_intl | • Not available in `buster` docker images
• Not available in `bullseye` docker images | | geos | • Not available in `alpine3.9` docker images
• Not available in `alpine3.10` docker images | +| imagick | Not available in `alpine3.19` docker images | | lz4 | Not available in `jessie` docker images | | memprof | • Not available in `alpine3.9` docker images
• Not available in `alpine3.10` docker images
• Not available in `alpine3.11` docker images
• Not available in `alpine3.12` docker images
• Not available in `alpine3.13` docker images
• Not available in `alpine3.14` docker images
• Not available in `alpine3.15` docker images | | parallel | Requires images with PHP compiled with thread-safety enabled (`zts`) | From c349837cf50fa7e0a6fefeacadfd662457aaf598 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Fri, 15 Dec 2023 10:39:38 +0100 Subject: [PATCH 09/17] Add support for imagick on Alpine 3.19 (#856) --- data/special-requirements | 1 - install-php-extensions | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/special-requirements b/data/special-requirements index e8b91192..9c45e5c1 100644 --- a/data/special-requirements +++ b/data/special-requirements @@ -2,7 +2,6 @@ cassandra !jessie !stretch !buster !bullseye !bookworm ddtrace !jessie ecma_intl !buster !bullseye geos !alpine3.9 !alpine3.10 -imagick !alpine3.19 lz4 !jessie memprof !alpine3.9 !alpine3.10 !alpine3.11 !alpine3.12 !alpine3.13 !alpine3.14 !alpine3.15 parallel zts diff --git a/install-php-extensions b/install-php-extensions index fe934088..751bb8e3 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -941,6 +941,9 @@ buildRequiredPackageLists() { imagick@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent imagemagick libgomp" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile imagemagick-dev" + if [ $DISTRO_MAJMIN_VERSION -ge 319 ]; then + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent ghostscript libheif libjxl libraw librsvg" + fi ;; imagick@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent ^libmagickwand-6.q16-[0-9]+$ ^libmagickcore-6.q16-[0-9]+-extra$" From dc5905ad55351ea2b17f44453ade6664c7ab5d64 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Fri, 15 Dec 2023 09:39:51 +0000 Subject: [PATCH 10/17] [skip ci] Automatically update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index dfb68956..5d116798 100644 --- a/README.md +++ b/README.md @@ -237,7 +237,7 @@ install-php-extensions @fix_letsencrypt | grpc | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | http | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | igbinary | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | -| imagick[*](#special-requirements-for-imagick) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | +| imagick | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | imap | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | inotify | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | interbase | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | @@ -435,7 +435,6 @@ Some extensions have special requirements: | ddtrace | Not available in `jessie` docker images | | ecma_intl | • Not available in `buster` docker images
• Not available in `bullseye` docker images | | geos | • Not available in `alpine3.9` docker images
• Not available in `alpine3.10` docker images | -| imagick | Not available in `alpine3.19` docker images | | lz4 | Not available in `jessie` docker images | | memprof | • Not available in `alpine3.9` docker images
• Not available in `alpine3.10` docker images
• Not available in `alpine3.11` docker images
• Not available in `alpine3.12` docker images
• Not available in `alpine3.13` docker images
• Not available in `alpine3.14` docker images
• Not available in `alpine3.15` docker images | | parallel | Requires images with PHP compiled with thread-safety enabled (`zts`) | From f039b21f7d8a2ad92a07febf7ff5b8b94dc0f66a Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Mon, 18 Dec 2023 17:32:58 +0100 Subject: [PATCH 11/17] Add support for openswoole on PHP 8.3 (#832) --- data/supported-extensions | 2 +- install-php-extensions | 94 ++++++++++++++++++++++++++++++++------- 2 files changed, 78 insertions(+), 18 deletions(-) diff --git a/data/supported-extensions b/data/supported-extensions index f50f2a86..56d30504 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -65,7 +65,7 @@ oci8 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 odbc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 opcache 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 opencensus 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 -openswoole 7.2 7.3 7.4 8.0 8.1 8.2 +openswoole 7.2 7.3 7.4 8.0 8.1 8.2 8.3 opentelemetry 8.0 8.1 8.2 8.3 parallel 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 parle 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 diff --git a/install-php-extensions b/install-php-extensions index 751bb8e3..0be22f0b 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -3181,28 +3181,88 @@ installRemoteModule() { installRemoteModule_sockets=no fi installRemoteModule_openssl=yes - # enable sockets supports? (v < 22.1.0) / enable coroutine sockets? (v >= 22.1.0) - addConfigureOption enable-sockets $installRemoteModule_sockets - # enable openssl support? - addConfigureOption enable-openssl $installRemoteModule_openssl - # enable http2 support? - addConfigureOption enable-http2 yes - # enable mysqlnd support? (v < 22.1.0) / enable coroutine mysqlnd? (v >= 22.1.0) - addConfigureOption enable-mysqlnd yes - if test -n "$installRemoteModule_version" && test $(compareVersions "$installRemoteModule_version" '22.0.0') -lt 0; then + if test -n "$installRemoteModule_version" && test $(compareVersions "$installRemoteModule_version" 22.1.2) -ge 0; then + # enable coroutine sockets? + addConfigureOption enable-sockets $installRemoteModule_sockets + # enable openssl support? + addConfigureOption enable-openssl $installRemoteModule_openssl + # enable http2 protocol? + addConfigureOption enable-http2 yes + # enable coroutine mysqlnd? + addConfigureOption enable-mysqlnd yes + # enable coroutine curl? + addConfigureOption enable-hook-curl yes + # enable coroutine postgres? + addConfigureOption with-postgres yes + elif test $(compareVersions "$installRemoteModule_version" 22.1.1) -ge 0; then + # enable c-ares support? + addConfigureOption enable-cares yes + # enable coroutine sockets? + addConfigureOption enable-sockets $installRemoteModule_sockets + # enable openssl support? + addConfigureOption enable-openssl $installRemoteModule_openssl + # enable http2 protocol? + addConfigureOption enable-http2 yes + # enable coroutine mysqlnd? + addConfigureOption enable-mysqlnd yes + # enable coroutine curl? + addConfigureOption enable-hook-curl yes + # enable coroutine postgres? + addConfigureOption with-postgres yes + elif test $(compareVersions "$installRemoteModule_version" 22.1.0) -ge 0; then + # enable coroutine sockets? + addConfigureOption enable-sockets $installRemoteModule_sockets + # enable openssl support? + addConfigureOption enable-openssl $installRemoteModule_openssl + # enable http2 protocol? + addConfigureOption enable-http2 yes + # enable coroutine mysqlnd? + addConfigureOption enable-mysqlnd yes + # enable coroutine curl? + addConfigureOption enable-hook-curl yes + # enable coroutine postgres? + addConfigureOption with-postgres yes + elif test $(compareVersions "$installRemoteModule_version" 22.0.0) -ge 0; then + # enable sockets supports? + addConfigureOption enable-sockets $installRemoteModule_sockets + # enable openssl support? + addConfigureOption enable-openssl $installRemoteModule_openssl + # enable http2 support? + addConfigureOption enable-http2 yes + # enable mysqlnd support? + addConfigureOption enable-mysqlnd yes + # enable hook curl support? + addConfigureOption enable-hook-curl yes + # enable postgres support? + addConfigureOption with-postgres yes + elif test $(compareVersions "$installRemoteModule_version" 4.8.0) -ge 0; then + # enable sockets supports? + addConfigureOption enable-sockets $installRemoteModule_sockets + # enable openssl support? + addConfigureOption enable-openssl $installRemoteModule_openssl + # enable http2 support? + addConfigureOption enable-http2 yes + # enable mysqlnd support? + addConfigureOption enable-mysqlnd yes # enable json support? addConfigureOption enable-swoole-json yes # enable curl support? addConfigureOption enable-swoole-curl yes - if test $(compareVersions "$installRemoteModule_version" '4.8.0') -ge 0; then - # enable postgres support? - addConfigureOption with-postgres yes - fi - else - #enable hook curl support? (v < 22.1.0) / enable coroutine curl? (v >= 22.1.0) - addConfigureOption enable-hook-curl yes - # enable postgres support? (v < 22.1.0) / enable coroutine postgres? (v >= 22.1.0) + # enable postgres support? addConfigureOption with-postgres yes + else + # enable sockets supports? + addConfigureOption enable-sockets $installRemoteModule_sockets + # enable openssl support? + addConfigureOption enable-openssl $installRemoteModule_openssl + # enable http2 support? + addConfigureOption enable-http2 yes + # enable mysqlnd support? + addConfigureOption enable-mysqlnd yes + # enable json support? + addConfigureOption enable-swoole-json yes + # enable curl support? + addConfigureOption enable-swoole-curl yes fi ;; opentelemetry) From f46554623815b4d18d7d49fb1b7f5670731991bf Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Mon, 18 Dec 2023 16:33:11 +0000 Subject: [PATCH 12/17] [skip ci] Automatically update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d116798..3719d836 100644 --- a/README.md +++ b/README.md @@ -269,7 +269,7 @@ install-php-extensions @fix_letsencrypt | odbc | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | opcache | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | opencensus | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | -| openswoole | | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | +| openswoole | | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | opentelemetry | | | | | | | | ✓ | ✓ | ✓ | ✓ | | parallel[*](#special-requirements-for-parallel) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | parle[*](#special-requirements-for-parle) | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | From 8840a6fe7609bdb86c4a505b57677af773e18433 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Tue, 19 Dec 2023 14:20:12 +0100 Subject: [PATCH 13/17] Fix installing jsonpath on php 7.4 (#858) --- install-php-extensions | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/install-php-extensions b/install-php-extensions index 0be22f0b..920637f1 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -2987,6 +2987,13 @@ installRemoteModule() { fi fi ;; + jsonpath) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -lt 800; then + installRemoteModule_version=1.0.1 + fi + fi + ;; luasandbox) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -lt 702; then From 38ed1a34266e72994e26c7b47ea1f96e5ea4720f Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Tue, 19 Dec 2023 14:25:32 +0100 Subject: [PATCH 14/17] Add support for mcrypt on PHP 8.3 (#859) --- data/supported-extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/supported-extensions b/data/supported-extensions index 56d30504..bcdb3e29 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -49,7 +49,7 @@ lz4 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 lzf 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 mailparse 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 maxminddb 7.2 7.3 7.4 8.0 8.1 8.2 8.3 -mcrypt 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 +mcrypt 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 memcache 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 memcached 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 memprof 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 From 8a3d8d2eed77670e2ab932159fb57aaa98cec341 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Tue, 19 Dec 2023 13:25:44 +0000 Subject: [PATCH 15/17] [skip ci] Automatically update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3719d836..c4c5c9b8 100644 --- a/README.md +++ b/README.md @@ -253,7 +253,7 @@ install-php-extensions @fix_letsencrypt | lzf | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | mailparse | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | maxminddb | | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | -| mcrypt | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | +| mcrypt | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | memcache | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | memcached | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | memprof[*](#special-requirements-for-memprof) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | From fb2df34f35c945ac90a7848777a40e7c61a82edb Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Tue, 19 Dec 2023 19:11:17 +0100 Subject: [PATCH 16/17] ds: add support for PHP 8.3, fix installing on PHP 7.3 (#860) * Add support for ds on PHP 8.3 * Fix installing DS on PHP 7.3 --- data/supported-extensions | 2 +- install-php-extensions | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/supported-extensions b/data/supported-extensions index bcdb3e29..5c268c70 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -13,7 +13,7 @@ csv 7.3 7.4 8.0 8.1 8.2 8.3 dba 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 ddtrace 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 decimal 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 -ds 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 +ds 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 ecma_intl 8.2 8.3 enchant 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 ev 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 diff --git a/install-php-extensions b/install-php-extensions index 920637f1..eca7df2f 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -2768,8 +2768,10 @@ installRemoteModule() { ;; ds) if test -z "$installRemoteModule_version"; then - if test $PHP_MAJMIN_VERSION -le 702; then + if test $PHP_MAJMIN_VERSION -lt 703; then installRemoteModule_version=1.3.0 + elif test $PHP_MAJMIN_VERSION -lt 704; then + installRemoteModule_version=1.4.0 fi fi ;; From fbd6d87bc42ca788dff385498babecc4b3b4d30c Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Tue, 19 Dec 2023 18:11:31 +0000 Subject: [PATCH 17/17] [skip ci] Automatically update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4c5c9b8..842d25af 100644 --- a/README.md +++ b/README.md @@ -217,7 +217,7 @@ install-php-extensions @fix_letsencrypt | dba | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ddtrace[*](#special-requirements-for-ddtrace) | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | decimal | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | -| ds | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | +| ds | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ecma_intl[*](#special-requirements-for-ecma_intl) | | | | | | | | | | ✓ | ✓ | | enchant | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ev | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |