Skip to content

Commit 29ce2cf

Browse files
author
Tobias Hüske
authored
Merge pull request #1 from sebcode/feature/add-php-84
2 parents b8b31b7 + 6ac4121 commit 29ce2cf

File tree

8 files changed

+34
-0
lines changed

8 files changed

+34
-0
lines changed

Dockerfile.template

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@ RUN set -ex; \
9595
curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \
9696
echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \
9797
tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \
98+
{{ if env.phpVersion == "8.4" then ( -}}
99+
# Apply patch from this PR https://github.com/Imagick/imagick/pull/690
100+
sed -i 's/php_strtolower/zend_str_tolower/g' /tmp/imagick-3.7.0/imagick.c; \
101+
# Fix error "Parameter format has null default, but is not nullable"
102+
sed -i 's/string \$format = null$/string|null \$format = null/' /tmp/imagick-3.7.0/Imagick.stub.php; \
103+
{{ ) else "" end -}}
98104
grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \
99105
test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \
100106
sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \

beta/php8.4/apache/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.4/fpm-alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.4/fpm/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cli/php8.4/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php8.4/apache/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php8.4/fpm-alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php8.4/fpm/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)