Skip to content

add PHP 8.5 to CI #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 21, 2025
Merged

add PHP 8.5 to CI #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4954f5f
add PHP 8.5 to CI
realFlowControl Sep 25, 2025
91388a7
fix 8.5 rc build source and update to rc2
realFlowControl Oct 21, 2025
43e21c6
fix opcache with php 8.5
realFlowControl Oct 21, 2025
688e31d
ord() does not support strings with not exactly one byte
realFlowControl Oct 21, 2025
bfb1e1a
allow php 8.5 to fail on windows, as that does not yet exists
realFlowControl Oct 21, 2025
e8f3450
remove windows tests for php 8.5 for now
realFlowControl Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/asan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
vanilla:
strategy:
matrix:
version: ["8.1", "8.2", "8.3", "8.4"]
version: ["8.1", "8.2", "8.3", "8.4", "8.5"]
if: success() || failure()
runs-on: ubuntu-latest
needs: auth
Expand All @@ -37,7 +37,7 @@ jobs:
opcache:
strategy:
matrix:
version: ["8.1", "8.2", "8.3", "8.4"]
version: ["8.1", "8.2", "8.3", "8.4", "8.5"]
if: success() || failure()
runs-on: ubuntu-latest
needs: auth
Expand All @@ -50,7 +50,7 @@ jobs:
jit:
strategy:
matrix:
version: ["8.1", "8.2", "8.3", "8.4"]
version: ["8.1", "8.2", "8.3", "8.4", "8.5"]
if: success() || failure()
runs-on: ubuntu-latest
needs: auth
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
php:
- major: 8
minor: 0
patch: 30
patch: 30
rc: ''
- major: 8
minor: 1
Expand All @@ -33,6 +33,10 @@ jobs:
minor: 4
patch: 1
rc: ''
- major: 8
minor: 5
patch: 0
rc: RC2
src:
- dist
flags:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
vanilla:
strategy:
matrix:
version: ["8.0", "8.1", "8.2", "8.3", "8.4"]
version: ["8.0", "8.1", "8.2", "8.3", "8.4", "8.5"]
build: ["gcov", "release"]
if: success() || failure()
runs-on: ubuntu-latest
Expand All @@ -48,7 +48,7 @@ jobs:
opcache:
strategy:
matrix:
version: ["8.0", "8.1", "8.2", "8.3", "8.4"]
version: ["8.0", "8.1", "8.2", "8.3", "8.4", "8.5"]
build: ["gcov", "release"]
if: success() || failure()
runs-on: ubuntu-latest
Expand All @@ -70,7 +70,7 @@ jobs:
jit:
strategy:
matrix:
version: ["8.0", "8.1", "8.2", "8.3", "8.4"]
version: ["8.0", "8.1", "8.2", "8.3", "8.4", "8.5"]
build: ["gcov", "release"]
if: success() || failure()
runs-on: ubuntu-latest
Expand Down
139 changes: 138 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,143 @@ services:
},
container_name: parallel-release-8.4,
image: ghcr.io/krakjoe/parallel-release-8.4:8.4.1,
profiles: [parallel-8.3,release],
profiles: [parallel-8.4,release],
<<: [*dev, *parallel]
}

# PHP-8.5
"php-dbg-8.5": {
build: { <<: *build,
dockerfile: docker/php.dockerfile,
args: { <<: [*ubuntu, *php],
PHP_SRC_TYPE: git,
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 5,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: rc2,
}
},
container_name: php-dbg-8.5,
image: ghcr.io/krakjoe/php-dbg-8.5:8.5.0RC2,
profiles: [php-8.5,dbg],
<<: [*dev, *parallel]
}
"php-gcov-8.5": {
build: { <<: *build,
dockerfile: docker/php.dockerfile,
args: { <<: [*ubuntu, *php],
PHP_SRC_TYPE: git,
PHP_SRC_GCOV: enable,
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 5,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: rc2,
}
},
container_name: php-gcov-8.5,
image: ghcr.io/krakjoe/php-gcov-8.5:8.5.0RC2,
profiles: [php-8.5,gcov],
<<: [*dev, *parallel]
}
"php-asan-8.5": {
build: { <<: *build,
dockerfile: docker/php.dockerfile,
args: { <<: [*ubuntu, *php],
PHP_SRC_ASAN: enable,
PHP_SRC_TYPE: git,
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 5,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: rc2,
}
},
container_name: php-asan-8.5,
image: ghcr.io/krakjoe/php-asan-8.5:8.5.0RC2,
profiles: [php-8.5,asan],
<<: [*dev, *parallel]
}
"php-release-8.5": {
build: { <<: *build,
dockerfile: docker/php.dockerfile,
args: { <<: [*ubuntu, *php],
PHP_SRC_DEBUG: disable,
PHP_SRC_TYPE: git,
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 5,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: rc2,
}
},
container_name: php-release-8.5,
image: ghcr.io/krakjoe/php-release-8.5:8.5.0RC2,
profiles: [php-8.5,release],
<<: [*dev, *parallel]
}
# parallel + PHP-8.5
"parallel-dbg-8.5": {
build: { <<: *build,
dockerfile: docker/parallel.dockerfile,
args: { <<: *php,
PHP_SRC_TYPE: dbg,
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 5,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: rc2,
}
},
container_name: parallel-dbg-8.5,
image: ghcr.io/krakjoe/parallel-dbg-8.5:8.5.0RC2,
profiles: [parallel-8.5,dbg],
<<: [*dev, *parallel]
}
"parallel-gcov-8.5": {
build: { <<: *build,
dockerfile: docker/parallel.dockerfile,
args: { <<: *php,
PHP_SRC_TYPE: gcov,
PHP_SRC_GCOV: enable,
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 5,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: rc2,
}
},
container_name: parallel-gcov-8.5,
image: ghcr.io/krakjoe/parallel-gcov-8.5:8.5.0RC2,
profiles: [parallel-8.5,gcov],
<<: [*dev, *parallel]
}
"parallel-asan-8.5": {
build: { <<: *build,
dockerfile: docker/parallel.dockerfile,
args: { <<: *php,
PHP_SRC_ASAN: enable,
PHP_SRC_TYPE: asan,
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 5,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: rc2,
}
},
container_name: parallel-asan-8.5,
image: ghcr.io/krakjoe/parallel-asan-8.5:8.5.0RC2,
profiles: [parallel-8.5,asan],
<<: [*dev, *parallel]
}
"parallel-release-8.5": {
build: { <<: *build,
dockerfile: docker/parallel.dockerfile,
args: { <<: *php,
PHP_SRC_DEBUG: disable,
PHP_SRC_TYPE: release,
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 5,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: rc2,
}
},
container_name: parallel-release-8.5,
image: ghcr.io/krakjoe/parallel-release-8.5:8.5.0RC2,
profiles: [parallel-8.5,release],
<<: [*dev, *parallel]
}
5 changes: 3 additions & 2 deletions docker/php.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ RUN mkdir -p /opt/src
RUN mkdir -p /opt/bin
RUN mkdir -p /opt/etc

