Skip to content

Commit 8aa9165

Browse files
committed
Merge branch '4.3.x' into 5.0.x
* 4.3.x: Reintroduce PHP 8.2 support (#6901) Mark ComparatorConfig::getReportModifiedIndexes() as internal
2 parents fd7d3e1 + 58adcc2 commit 8aa9165

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
os:
3838
- "ubuntu-22.04"
3939
php-version:
40+
- "8.3"
4041
- "8.4"
4142
- "8.5"
4243
dependencies:
@@ -46,7 +47,7 @@ jobs:
4647
- "pdo_sqlite"
4748
include:
4849
- os: "ubuntu-20.04"
49-
php-version: "8.3"
50+
php-version: "8.2"
5051
dependencies: "lowest"
5152
extension: "pdo_sqlite"
5253
- os: "ubuntu-22.04"
@@ -106,7 +107,7 @@ jobs:
106107
- "21"
107108
- "23"
108109
include:
109-
- php-version: "8.3"
110+
- php-version: "8.2"
110111
oracle-version: "23"
111112
- php-version: "8.5"
112113
oracle-version: "23"
@@ -166,7 +167,7 @@ jobs:
166167
- "21"
167168
- "23"
168169
include:
169-
- php-version: "8.3"
170+
- php-version: "8.2"
170171
oracle-version: "23"
171172
- php-version: "8.5"
172173
oracle-version: "23"
@@ -220,6 +221,7 @@ jobs:
220221
strategy:
221222
matrix:
222223
php-version:
224+
- "8.3"
223225
- "8.4"
224226
postgres-locale-provider:
225227
- "libc"
@@ -231,10 +233,10 @@ jobs:
231233
- "pgsql"
232234
- "pdo_pgsql"
233235
include:
234-
- php-version: "8.3"
236+
- php-version: "8.2"
235237
postgres-version: "17"
236238
extension: "pgsql"
237-
- php-version: "8.3"
239+
- php-version: "8.2"
238240
postgres-version: "17"
239241
extension: "pdo_pgsql"
240242
- php-version: "8.5"
@@ -297,6 +299,7 @@ jobs:
297299
strategy:
298300
matrix:
299301
php-version:
302+
- "8.3"
300303
- "8.4"
301304
mariadb-version:
302305
# keep in sync with https://mariadb.org/about/#maintenance-policy
@@ -308,10 +311,10 @@ jobs:
308311
- "mysqli"
309312
- "pdo_mysql"
310313
include:
311-
- php-version: "8.3"
314+
- php-version: "8.2"
312315
mariadb-version: "11.4"
313316
extension: "mysqli"
314-
- php-version: "8.3"
317+
- php-version: "8.2"
315318
mariadb-version: "11.4"
316319
extension: "pdo_mysql"
317320
- php-version: "8.5"
@@ -370,6 +373,7 @@ jobs:
370373
strategy:
371374
matrix:
372375
php-version:
376+
- "8.3"
373377
- "8.4"
374378
mysql-version:
375379
- "8.0"
@@ -381,10 +385,10 @@ jobs:
381385
- ""
382386
include:
383387
- config-file-suffix: "-tls"
384-
php-version: "8.3"
388+
php-version: "8.2"
385389
mysql-version: "9.1"
386390
extension: "mysqli"
387-
- php-version: "8.3"
391+
- php-version: "8.2"
388392
mysql-version: "9.1"
389393
extension: "mysqli"
390394
- php-version: "8.5"
@@ -447,6 +451,7 @@ jobs:
447451
strategy:
448452
matrix:
449453
php-version:
454+
- "8.2"
450455
- "8.3"
451456
- "8.4"
452457
- "8.5"
@@ -457,10 +462,10 @@ jobs:
457462
- "Latin1_General_100_CI_AS_SC_UTF8"
458463
include:
459464
- collation: "Latin1_General_100_CS_AS_SC_UTF8"
460-
php-version: "8.3"
465+
php-version: "8.2"
461466
extension: "sqlsrv"
462467
- collation: "Latin1_General_100_CS_AS_SC_UTF8"
463-
php-version: "8.3"
468+
php-version: "8.2"
464469
extension: "pdo_sqlsrv"
465470

466471
services:
@@ -514,6 +519,7 @@ jobs:
514519
strategy:
515520
matrix:
516521
php-version:
522+
- "8.2"
517523
- "8.3"
518524
- "8.4"
519525
- "8.5"

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
{"name": "Jonathan Wage", "email": "[email protected]"}
3232
],
3333
"require": {
34-
"php": "^8.3",
34+
"php": "^8.2",
3535
"doctrine/deprecations": "^0.5.3|^1",
3636
"psr/cache": "^1|^2|^3",
3737
"psr/log": "^1|^2|^3"

0 commit comments

Comments
 (0)