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

2
.env.example
View File

@@ -38,7 +38,7 @@ COMPOSE_PROJECT_NAME=laradock
### PHP Version ###########################################
# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
# Accepted values: 8.3 - 8.2 - 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
# Accepted values: 8.4 - 8.3 - 8.2 - 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
PHP_VERSION=8.3
### Phalcon Version ###########################################

2
.github/workflows/main-ci.yml vendored
View File

@@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php_version: [ "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3" ]
php_version: [ "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
service: [ php-fpm, php-worker, workspace ]
steps:
- uses: actions/checkout@v4

6
laravel-horizon/Dockerfile
View File

@@ -108,7 +108,11 @@ RUN set -eux; \
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 && \

8
php-fpm/Dockerfile
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
View File

File diff suppressed because it is too large Load Diff

6
php-worker/Dockerfile
View File

@@ -120,7 +120,11 @@ RUN set -eux; \
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 && \

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 && \