Skip to content

Commit c14ef79

Browse files
authored
Merge pull request #20 from flownative/task/php-8.2
Add PHP 8.2 to build setup
2 parents 1ff53e0 + 1d2d3f7 commit c14ef79

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

.github/workflows/docker.build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
build:
1313
strategy:
1414
matrix:
15-
php: [ 7.4.33, 8.0.26, 8.1.13 ]
15+
php: [ 7.4.33, 8.0.26, 8.1.13, 8.2.0 ]
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ similar mechanism in Kubernetes or your actual platform.
6868
| Variable Name | Type | Default | Description |
6969
| ----------------------- | ------- | -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
7070
| PHP_BASE_PATH | string | /opt/flownative/php | Base path for PHP (read-only) |
71-
| PHP_DATE_TIMEZONE | string | | Default timezone ([doc](https://www.php.net/manual/en/datetime.configuration.php#ini.date.timezone)) |
71+
| PHP_DATE_TIMEZONE | string | UTC | Default timezone ([doc](https://www.php.net/manual/en/datetime.configuration.php#ini.date.timezone)) |
7272
| PHP_ERROR_REPORTING | string | 2147483647 | PHP error reporting log levels ([doc](https://www.php.net/manual/en/errorfunc.configuration.php#ini.error-reporting)) |
7373
| PHP_DISPLAY_ERRORS | string | off | Display PHP errors ([doc](https://www.php.net/manual/en/errorfunc.configuration.php#ini.display-errors)) |
7474
| PHP_ERROR_LOG | string | /dev/stderr | Path leading to the file where PHP errors should be logged |

root-files/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ build_compile_php() {
177177
--with-bz2 \
178178
--without-pear \
179179
>$(debug_device)
180-
elif [[ "${PHP_VERSION}" =~ ^8.[0-1] ]]; then
180+
elif [[ "${PHP_VERSION}" =~ ^8.[0-2] ]]; then
181181
./configure \
182182
--prefix=${PHP_BASE_PATH} \
183183
--with-config-file-path="${PHP_BASE_PATH}/etc" \
@@ -211,7 +211,7 @@ build_compile_php() {
211211
--without-pear \
212212
>$(debug_device)
213213
else
214-
error "🛠 Unsupported PHP version ${PHP_VERSION}"
214+
error "🛠 No configure call available for PHP version ${PHP_VERSION}"
215215
exit 1
216216
fi
217217

@@ -430,7 +430,7 @@ case $1 in
430430
init)
431431
banner_flownative 'PHP'
432432

433-
if [[ ! "${PHP_VERSION}" =~ ^7.[1-4]|^8.[0-1] ]]; then
433+
if [[ ! "${PHP_VERSION}" =~ ^7.[1-4]|^8.[0-2] ]]; then
434434
error "🛠 Unsupported PHP version '${PHP_VERSION}'"
435435
exit 1
436436
fi

root-files/opt/flownative/lib/php-fpm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export PHP_TMP_PATH="${PHP_TMP_PATH:-${PHP_BASE_PATH}/tmp}"
2727
export PHP_LOG_PATH="${PHP_LOG_PATH:-${PHP_BASE_PATH}/log}"
2828
2929
export PHP_MEMORY_LIMIT="${PHP_MEMORY_LIMIT:-750M}"
30-
export PHP_DATE_TIMEZONE="${PHP_DATE_TIMEZONE:-}"
30+
export PHP_DATE_TIMEZONE="${PHP_DATE_TIMEZONE:-UTC}"
3131
export PHP_DISPLAY_ERRORS="${PHP_DISPLAY_ERRORS:-off}"
3232
export PHP_ERROR_REPORTING="${PHP_ERROR_REPORTING:-2147483647}"
3333
export PHP_ERROR_LOG="${PHP_ERROR_LOG:-/dev/stderr}"

root-files/opt/flownative/php/build/extensions/xdebug/xdebug.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ extensions_xdebug_runtime_packages() {
3838
# @return string
3939
#
4040
extensions_xdebug_url() {
41-
if [[ "${PHP_VERSION}" =~ ^8 ]]; then
41+
if [[ "${PHP_VERSION}" =~ ^8.2 ]]; then
42+
echo "https://xdebug.org/files/xdebug-3.2.0.tgz"
43+
elif [[ "${PHP_VERSION}" =~ ^8 ]]; then
4244
echo "https://xdebug.org/files/xdebug-3.1.6.tgz"
4345
else
4446
echo "https://xdebug.org/files/xdebug-2.9.8.tgz"

0 commit comments

Comments
 (0)