Merge pull request #3587 from erikn69/patch-30

feat: Support PHP 8.4
This commit is contained in:
Shao Yu-Lung (Allen)
2025-03-07 16:13:14 +08:00
committed by GitHub
7 changed files with 1872 additions and 8 deletions

View File

@@ -220,7 +220,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# https://xdebug.org/docs/compat
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
pecl install xdebug-3.3.0; \
pecl install xdebug-3.4.1; \
else \
pecl install xdebug-3.1.6; \
fi; \
@@ -836,7 +836,11 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
cd /tmp && \
if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \
git clone https://github.com/Imagick/imagick; \
if [ ${LARADOCK_PHP_VERSION} = "8.4" ]; then \
git clone --branch develop https://github.com/Imagick/imagick; \
else \
git clone https://github.com/Imagick/imagick; \
fi; \
else \
git clone --branch ${IMAGEMAGICK_VERSION} https://github.com/Imagick/imagick; \
fi && \

1848
php-fpm/php8.4.ini Normal file

File diff suppressed because it is too large Load Diff