From b6eb756a5d017130eddd4e6c2b0f36f97b4018c0 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Mon, 30 Sep 2024 11:22:15 +0200 Subject: [PATCH 1/8] Bump GitHub actions (#6527) --- .github/dependabot.yml | 2 +- .github/workflows/coding-standards.yml | 2 +- .github/workflows/release-on-milestone-closed.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 43ecb01bcc0..90c89e2ed0f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,4 +6,4 @@ updates: interval: "weekly" labels: - "CI" - target-branch: "3.8.x" + target-branch: "3.9.x" diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index e939ea96d8a..134e151711a 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -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.1.0" diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index 4c1e99c4c7c..75f7febb7fa 100644 --- a/.github/workflows/release-on-milestone-closed.yml +++ b/.github/workflows/release-on-milestone-closed.yml @@ -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: From 8188dd6d7f012a0faf4340284f52b52213ba0bd4 Mon Sep 17 00:00:00 2001 From: Joas Schilling <213943+nickvergessen@users.noreply.github.com> Date: Thu, 3 Oct 2024 00:21:41 +0200 Subject: [PATCH 2/8] ci: Run tests with PHP 8.4 (#6528) --- .github/workflows/continuous-integration.yml | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 0f5a61b66e4..56558bc7f0f 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -42,6 +42,7 @@ jobs: - "8.1" - "8.2" - "8.3" + - "8.4" dependencies: - "highest" extension: @@ -113,6 +114,8 @@ jobs: - "21" - "23" include: + - php-version: "8.4" + oracle-version: "23" - php-version: "7.4" oracle-version: "11" @@ -172,6 +175,8 @@ jobs: - "21" - "23" include: + - php-version: "8.4" + oracle-version: "23" - php-version: "7.4" oracle-version: "11" @@ -239,12 +244,18 @@ jobs: - php-version: "8.3" postgres-version: "16" extension: "pgsql" + - php-version: "8.4" + postgres-version: "16" + extension: "pgsql" - php-version: "8.2" postgres-version: "16" extension: "pdo_pgsql" - php-version: "8.3" postgres-version: "16" extension: "pdo_pgsql" + - php-version: "8.4" + postgres-version: "16" + extension: "pdo_pgsql" services: postgres: @@ -328,6 +339,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: @@ -410,6 +427,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: @@ -467,6 +490,7 @@ jobs: - "7.4" - "8.2" - "8.3" + - "8.4" extension: - "sqlsrv" - "pdo_sqlsrv" @@ -534,6 +558,7 @@ jobs: - "7.4" - "8.2" - "8.3" + - "8.4" services: ibm_db2: From 58c85f0b4465f079327831070f2879b9f8cc326a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 7 Oct 2024 16:00:49 +0200 Subject: [PATCH 3/8] Mark sidebar as orphan It is not referenced in any document --- docs/en/sidebar.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/sidebar.rst b/docs/en/sidebar.rst index 66c8e2dbed9..d68c6b8c268 100644 --- a/docs/en/sidebar.rst +++ b/docs/en/sidebar.rst @@ -1,3 +1,4 @@ +:orphan: .. toc:: .. tocheader:: Reference From 51888482afd1833d09aa9216a671ad7be9807c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 7 Oct 2024 16:01:09 +0200 Subject: [PATCH 4/8] Avoid custom directives Headers are now supported with the native caption option. --- docs/en/sidebar.rst | 52 +++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/docs/en/sidebar.rst b/docs/en/sidebar.rst index d68c6b8c268..b25d8c61c11 100644 --- a/docs/en/sidebar.rst +++ b/docs/en/sidebar.rst @@ -1,34 +1,30 @@ :orphan: -.. toc:: - .. tocheader:: Reference +.. toctree:: + :caption: Reference + :depth: 3 - .. 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 - /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:: +.. toctree:: + :caption: Explanation + :depth: 3 - .. tocheader:: Explanation - - .. toctree:: - :depth: 3 - - /explanation/dc2type-comments - /explanation/implicit-indexes + /explanation/dc2type-comments + /explanation/implicit-indexes From 6fb286424ce29d0e95552c48d707b7b6d996365b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 7 Oct 2024 16:02:46 +0200 Subject: [PATCH 5/8] Add cli-tools tools document to the TOC --- docs/en/sidebar.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/sidebar.rst b/docs/en/sidebar.rst index b25d8c61c11..6656369d91c 100644 --- a/docs/en/sidebar.rst +++ b/docs/en/sidebar.rst @@ -19,6 +19,7 @@ /reference/portability /reference/caching /reference/known-vendor-issues + /reference/cli-tools /reference/testing From 3d9c46ce7b494babc346d3eebebe060d76405c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 7 Oct 2024 16:03:47 +0200 Subject: [PATCH 6/8] Setup documentation workflow --- .github/workflows/documentation.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/documentation.yml diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml new file mode 100644 index 00000000000..e9b2c71857d --- /dev/null +++ b/.github/workflows/documentation.yml @@ -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/documentation.yml@5.1.0" From 5a6ff6f4fcf1294278fb00dd14927af175b67b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 7 Oct 2024 16:07:45 +0200 Subject: [PATCH 7/8] Fix broken link It would seem this needs to be relative to the current document, which is in the same directory. --- docs/en/reference/testing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/reference/testing.rst b/docs/en/reference/testing.rst index fdde5b238ff..87f6956700b 100644 --- a/docs/en/reference/testing.rst +++ b/docs/en/reference/testing.rst @@ -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 `. +:doc:`officially supported versions `. Recommendations on Writing Tests ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From 1331d5a09c6c233d71d8aba1c1904c07db7fa6ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:10:50 +0200 Subject: [PATCH 8/8] Bump doctrine/.github from 5.1.0 to 5.2.0 (#6534) Bumps [doctrine/.github](https://github.com/doctrine/.github) from 5.1.0 to 5.2.0.
Release notes

Sourced from doctrine/.github's releases.

Deprecated Psalm job

Deprecated

The static analysis workflow is deprecated in favor of a new workflow that only runs PHPStan. Projects should:

  1. Migrate from psalm- prefixed annotations to phpstan- prefixed annotations, or to unprefixed annotations if they do not confuse PHPStorm.
  2. Install https://github.com/phpstan/phpstan-deprecation-rules
  3. Remove Psalm
  4. Migrate from static-analysis.yml to phpstan.yml
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=doctrine/.github&package-manager=github_actions&previous-version=5.1.0&new-version=5.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/documentation.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 134e151711a..d377aab3608 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -25,4 +25,4 @@ on: jobs: coding-standards: name: "Coding Standards" - uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.1.0" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0" diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index e9b2c71857d..bf2ba69d770 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -17,4 +17,4 @@ on: jobs: documentation: name: "Documentation" - uses: "doctrine/.github/.github/workflows/documentation.yml@5.1.0" + uses: "doctrine/.github/.github/workflows/documentation.yml@5.2.0"