Merge pull request #1 from sebcode/feature/add-php-84

docker-library · Nov 28, 2024 · 29ce2cf · 29ce2cf
2 parents b8b31b7 + 6ac4121
commit 29ce2cf
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 0 deletions.
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -95,6 +95,12 @@ RUN set -ex; \
 	curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \
 	echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \
 	tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \
+{{ if env.phpVersion == "8.4" then ( -}}
+	# Apply patch from this PR https://github.com/Imagick/imagick/pull/690
+	sed -i 's/php_strtolower/zend_str_tolower/g' /tmp/imagick-3.7.0/imagick.c; \
+	# Fix error "Parameter format has null default, but is not nullable"
+	sed -i 's/string \$format = null$/string|null \$format = null/' /tmp/imagick-3.7.0/Imagick.stub.php; \
+{{ ) else "" end -}}
 	grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \
 	test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \
 	sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \

diff --git a/beta/php8.4/apache/Dockerfile b/beta/php8.4/apache/Dockerfile
diff --git a/beta/php8.4/fpm-alpine/Dockerfile b/beta/php8.4/fpm-alpine/Dockerfile
diff --git a/beta/php8.4/fpm/Dockerfile b/beta/php8.4/fpm/Dockerfile
diff --git a/cli/php8.4/alpine/Dockerfile b/cli/php8.4/alpine/Dockerfile
diff --git a/latest/php8.4/apache/Dockerfile b/latest/php8.4/apache/Dockerfile
diff --git a/latest/php8.4/fpm-alpine/Dockerfile b/latest/php8.4/fpm-alpine/Dockerfile
diff --git a/latest/php8.4/fpm/Dockerfile b/latest/php8.4/fpm/Dockerfile