davidl/laradock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3587 from erikn69/patch-30

Browse Source 
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
parent 9a7edaffc3 d19acec4de
commit 84be428015
7 changed files with 1872 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workspace/Dockerfile
View File

@@ -351,7 +351,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
apt-get install -yqq pkg-config php-xml php${LARADOCK_PHP_VERSION}-xml && \
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; \
@@ -1284,7 +1284,11 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apt-get install -y git && \
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 && \