ADD docker/php.src /opt/bin
ADD --chmod=755 docker/php.src /opt/bin
ADD --chmod=755 docker/php.opcache.sh /opt/bin

RUN /opt/bin/php.src $PHP_SRC_TYPE $PHP_VERSION_MAJOR $PHP_VERSION_MINOR $PHP_VERSION_PATCH $PHP_VERSION_RC

Expand Down Expand Up @@ -50,7 +51,7 @@ RUN mkdir -p /opt/etc/php.d

ENV PATH=/opt/bin:$PATH

RUN echo "zend_extension=opcache.so" > /opt/etc/php.d/opcache.ini
RUN /opt/bin/php.opcache.sh $PHP_VERSION_MAJOR $PHP_VERSION_MINOR

RUN php -v

Expand Down
17 changes: 17 additions & 0 deletions docker/php.opcache.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

# Script to conditionally configure opcache based on PHP version
# In PHP 8.5+, opcache is built-in and doesn't need to be loaded as an extension

PHP_VERSION_MAJOR=$1
PHP_VERSION_MINOR=$2

# Compare version: if PHP < 8.5, load opcache as extension
if [ "$PHP_VERSION_MAJOR" -lt 8 ] || ([ "$PHP_VERSION_MAJOR" -eq 8 ] && [ "$PHP_VERSION_MINOR" -lt 5 ]); then
echo "PHP ${PHP_VERSION_MAJOR}.${PHP_VERSION_MINOR}: Loading opcache as zend_extension"
echo "zend_extension=opcache.so" > /opt/etc/php.d/opcache.ini
else
echo "PHP ${PHP_VERSION_MAJOR}.${PHP_VERSION_MINOR}: Opcache is built-in, not loading as extension"
# Create empty file to avoid any issues with missing config
touch /opt/etc/php.d/opcache.ini
fi
14 changes: 11 additions & 3 deletions docker/php.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@

case $1 in
dist)
wget https://www.php.net/distributions/php-$2.$3.$4$5.tar.gz \
-O /opt/src/php-$2.$3.$4$5.tar.gz
tar -C /opt/src -xf opt/src/php-$2.$3.$4$5.tar.gz
if [[ $5 == RC* ]]; then
# RC releases may be hosted at different locations (e.g., downloads.php.net/~edorian/)
wget https://downloads.php.net/~edorian/php-$2.$3.$4$5.tar.gz \
-O /opt/src/php-$2.$3.$4$5.tar.gz
tar -C /opt/src -xf /opt/src/php-$2.$3.$4$5.tar.gz
else
# Stable releases are in the distributions folder
wget https://www.php.net/distributions/php-$2.$3.$4$5.tar.gz \
-O /opt/src/php-$2.$3.$4$5.tar.gz
tar -C /opt/src -xf /opt/src/php-$2.$3.$4$5.tar.gz
fi
ln -s /opt/src/php-$2.$3.$4$5 /opt/src/php-src
;;
git)
Expand Down
4 changes: 2 additions & 2 deletions tests/base/063.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ $ch = Channel::make("sv", 3);

for ($i=0;$i<3;$i++){
$sarr[$i]->run(function() use($ch) {
$functions = array("addslashes", "chunk_split", "metaphone", "strip_tags", "md5", "sha1", "strtoupper", "strtolower", "strrev", "strlen", "soundex", "ord");
$functions = array("addslashes", "chunk_split", "metaphone", "strip_tags", "md5", "sha1", "strtoupper", "strtolower", "strrev", "strlen", "soundex");
$string = "the quick brown fox jumps over the lazy dog";

for ($i = 0; $i < 4000; $i++) {
foreach ($functions as $function) {
call_user_func_array($function, array($string));
Expand Down