[PR #12337] [MERGED] Merge 2.20.x up into 3.6.x #13705

New Issue

Closed

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

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

Owner

Copy Link

📋 Pull Request Information

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

Base: 3.6.x ← Head: 3.6.x

---

📝 Commits (5)

• 0aeddd0 Fix grammatical errors
• 0f8730a Merge pull request #12331 from greg0ire/a-the
• 60d4ea6 Stop mocking EventManager
• 3b8c23c Merge pull request #12336 from greg0ire/dmwydo
• 0c1bf14 Merge remote-tracking branch 'origin/2.20.x' into 3.6.x

📊 Changes

9 files changed (+25 additions, -75 deletions)

View changed files

📝 UPGRADE.md (+1 -1)
📝 docs/en/reference/second-level-cache.rst (+1 -1)
📝 docs/en/reference/tools.rst (+1 -1)
📝 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 (+17 -67)

📄 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/12337 **Author:** [@greg0ire](https://github.com/greg0ire) **Created:** 1/8/2026 **Status:** ✅ Merged **Merged:** 1/9/2026 **Merged by:** [@greg0ire](https://github.com/greg0ire) **Base:** `3.6.x` ← **Head:** `3.6.x` --- ### 📝 Commits (5) - [`0aeddd0`](https://github.com/doctrine/orm/commit/0aeddd0592262fa2ca857fda0c255962e429324a) Fix grammatical errors - [`0f8730a`](https://github.com/doctrine/orm/commit/0f8730a6e5ee331431ae27466b417f7907010acf) Merge pull request #12331 from greg0ire/a-the - [`60d4ea6`](https://github.com/doctrine/orm/commit/60d4ea694a41ac6f7838394cb0c56224c3e8ff06) Stop mocking EventManager - [`3b8c23c`](https://github.com/doctrine/orm/commit/3b8c23c51d86ee576831870bf5765a02ceba7c6d) Merge pull request #12336 from greg0ire/dmwydo - [`0c1bf14`](https://github.com/doctrine/orm/commit/0c1bf14729530c6f9581099e72d7111a60f97253) Merge remote-tracking branch 'origin/2.20.x' into 3.6.x ### 📊 Changes **9 files changed** (+25 additions, -75 deletions) <details> <summary>View changed files</summary> 📝 `UPGRADE.md` (+1 -1) 📝 `docs/en/reference/second-level-cache.rst` (+1 -1) 📝 `docs/en/reference/tools.rst` (+1 -1) 📝 `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` (+17 -67) </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:13 +01:00

admin closed this issue 2026-01-22 16:18:14 +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#13705