Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 986ce2c

Browse files
alcaeusremicollet
andauthored
PHPC-2617: Support PHP 8.5 (#1871)
* PHPC-2617: Run Github Actions tests on PHP 8.5 * Remove usage of setAccessible in tests * Remove non-canonical cast * Update setup-php-sdk to enable PHP 8.5 builds * Package windows extensions for PHP 8.5 * Don't coerce NAN values to strings due to warnings * use ZSTR_IS_INTERNED() (#1849) --------- Co-authored-by: Remi Collet <remi@remirepo.net>
1 parent ec936b9 commit 986ce2c

15 files changed

+12
-22
lines changed

‎.github/actions/windows/prepare-build/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ runs:
2222
steps:
2323
- name: Setup PHP SDK
2424
id: setup-php
25-
uses: php/setup-php-sdk@v0.10
25+
uses: php/setup-php-sdk@v0.11
2626
with:
2727
version: ${{ inputs.version }}
2828
arch: ${{ inputs.arch }}

‎.github/workflows/package-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,6 @@ jobs:
9898
fail-fast: false
9999
matrix:
100100
# Note: keep this in sync with the Windows matrix in tests.yml
101-
php: [ "8.1", "8.2", "8.3", "8.4" ]
101+
php: [ "8.1", "8.2", "8.3", "8.4", "8.5" ]
102102
arch: [ x64, x86 ]
103103
ts: [ ts, nts ]

‎.github/workflows/tests.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
- "8.2"
2626
- "8.3"
2727
- "8.4"
28+
- "8.5"
2829
mongodb-version:
2930
- "6.0"
3031
topology:
@@ -125,6 +126,6 @@ jobs:
125126
fail-fast: false
126127
matrix:
127128
# Note: keep this in sync with the Windows matrix in package-release.yml
128-
php: [ "8.1", "8.2", "8.3", "8.4" ]
129+
php: [ "8.1", "8.2", "8.3", "8.4", "8.5" ]
129130
arch: [ x64, x86 ]
130131
ts: [ ts, nts ]

‎src/contrib/php_array_api.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ char *php_array_zval_to_string(zval *z, int *plen, zend_bool *pfree) {
350350
zval c = *z;
351351
zval_copy_ctor(&c);
352352
convert_to_string(&c);
353-
*pfree = ! IS_INTERNED(Z_STR(c));
353+
*pfree = ! ZSTR_IS_INTERNED(Z_STR(c));
354354
*plen = Z_STRLEN(c);
355355
return Z_STRVAL(c);
356356
}

‎tests/bson/bson-decimal128-002.phpt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ MongoDB\BSON\Decimal128 NaN values
44
<?php
55

66
$tests = [
7-
acos(8),
8-
NAN,
97
'nan',
108
'Nan',
119
'NaN',
@@ -24,6 +22,4 @@ NaN
2422
NaN
2523
NaN
2624
NaN
27-
NaN
28-
NaN
2925
===DONE===

‎tests/bson/bson-decimal128-004.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ MongoDB\BSON\Decimal128 debug handler
44
<?php
55

66
$tests = [
7-
1234.5678,
8-
NAN,
9-
INF,
7+
'1234.5678',
8+
'NAN',
9+
'INF',
1010
];
1111

1212
foreach ($tests as $test) {

‎tests/bson/bson-decimal128-serialization-002.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ MongoDB\BSON\Decimal128 serialization (__serialize and __unserialize)
66
$tests = [
77
'1234.5678',
88
'-1234.5678',
9-
1234.56e-78,
10-
INF,
11-
NAN,
9+
'1234.56e-78',
10+
'INF',
11+
'NAN',
1212
];
1313

1414
foreach ($tests as $value) {

‎tests/exception/bulkwriteexception-haserrorlabel-001.phpt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ $labels = ['test', 'foo'];
99
$reflection = new ReflectionClass($exception);
1010

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

1514
var_dump($exception->hasErrorLabel('foo'));

‎tests/exception/bulkwriteexception-haserrorlabel_error-001.phpt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ $labels = 'shouldBeAnArray';
99
$reflection = new ReflectionClass($exception);
1010

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

1514
var_dump($exception->hasErrorLabel('bar'));

‎tests/exception/commandexception-getresultdocument-001.phpt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ $resultDocument = (object) ['x' => 1];
99
$reflection = new ReflectionClass($exception);
1010

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

1514
var_dump($resultDocument === $exception->getResultDocument());

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /