Skip to content

Commit 79b257b

Browse files
committed
Merge branch '4.1.x' into 4.2.x
* 4.1.x: Bump doctrine/.github from 5.1.0 to 5.2.0 (#6534) Fix broken link Setup documentation workflow Add cli-tools tools document to the TOC Avoid custom directives Mark sidebar as orphan ci: Run tests with PHP 8.4 (#6528) Bump GitHub actions (#6527)
2 parents 0e81fa2 + 1c4fb00 commit 79b257b

File tree

7 files changed

+88
-45
lines changed

7 files changed

+88
-45
lines changed

.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ updates:
66
interval: "weekly"
77
labels:
88
- "CI"
9-
target-branch: "3.8.x"
9+
target-branch: "3.9.x"

.github/workflows/coding-standards.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ on:
2525
jobs:
2626
coding-standards:
2727
name: "Coding Standards"
28-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.1"
28+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0"

.github/workflows/continuous-integration.yml

+28
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
- "8.1"
4141
- "8.2"
4242
- "8.3"
43+
- "8.4"
4344
dependencies:
4445
- "highest"
4546
extension:
@@ -107,6 +108,9 @@ jobs:
107108
- "18"
108109
- "21"
109110
- "23"
111+
include:
112+
- php-version: "8.4"
113+
oracle-version: "23"
110114

111115
services:
112116
oracle:
@@ -164,6 +168,9 @@ jobs:
164168
- "18"
165169
- "21"
166170
- "23"
171+
include:
172+
- php-version: "8.4"
173+
oracle-version: "23"
167174

168175
services:
169176
oracle:
@@ -227,6 +234,13 @@ jobs:
227234
postgres-version: "16"
228235
extension: "pgsql"
229236
- php-version: "8.3"
237+
postgres-version: "16"
238+
extension: "pgsql"
239+
- php-version: "8.4"
240+
postgres-version: "16"
241+
extension: "pgsql"
242+
extension: "pdo_pgsql"
243+
- php-version: "8.4"
230244
postgres-version: "16"
231245
extension: "pdo_pgsql"
232246

@@ -299,6 +313,12 @@ jobs:
299313
- php-version: "8.3"
300314
mariadb-version: "11.4"
301315
extension: "pdo_mysql"
316+
- php-version: "8.4"
317+
mariadb-version: "11.4"
318+
extension: "mysqli"
319+
- php-version: "8.4"
320+
mariadb-version: "11.4"
321+
extension: "pdo_mysql"
302322

303323
services:
304324
mariadb:
@@ -381,6 +401,12 @@ jobs:
381401
extension: "pdo_mysql"
382402
custom-entrypoint: >-
383403
--entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
404+
- php-version: "8.4"
405+
mysql-version: "9.0"
406+
extension: "mysqli"
407+
- php-version: "8.4"
408+
mysql-version: "9.0"
409+
extension: "pdo_mysql"
384410

385411
services:
386412
mysql:
@@ -438,6 +464,7 @@ jobs:
438464
- "8.1"
439465
- "8.2"
440466
- "8.3"
467+
- "8.4"
441468
extension:
442469
- "sqlsrv"
443470
- "pdo_sqlsrv"
@@ -505,6 +532,7 @@ jobs:
505532
- "8.1"
506533
- "8.2"
507534
- "8.3"
535+
- "8.4"
508536

509537
services:
510538
ibm_db2:

.github/workflows/documentation.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: "Documentation"
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "*.x"
7+
paths:
8+
- ".github/workflows/documentation.yml"
9+
- "docs/**"
10+
push:
11+
branches:
12+
- "*.x"
13+
paths:
14+
- ".github/workflows/documentation.yml"
15+
- "docs/**"
16+
17+
jobs:
18+
documentation:
19+
name: "Documentation"
20+
uses: "doctrine/.github/.github/workflows/[email protected]"

.github/workflows/release-on-milestone-closed.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: "actions/checkout@v4"
1616

1717
- name: "Release"
18-
uses: "laminas/automatic-releases@1.24.0"
18+
uses: "laminas/automatic-releases@1.25.0"
1919
with:
2020
command-name: "laminas:automatic-releases:release"
2121
env:

docs/en/reference/testing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ We do not currently have specific instructions on how to run a Database
8585
server, but we do recommend Docker as a convenient way to do so.
8686
We do not recommend running against a particular version of the chosen
8787
RDBMS either, as long as you pick one of the
88-
:doc:`officially supported versions <reference/platforms>`.
88+
:doc:`officially supported versions <platforms>`.
8989

9090
Recommendations on Writing Tests
9191
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/en/sidebar.rst

+36-41
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,36 @@
1-
.. toc::
2-
3-
.. tocheader:: Reference
4-
5-
.. toctree::
6-
:depth: 3
7-
8-
/reference/introduction
9-
/reference/architecture
10-
/reference/configuration
11-
/reference/data-retrieval-and-manipulation
12-
/reference/query-builder
13-
/reference/transactions
14-
/reference/platforms
15-
/reference/types
16-
/reference/schema-manager
17-
/reference/schema-representation
18-
/reference/security
19-
/reference/supporting-other-databases
20-
/reference/portability
21-
/reference/caching
22-
/reference/known-vendor-issues
23-
/reference/testing
24-
25-
.. toc::
26-
27-
.. tocheader:: Explanation
28-
29-
.. toctree::
30-
:depth: 3
31-
32-
/explanation/implicit-indexes
33-
34-
.. toc::
35-
36-
.. tocheader:: How To
37-
38-
.. toctree::
39-
:depth: 3
40-
41-
/how-to/postgresql-identity-migration
1+
:orphan:
2+
3+
.. toctree::
4+
:caption: Reference
5+
:depth: 3
6+
7+
/reference/introduction
8+
/reference/architecture
9+
/reference/configuration
10+
/reference/data-retrieval-and-manipulation
11+
/reference/query-builder
12+
/reference/transactions
13+
/reference/platforms
14+
/reference/types
15+
/reference/schema-manager
16+
/reference/schema-representation
17+
/reference/security
18+
/reference/supporting-other-databases
19+
/reference/portability
20+
/reference/caching
21+
/reference/known-vendor-issues
22+
/reference/cli-tools
23+
/reference/testing
24+
25+
26+
.. toctree::
27+
:caption: Explanation
28+
:depth: 3
29+
30+
/explanation/implicit-indexes
31+
32+
.. toctree::
33+
:caption: How To
34+
:depth: 3
35+
36+
/how-to/postgresql-identity-migration

0 commit comments

Comments
 (0)