Skip to content

Commit

Permalink
Merge branch '4.1.x' into 4.2.x
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
derrabus committed Oct 9, 2024
2 parents 0e81fa2 + 1c4fb00 commit 79b257b
Show file tree
Hide file tree
Showing 7 changed files with 88 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ updates:
interval: "weekly"
labels:
- "CI"
target-branch: "3.8.x"
target-branch: "3.9.x"
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ on:
jobs:
coding-standards:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.1"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0"
28 changes: 28 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
dependencies:
- "highest"
extension:
Expand Down Expand Up @@ -107,6 +108,9 @@ jobs:
- "18"
- "21"
- "23"
include:
- php-version: "8.4"
oracle-version: "23"

services:
oracle:
Expand Down Expand Up @@ -164,6 +168,9 @@ jobs:
- "18"
- "21"
- "23"
include:
- php-version: "8.4"
oracle-version: "23"

services:
oracle:
Expand Down Expand Up @@ -227,6 +234,13 @@ jobs:
postgres-version: "16"
extension: "pgsql"
- php-version: "8.3"
postgres-version: "16"
extension: "pgsql"
- php-version: "8.4"
postgres-version: "16"
extension: "pgsql"
extension: "pdo_pgsql"
- php-version: "8.4"
postgres-version: "16"
extension: "pdo_pgsql"

Expand Down Expand Up @@ -299,6 +313,12 @@ jobs:
- php-version: "8.3"
mariadb-version: "11.4"
extension: "pdo_mysql"
- php-version: "8.4"
mariadb-version: "11.4"
extension: "mysqli"
- php-version: "8.4"
mariadb-version: "11.4"
extension: "pdo_mysql"

services:
mariadb:
Expand Down Expand Up @@ -381,6 +401,12 @@ jobs:
extension: "pdo_mysql"
custom-entrypoint: >-
--entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
- php-version: "8.4"
mysql-version: "9.0"
extension: "mysqli"
- php-version: "8.4"
mysql-version: "9.0"
extension: "pdo_mysql"

services:
mysql:
Expand Down Expand Up @@ -438,6 +464,7 @@ jobs:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
extension:
- "sqlsrv"
- "pdo_sqlsrv"
Expand Down Expand Up @@ -505,6 +532,7 @@ jobs:
- "8.1"
- "8.2"
- "8.3"
- "8.4"

services:
ibm_db2:
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "Documentation"

on:
pull_request:
branches:
- "*.x"
paths:
- ".github/workflows/documentation.yml"
- "docs/**"
push:
branches:
- "*.x"
paths:
- ".github/workflows/documentation.yml"
- "docs/**"

jobs:
documentation:
name: "Documentation"
uses: "doctrine/.github/.github/workflows/[email protected]"
2 changes: 1 addition & 1 deletion .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: "actions/checkout@v4"

- name: "Release"
uses: "laminas/automatic-releases@1.24.0"
uses: "laminas/automatic-releases@1.25.0"
with:
command-name: "laminas:automatic-releases:release"
env:
Expand Down
2 changes: 1 addition & 1 deletion docs/en/reference/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ We do not currently have specific instructions on how to run a Database
server, but we do recommend Docker as a convenient way to do so.
We do not recommend running against a particular version of the chosen
RDBMS either, as long as you pick one of the
:doc:`officially supported versions <reference/platforms>`.
:doc:`officially supported versions <platforms>`.

Recommendations on Writing Tests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
77 changes: 36 additions & 41 deletions docs/en/sidebar.rst
Original file line number Diff line number Diff line change
@@ -1,41 +1,36 @@
.. toc::

.. tocheader:: Reference

.. toctree::
:depth: 3

/reference/introduction
/reference/architecture
/reference/configuration
/reference/data-retrieval-and-manipulation
/reference/query-builder
/reference/transactions
/reference/platforms
/reference/types
/reference/schema-manager
/reference/schema-representation
/reference/security
/reference/supporting-other-databases
/reference/portability
/reference/caching
/reference/known-vendor-issues
/reference/testing

.. toc::

.. tocheader:: Explanation

.. toctree::
:depth: 3

/explanation/implicit-indexes

.. toc::

.. tocheader:: How To

.. toctree::
:depth: 3

/how-to/postgresql-identity-migration
:orphan:

.. toctree::
:caption: Reference
:depth: 3

/reference/introduction
/reference/architecture
/reference/configuration
/reference/data-retrieval-and-manipulation
/reference/query-builder
/reference/transactions
/reference/platforms
/reference/types
/reference/schema-manager
/reference/schema-representation
/reference/security
/reference/supporting-other-databases
/reference/portability
/reference/caching
/reference/known-vendor-issues
/reference/cli-tools
/reference/testing


.. toctree::
:caption: Explanation
:depth: 3

/explanation/implicit-indexes

.. toctree::
:caption: How To
:depth: 3

/how-to/postgresql-identity-migration

0 comments on commit 79b257b

Please sign in to comment.