Skip to content

658: PHP 8.6 support #667

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

Draft
asgrim wants to merge 3 commits into
base: 1.5.x
Choose a base branch
from
Draft

658: PHP 8.6 support #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccd7401
658: add PHP 8.6 support to composer.json and CI matrix
asgrim Jul 9, 2026
ec6f9b3
658: Fixing initial 8.6 issues
asgrim Jul 9, 2026
c0d501d
658: disable bundled php ext test
asgrim Jul 9, 2026
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
11 changes: 8 additions & 3 deletions .github/pie-behaviour-tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,13 @@ RUN export DEBIAN_FRONTEND="noninteractive"; \
ARG PHP_VERSION=8.4
RUN mkdir -p /usr/local/src/php; \
cd /usr/local/src/php; \
FULL_LATEST_VERSION=`curl -fsSL "https://www.php.net/releases/index.php?json&max=1&version=$PHP_VERSION" | jq -r '.[].source[]|select(.filename|endswith(".gz")).filename'`; \
wget -O php.tgz "https://www.php.net/distributions/$FULL_LATEST_VERSION" ; \
if [ "${PHP_VERSION%-dev}" != "$PHP_VERSION" ]; then \
PHP_SRC_DOWNLOAD_URL=`curl -fsSL "https://www.php.net/pre-release-builds.php?format=json" | jq -r --arg v "${PHP_VERSION%-dev}" 'to_entries[] | select(.key | startswith($v)) | .value.release.files.gz.path'` ; \
else \
FULL_LATEST_VERSION=`curl -fsSL "https://www.php.net/releases/index.php?json&max=1&version=$PHP_VERSION" | jq -r '.[].source[]|select(.filename|endswith(".gz")).filename'`; \
PHP_SRC_DOWNLOAD_URL="https://www.php.net/distributions/$FULL_LATEST_VERSION" ; \
fi; \
wget -O php.tgz "$PHP_SRC_DOWNLOAD_URL" ; \
tar zxf php.tgz ; \
rm php.tgz ; \
ls -l ; \
Expand All @@ -44,7 +49,7 @@ RUN mkdir -p /usr/local/src/php; \
RUN touch /usr/local/lib/php.ini

COPY --from=ghcr.io/php/pie:bin /pie /usr/local/bin/pie
RUN pie install xdebug/xdebug
RUN BOX_REQUIREMENT_CHECKER=0 pie install xdebug/xdebug

COPY --from=clone_ext_repo /example-pie-extension /example-pie-extension

Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
- '8.3'
- '8.4'
- '8.5'
- '8.6'
steps:
- name: Setup PHP
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 #2.37.2
Expand Down Expand Up @@ -62,6 +63,7 @@ jobs:
- '8.3'
- '8.4'
- '8.5'
#- '8.6' # @todo bundled repo doesn't support non-stable PHP versions
steps:
- name: "Purge built-in PHP version"
run: |
Expand Down Expand Up @@ -101,8 +103,15 @@ jobs:
libzip-dev
- name: "Set php-src download URL"
run: |
DIST_URL=`curl -fsSL "https://www.php.net/releases/index.php?json&max=1&version=${{ matrix.php-versions }}" | jq -r '.[].source[]|select(.filename|endswith(".gz")).filename'`
echo "php_src_download_url=https://www.php.net/distributions/$DIST_URL" >> $GITHUB_ENV
if [[ "${{ matrix.php-versions }}" == *-dev ]]; then
VERSION="${{ matrix.php-versions }}"
VERSION="${VERSION%-dev}"
DIST_URL=`curl -fsSL "https://www.php.net/pre-release-builds.php?format=json" | jq -r --arg v "$VERSION" 'to_entries[] | select(.key | startswith($v)) | .value.release.files.gz.path'`
echo "php_src_download_url=$DIST_URL" >> $GITHUB_ENV
else
DIST_URL=`curl -fsSL "https://www.php.net/releases/index.php?json&max=1&version=${{ matrix.php-versions }}" | jq -r '.[].source[]|select(.filename|endswith(".gz")).filename'`
echo "php_src_download_url=https://www.php.net/distributions/$DIST_URL" >> $GITHUB_ENV
fi
- name: "Install PHP ${{ matrix.php-versions }}"
env:
php_src_download_url: ${{ env.php_src_download_url }}
Expand Down Expand Up @@ -161,6 +170,7 @@ jobs:
- '8.3'
- '8.4'
- '8.5'
- '8.6-dev'
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #v7.0.0
with:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
}
],
"require": {
"php": "8.1.*||8.2.*||8.3.*||8.4.*||8.5.*",
"php": "8.1.*||8.2.*||8.3.*||8.4.*||8.5.*||8.6.*",
"composer/composer": "^2.10.2",
"composer/pcre": "^3.4.0",
"composer/semver": "^3.4.4",
Expand Down
4 changes: 2 additions & 2 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/Platform/TargetPlatform.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ public static function fromPhpBinaryPath(PhpBinaryPath $phpBinaryPath, int|null
case 'VS17':
$windowsCompiler = WindowsCompiler::VS17;
break;
case 'VS18':
$windowsCompiler = WindowsCompiler::VS18;
break;
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/Platform/WindowsCompiler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ enum WindowsCompiler
case VC15;
case VS16;
case VS17;
case VS18;
}
1 change: 1 addition & 0 deletions test/assets/pie_test_ext_win/php_pie_test_ext-1.2.3-8.6-ts-vs16-x86_64.dll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
only a test file
1 change: 1 addition & 0 deletions test/assets/pie_test_ext_win/php_pie_test_ext-1.2.3-8.6-ts-vs16-x86_64.pdb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
only a test file
Loading