Skip to content

Commit 37a7e9d

Browse files
committed
Merge branch '4.3.x' into 4.4.x
* 4.3.x: Remove fail fast Run CI on PHP 8.5 (#7219) PDOConnect::doConnect hide sensitive parameters (#7214)
2 parents 67c06eb + 05f3985 commit 37a7e9d

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
php-version:
4545
- "8.3"
4646
- "8.4"
47+
- "8.5"
4748
dependency-versions:
4849
- "highest"
4950
extension:
@@ -55,7 +56,7 @@ jobs:
5556
dependency-versions: "lowest"
5657
extension: "pdo_sqlite"
5758
- os: "ubuntu-24.04"
58-
php-version: "8.4"
59+
php-version: "8.5"
5960
dependency-versions: "highest"
6061
extension: "sqlite3"
6162
- os: "ubuntu-22.04"
@@ -76,6 +77,8 @@ jobs:
7677
strategy:
7778
matrix:
7879
php-version:
80+
# TODO: Switch to PHP 8.5
81+
# see https://github.com/shivammathur/setup-php/issues/1028
7982
- "8.4"
8083
oracle-version:
8184
- "18"
@@ -91,6 +94,9 @@ jobs:
9194
- php-version: '8.2'
9295
oracle-version: '23'
9396
extension: pdo_oci
97+
- php-version: "8.5"
98+
oracle-version: "23"
99+
extension: oci8
94100

95101
phpunit-postgres:
96102
name: "PHPUnit with PostgreSQL"
@@ -108,6 +114,7 @@ jobs:
108114
php-version:
109115
- "8.3"
110116
- "8.4"
117+
- "8.5"
111118
postgres-locale-provider:
112119
- "libc"
113120
postgres-version:
@@ -148,6 +155,7 @@ jobs:
148155
php-version:
149156
- "8.3"
150157
- "8.4"
158+
- "8.5"
151159
mariadb-version:
152160
# keep in sync with https://mariadb.org/about/#maintenance-policy
153161
- "10.4" # Oldest version supported by DBAL, LTS (Jun 2024) We have code specific to 10.4.3-10.5.2
@@ -187,6 +195,7 @@ jobs:
187195
php-version:
188196
- "8.3"
189197
- "8.4"
198+
- "8.5"
190199
mysql-version:
191200
- "5.7"
192201
- "8.0" # We have code specific to ^8.0
@@ -223,6 +232,7 @@ jobs:
223232
- "8.2"
224233
- "8.3"
225234
- "8.4"
235+
- "8.5"
226236
extension:
227237
- "sqlsrv"
228238
- "pdo_sqlsrv"
@@ -247,6 +257,7 @@ jobs:
247257
matrix:
248258
php-version:
249259
- "8.2"
260+
# TODO: Running the tests on PHP 8.5 causes a seqfault. Switch as soon as this is fixed.
250261
- "8.4"
251262

252263
development-deps:
@@ -256,7 +267,7 @@ jobs:
256267
strategy:
257268
matrix:
258269
php-version:
259-
- "8.4"
270+
- "8.5"
260271

261272
steps:
262273
- name: "Checkout"

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
php-version:
17-
- "8.3"
17+
- "8.5"
1818
mariadb-version:
1919
- "earliest"
2020
- "verylatest"

src/Driver/PDO/PDOConnect.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Doctrine\DBAL\Driver\PDO;
66

77
use PDO;
8+
use SensitiveParameter;
89

910
use const PHP_VERSION_ID;
1011

@@ -13,8 +14,10 @@ trait PDOConnect
1314
{
1415
/** @param array<int, mixed> $options */
1516
private function doConnect(
17+
#[SensitiveParameter]
1618
string $dsn,
1719
string $username,
20+
#[SensitiveParameter]
1821
string $password,
1922
array $options,
2023
): PDO {

0 commit comments

Comments
 (0)