Skip to content

PHPC-2617: Support PHP 8.5 #1871

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 7 commits into from
Sep 25, 2025
Merged

PHPC-2617: Support PHP 8.5 #1871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d2e2415
PHPC-2617: Run Github Actions tests on PHP 8.5
alcaeus Sep 16, 2025
dbcb789
Remove usage of setAccessible in tests
alcaeus Sep 16, 2025
c41c003
Remove non-canonical cast
alcaeus Sep 16, 2025
117fd6e
Update setup-php-sdk to enable PHP 8.5 builds
alcaeus Sep 19, 2025
1ba1732
Package windows extensions for PHP 8.5
alcaeus Sep 24, 2025
5583766
Don't coerce NAN values to strings due to warnings
alcaeus Sep 24, 2025
8349a73
use ZSTR_IS_INTERNED() (#1849)
remicollet Jul 18, 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
2 changes: 1 addition & 1 deletion .github/actions/windows/prepare-build/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ runs:
steps:
- name: Setup PHP SDK
id: setup-php
uses: php/setup-php-sdk@v0.10
uses: php/setup-php-sdk@v0.11
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noted that v0.11 added support for PHP 8.5.

with:
version: ${{ inputs.version }}
arch: ${{ inputs.arch }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,6 @@ jobs:
fail-fast: false
matrix:
# Note: keep this in sync with the Windows matrix in tests.yml
php: [ "8.1", "8.2", "8.3", "8.4" ]
php: [ "8.1", "8.2", "8.3", "8.4", "8.5" ]
arch: [ x64, x86 ]
ts: [ ts, nts ]
3 changes: 2 additions & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
- "8.2"
- "8.3"
- "8.4"
- "8.5"
mongodb-version:
- "6.0"
topology:
Expand Down Expand Up @@ -125,6 +126,6 @@ jobs:
fail-fast: false
matrix:
# Note: keep this in sync with the Windows matrix in package-release.yml
php: [ "8.1", "8.2", "8.3", "8.4" ]
php: [ "8.1", "8.2", "8.3", "8.4", "8.5" ]
arch: [ x64, x86 ]
ts: [ ts, nts ]
2 changes: 1 addition & 1 deletion src/contrib/php_array_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ char *php_array_zval_to_string(zval *z, int *plen, zend_bool *pfree) {
zval c = *z;
zval_copy_ctor(&c);
convert_to_string(&c);
*pfree = ! IS_INTERNED(Z_STR(c));
*pfree = ! ZSTR_IS_INTERNED(Z_STR(c));
*plen = Z_STRLEN(c);
return Z_STRVAL(c);
}
Expand Down
4 changes: 0 additions & 4 deletions tests/bson/bson-decimal128-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ MongoDB\BSON\Decimal128 NaN values
<?php

$tests = [
acos(8),
NAN,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per our earlier Slack conversation, you opted to remove any Decimal128 test cases that depended on type-coercion. I have no objections here, as the documentation has always indicated that the constructor expects a string value.

I wasn't able to find any mention of the type-coercion behavioral change in PHP 8.5's UPGRADING file. If you happen to find the change responsible for this I'd be interested in seeing it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The offending commit is php/php-src@320fe29, which is the result of the large PHP 8.5 deprecation vote.

'nan',
'Nan',
'NaN',
Expand All @@ -24,6 +22,4 @@ NaN
NaN
NaN
NaN
NaN
NaN
===DONE===
6 changes: 3 additions & 3 deletions tests/bson/bson-decimal128-004.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ MongoDB\BSON\Decimal128 debug handler
<?php

$tests = [
1234.5678,
NAN,
INF,
'1234.5678',
'NAN',
'INF',
];

foreach ($tests as $test) {
Expand Down
6 changes: 3 additions & 3 deletions tests/bson/bson-decimal128-serialization-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ MongoDB\BSON\Decimal128 serialization (__serialize and __unserialize)
$tests = [
'1234.5678',
'-1234.5678',
1234.56e-78,
INF,
NAN,
'1234.56e-78',
'INF',
'NAN',
];

foreach ($tests as $value) {
Expand Down
1 change: 0 additions & 1 deletion tests/exception/bulkwriteexception-haserrorlabel-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $labels = ['test', 'foo'];
$reflection = new ReflectionClass($exception);

$resultDocumentProperty = $reflection->getProperty('errorLabels');
$resultDocumentProperty->setAccessible(true);
$resultDocumentProperty->setValue($exception, $labels);

var_dump($exception->hasErrorLabel('foo'));
Expand Down
1 change: 0 additions & 1 deletion tests/exception/bulkwriteexception-haserrorlabel_error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $labels = 'shouldBeAnArray';
$reflection = new ReflectionClass($exception);

$resultDocumentProperty = $reflection->getProperty('errorLabels');
$resultDocumentProperty->setAccessible(true);
$resultDocumentProperty->setValue($exception, $labels);

var_dump($exception->hasErrorLabel('bar'));
Expand Down
1 change: 0 additions & 1 deletion tests/exception/commandexception-getresultdocument-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $resultDocument = (object) ['x' => 1];
$reflection = new ReflectionClass($exception);

$resultDocumentProperty = $reflection->getProperty('resultDocument');
$resultDocumentProperty->setAccessible(true);
$resultDocumentProperty->setValue($exception, $resultDocument);

var_dump($resultDocument === $exception->getResultDocument());
Expand Down
1 change: 0 additions & 1 deletion tests/exception/commandexception-haserrorlabel-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $labels = ['test', 'foo'];
$reflection = new ReflectionClass($exception);

$resultDocumentProperty = $reflection->getProperty('errorLabels');
$resultDocumentProperty->setAccessible(true);
$resultDocumentProperty->setValue($exception, $labels);

var_dump($exception->hasErrorLabel('foo'));
Expand Down
1 change: 0 additions & 1 deletion tests/exception/commandexception-haserrorlabel_error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $labels = 'shouldBeAnArray';
$reflection = new ReflectionClass($exception);

$resultDocumentProperty = $reflection->getProperty('errorLabels');
$resultDocumentProperty->setAccessible(true);
$resultDocumentProperty->setValue($exception, $labels);

var_dump($exception->hasErrorLabel('bar'));
Expand Down
1 change: 0 additions & 1 deletion tests/exception/runtimeexception-haserrorlabel-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $labels = ['test', 'foo'];
$reflection = new ReflectionClass($exception);

$resultDocumentProperty = $reflection->getProperty('errorLabels');
$resultDocumentProperty->setAccessible(true);
$resultDocumentProperty->setValue($exception, $labels);

var_dump($exception->hasErrorLabel('foo'));
Expand Down
1 change: 0 additions & 1 deletion tests/exception/runtimeexception-haserrorlabel_error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $labels = 'shouldBeAnArray';
$reflection = new ReflectionClass($exception);

$resultDocumentProperty = $reflection->getProperty('errorLabels');
$resultDocumentProperty->setAccessible(true);
$resultDocumentProperty->setValue($exception, $labels);

var_dump($exception->hasErrorLabel('bar'));
Expand Down
2 changes: 1 addition & 1 deletion tests/server/server-construct-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $bulk->insert(array('foo' => 'bar'));
$server = $manager->executeBulkWrite(NS, $bulk)->getServer();

$expectedHost = $parsed['host'];
$expectedPort = (integer) (isset($parsed['port']) ? $parsed['port'] : 27017);
$expectedPort = (int) (isset($parsed['port']) ? $parsed['port'] : 27017);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noted: https://github.com/php/php-src/blob/84ec65c5992045a52643dcb674f0d694be58e3ab/UPGRADING#L364


var_dump($server->getHost() == $expectedHost);
var_dump($server->getPort() == $expectedPort);
Expand Down