[PR #12346] [MERGED] Merge 2.20.x up into 2.21.x #13713

New Issue

Closed

opened 2026-01-22 16:18:15 +01:00 by admin · 0 comments

admin commented 2026-01-22 16:18:15 +01:00

Owner

Copy Link

📋 Pull Request Information

Original PR: https://github.com/doctrine/orm/pull/12346
Author: @greg0ire
Created: 1/16/2026
Status: ✅ Merged
Merged: 1/16/2026
Merged by: @greg0ire

Base: 2.21.x ← Head: 2.20.x

---

📝 Commits (10+)

• 01fd55e chore: show parameters in name of CI jobs
• fea42ab Merge pull request #12299 from alexislefebvre/chore-show-parameters-in-name-of-CI-jobs
• 05e07c0 Bump doctrine/.github/.github/workflows/documentation.yml (#12318)
• 9f3f709 Bump doctrine/.github/.github/workflows/coding-standards.yml (#12316)
• 3d98b43 Bump doctrine/.github/.github/workflows/composer-lint.yml (#12317)
• dcdd462 Bump doctrine/.github/.github/workflows/release-on-milestone-closed.yml (#12315)
• 1237f5c Bump actions/upload-artifact from 5 to 6 (#12322)
• 67419cf Bump actions/download-artifact from 6 to 7 (#12321)
• 492745d docs: add xml example for Single Table Inheritance mapping (#12169)
• 0aeddd0 Fix grammatical errors

📊 Changes

17 files changed (+95 additions, -92 deletions)

View changed files

📝 .github/workflows/coding-standards.yml (+1 -1)
📝 .github/workflows/composer-lint.yml (+1 -1)
📝 .github/workflows/continuous-integration.yml (+41 -11)
📝 .github/workflows/documentation.yml (+1 -1)
📝 .github/workflows/release-on-milestone-closed.yml (+1 -1)
📝 UPGRADE.md (+1 -1)
📝 docs/en/reference/inheritance-mapping.rst (+17 -0)
📝 docs/en/reference/second-level-cache.rst (+1 -1)
📝 docs/en/reference/tools.rst (+1 -1)
📝 phpstan-baseline.neon (+1 -1)
📝 phpstan-persistence2.neon (+4 -0)
📝 src/AbstractQuery.php (+1 -1)
📝 src/Mapping/MappingException.php (+1 -1)
📝 tests/Tests/ORM/Functional/Ticket/DDC2359Test.php (+1 -1)
📝 tests/Tests/ORM/Functional/Ticket/GH10387Test.php (+1 -1)
📝 tests/Tests/ORM/Functional/Ticket/GH6394Test.php (+1 -1)
📝 tests/Tests/ORM/Hydration/AbstractHydratorTest.php (+20 -68)

📄 Description

No description provided

---

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/doctrine/orm/pull/12346 **Author:** [@greg0ire](https://github.com/greg0ire) **Created:** 1/16/2026 **Status:** ✅ Merged **Merged:** 1/16/2026 **Merged by:** [@greg0ire](https://github.com/greg0ire) **Base:** `2.21.x` ← **Head:** `2.20.x` --- ### 📝 Commits (10+) - [`01fd55e`](https://github.com/doctrine/orm/commit/01fd55e9ea31d3280c275dd5ce9c6efa5635fa8d) chore: show parameters in name of CI jobs - [`fea42ab`](https://github.com/doctrine/orm/commit/fea42ab9844dc4dbaacca19c8063e6897ca6b94b) Merge pull request #12299 from alexislefebvre/chore-show-parameters-in-name-of-CI-jobs - [`05e07c0`](https://github.com/doctrine/orm/commit/05e07c0ae0a5715a89c0d8e1d1d7ca3a61a1d4f5) Bump doctrine/.github/.github/workflows/documentation.yml (#12318) - [`9f3f709`](https://github.com/doctrine/orm/commit/9f3f70944a61b0a3bda1023f8d490c55c8a357e7) Bump doctrine/.github/.github/workflows/coding-standards.yml (#12316) - [`3d98b43`](https://github.com/doctrine/orm/commit/3d98b435618b3f95b23b14c911ffcb7f3e3c2f2f) Bump doctrine/.github/.github/workflows/composer-lint.yml (#12317) - [`dcdd462`](https://github.com/doctrine/orm/commit/dcdd46251edbfb57e9f94eb74a4cc8490318839c) Bump doctrine/.github/.github/workflows/release-on-milestone-closed.yml (#12315) - [`1237f5c`](https://github.com/doctrine/orm/commit/1237f5c9091ce27c3b3c3133aff10eda95a21cc6) Bump actions/upload-artifact from 5 to 6 (#12322) - [`67419cf`](https://github.com/doctrine/orm/commit/67419cf9515350373dc086fd9541befcbfab10a5) Bump actions/download-artifact from 6 to 7 (#12321) - [`492745d`](https://github.com/doctrine/orm/commit/492745d710c540d6648dcc100211106b5e93b601) docs: add xml example for Single Table Inheritance mapping (#12169) - [`0aeddd0`](https://github.com/doctrine/orm/commit/0aeddd0592262fa2ca857fda0c255962e429324a) Fix grammatical errors ### 📊 Changes **17 files changed** (+95 additions, -92 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/coding-standards.yml` (+1 -1) 📝 `.github/workflows/composer-lint.yml` (+1 -1) 📝 `.github/workflows/continuous-integration.yml` (+41 -11) 📝 `.github/workflows/documentation.yml` (+1 -1) 📝 `.github/workflows/release-on-milestone-closed.yml` (+1 -1) 📝 `UPGRADE.md` (+1 -1) 📝 `docs/en/reference/inheritance-mapping.rst` (+17 -0) 📝 `docs/en/reference/second-level-cache.rst` (+1 -1) 📝 `docs/en/reference/tools.rst` (+1 -1) 📝 `phpstan-baseline.neon` (+1 -1) 📝 `phpstan-persistence2.neon` (+4 -0) 📝 `src/AbstractQuery.php` (+1 -1) 📝 `src/Mapping/MappingException.php` (+1 -1) 📝 `tests/Tests/ORM/Functional/Ticket/DDC2359Test.php` (+1 -1) 📝 `tests/Tests/ORM/Functional/Ticket/GH10387Test.php` (+1 -1) 📝 `tests/Tests/ORM/Functional/Ticket/GH6394Test.php` (+1 -1) 📝 `tests/Tests/ORM/Hydration/AbstractHydratorTest.php` (+20 -68) </details> ### 📄 Description _No description provided_ --- _{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

admin added the pull-request label 2026-01-22 16:18:15 +01:00

admin closed this issue 2026-01-22 16:18:15 +01:00

Sign in to join this conversation.

No Branch/Tag Specified

Branches Tags

3.6.x

2.20.x

dependabot/github_actions/2.20.x/doctrine/dot-github/dot-github/workflows/composer-lint.yml-14.0.0

3.7.x

4.0.x

2.21.x

old-prototype-3.x

3.6.2

3.6.1

3.6.0

2.20.9

3.5.8

3.5.7

3.5.6

3.5.5

2.20.8

3.5.4

3.5.3

2.20.7

3.5.2

2.20.6

3.5.1

3.5.0

3.4.4

3.4.3

3.4.2

2.20.5

3.4.1

3.4.0

3.3.4

2.20.4

3.3.3

2.20.3

3.3.2

2.20.2

3.3.1

2.20.1

3.3.0

3.2.3

2.20.0

2.19.8

3.2.2

2.19.7

3.2.1

2.19.6

3.2.0

3.1.4

3.1.3

2.19.5

3.1.2

2.19.4

3.1.1

2.19.3

2.19.2

2.19.1

3.1.0

2.19.0

3.0.3

2.18.3

3.0.2

2.18.2

3.0.1

2.18.1

3.0.0

2.18.0

2.17.5

3.0.0-RC1

2.17.4

2.17.3

2.17.2

2.17.1

3.0.0-beta2

2.17.0

2.16.3

3.0.0-beta1

2.16.2

2.16.1

2.16.0

2.15.5

2.15.4

2.15.3

2.15.2

2.15.1

2.15.0

2.14.3

2.14.2

2.14.1

2.14.0

2.13.5

2.13.4

2.13.3

2.13.2

2.13.1

2.13.0

2.12.4

2.12.3

2.12.2

2.12.1

2.12.0

2.11.3

2.11.2

2.11.1

2.11.0

2.10.5

2.10.4

2.10.3

2.10.2

2.10.1

2.10.0

2.9.6

2.9.5

2.9.4

2.9.3

2.9.2

2.9.1

2.9.0

2.8.5

2.8.4

2.8.3

2.8.2

2.8.1

2.8.0

2.7.5

2.7.4

v2.7.3

v2.7.2

v2.7.1

v2.7.0

v2.6.6

v2.6.5

v2.6.4

v2.6.3

v2.6.2

v2.6.1

v2.6.0

v2.5.14

v2.5.13

v2.5.12

v2.5.11

v2.5.10

v2.5.9

v2.5.8

v2.5.7

v2.5.6

v2.5.5

v2.5.4

v2.5.3

v2.5.2

v2.4.8

v2.5.1

v2.5.0

v2.5.0-RC2

v2.5.0-RC1

v2.5.0-beta1

v2.5.0-alpha2

v2.5.0-alpha1

v2.4.7

v2.4.6

v2.4.5

v2.4.4

v2.4.3

v2.3.6

v2.4.2

2.3.5

v2.4.1

v2.4.0

2.4.0-RC2

2.4.0-RC1

2.4.0-BETA2

2.3.4

2.3.3

2.4.0-BETA1

2.3.2

2.3.1

2.3.0

2.3.0-RC4

2.3.0-RC3

2.3.0-RC2

2.2.3

2.3.0-RC1

2.3.0-BETA1

2.1.7

2.2.2

2.2.1

2.1.6

2.2.0

2.2.0-RC1

2.2.0-BETA2

2.2.0-BETA1

2.1.5

2.1.4

2.1.3

2.1.2

2.1.1

2.0.7

2.1.0

2.1.0RC3

2.1.0RC2

2.1.0RC1

2.0.6

2.1.0BETA1

2.0.5

2.0.4

2.0.3

2.0.2

2.0.1

2.0.0

2.0.0RC2

2.0.0RC1

2.0.0-BETA4

2.0.0-BETA3

2.0.0-BETA2

2.0.0-BETA1

Labels

Clear labels

BC Break

Bug

Can't Fix

Deprecation

Documentation

DQL

Duplicate

Failing Test

Hacktoberfest

Improvement

Improvement

Incomplete

Invalid

Missing Tests

New Feature

PR Created

pull-request

Mirrored from GitHub Pull Request

Question

Regression

Status: Waiting feedback

Waiting feedback

WIP

Won't Fix

No Label pull-request

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

admin

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: doctrine/archived-orm#13713