[PR #12348] [MERGED] Merge 3.7.x up into 4.0.x #13719

New Issue

Closed

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

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

Owner

Copy Link

📋 Pull Request Information

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

Base: 4.0.x ← Head: 4.0.x

---

📝 Commits (10+)

• 08d6167 Fix result cache examples in docs
• 2491c4b Merge pull request #12329 from HypeMC/fix-result-cache-examples
• 0aeddd0 Fix grammatical errors
• 12116aa Fix docs regarding query hints (#12328)
• 62477b5 Update branch metadata (#12327)
• 0f8730a Merge pull request #12331 from greg0ire/a-the
• 8bdefef Handle int-backed enums for values stored as string values in MySQL ENUM columns (#12275)
• f8bbdc4 Add dispatchPreFlushEvent() method and avoid calling getConnection() twice
• 8cbd34c Merge pull request #12060 from n0099/patch-1
• e923bbc Avoid lazy object initialization when initializing read-only property

📊 Changes

23 files changed (+265 additions, -164 deletions)

View changed files

📝 .doctrine-project.json (+6 -51)
📝 .gitattributes (+1 -1)
📝 README.md (+8 -8)
📝 UPGRADE.md (+1 -1)
📝 docs/en/cookbook/dql-custom-walkers.rst (+39 -2)
➕ docs/en/cookbook/dql-custom-walkers/InterpolateParametersSQLOutputWalker.php (+47 -0)
📝 docs/en/reference/dql-doctrine-query-language.rst (+3 -4)
📝 docs/en/reference/query-builder.rst (+6 -7)
📝 docs/en/reference/second-level-cache.rst (+1 -1)
📝 docs/en/reference/tools.rst (+1 -1)
📝 phpstan-baseline.neon (+1 -1)
📝 src/AbstractQuery.php (+1 -1)
📝 src/Internal/Hydration/AbstractHydrator.php (+7 -1)
📝 src/Mapping/MappingException.php (+1 -1)
📝 src/Mapping/PropertyAccessors/ReadonlyAccessor.php (+8 -1)
📝 src/PersistentCollection.php (+1 -4)
📝 src/UnitOfWork.php (+12 -9)
📝 tests/Tests/ORM/Functional/Ticket/DDC2359Test.php (+1 -1)
📝 tests/Tests/ORM/Functional/Ticket/GH10387Test.php (+1 -1)
➕ tests/Tests/ORM/Functional/Ticket/GH12166/GH12166Test.php (+32 -0)

...and 3 more files

📄 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/12348 **Author:** [@greg0ire](https://github.com/greg0ire) **Created:** 1/16/2026 **Status:** ✅ Merged **Merged:** 1/16/2026 **Merged by:** [@greg0ire](https://github.com/greg0ire) **Base:** `4.0.x` ← **Head:** `4.0.x` --- ### 📝 Commits (10+) - [`08d6167`](https://github.com/doctrine/orm/commit/08d61672431f73f636af69cf08abdf63dffbb84f) Fix result cache examples in docs - [`2491c4b`](https://github.com/doctrine/orm/commit/2491c4b20d9439d2770f4e59b2560df0b1fe3652) Merge pull request #12329 from HypeMC/fix-result-cache-examples - [`0aeddd0`](https://github.com/doctrine/orm/commit/0aeddd0592262fa2ca857fda0c255962e429324a) Fix grammatical errors - [`12116aa`](https://github.com/doctrine/orm/commit/12116aa3c22128a513410ebad21f3db3917ffbc1) Fix docs regarding query hints (#12328) - [`62477b5`](https://github.com/doctrine/orm/commit/62477b5d42c55e28930095345d51e5656eb97f42) Update branch metadata (#12327) - [`0f8730a`](https://github.com/doctrine/orm/commit/0f8730a6e5ee331431ae27466b417f7907010acf) Merge pull request #12331 from greg0ire/a-the - [`8bdefef`](https://github.com/doctrine/orm/commit/8bdefef6d195fc6b7840ffe14f38a5ceb3d4fc4c) Handle int-backed enums for values stored as string values in MySQL ENUM columns (#12275) - [`f8bbdc4`](https://github.com/doctrine/orm/commit/f8bbdc40b00e4ae2d9b9181c4958ffe64a914273) Add dispatchPreFlushEvent() method and avoid calling getConnection() twice - [`8cbd34c`](https://github.com/doctrine/orm/commit/8cbd34c6668fea94ed5cdb2d19a7aa7a405b30aa) Merge pull request #12060 from n0099/patch-1 - [`e923bbc`](https://github.com/doctrine/orm/commit/e923bbc93222968d65d9490964eaff257b075a19) Avoid lazy object initialization when initializing read-only property ### 📊 Changes **23 files changed** (+265 additions, -164 deletions) <details> <summary>View changed files</summary> 📝 `.doctrine-project.json` (+6 -51) 📝 `.gitattributes` (+1 -1) 📝 `README.md` (+8 -8) 📝 `UPGRADE.md` (+1 -1) 📝 `docs/en/cookbook/dql-custom-walkers.rst` (+39 -2) ➕ `docs/en/cookbook/dql-custom-walkers/InterpolateParametersSQLOutputWalker.php` (+47 -0) 📝 `docs/en/reference/dql-doctrine-query-language.rst` (+3 -4) 📝 `docs/en/reference/query-builder.rst` (+6 -7) 📝 `docs/en/reference/second-level-cache.rst` (+1 -1) 📝 `docs/en/reference/tools.rst` (+1 -1) 📝 `phpstan-baseline.neon` (+1 -1) 📝 `src/AbstractQuery.php` (+1 -1) 📝 `src/Internal/Hydration/AbstractHydrator.php` (+7 -1) 📝 `src/Mapping/MappingException.php` (+1 -1) 📝 `src/Mapping/PropertyAccessors/ReadonlyAccessor.php` (+8 -1) 📝 `src/PersistentCollection.php` (+1 -4) 📝 `src/UnitOfWork.php` (+12 -9) 📝 `tests/Tests/ORM/Functional/Ticket/DDC2359Test.php` (+1 -1) 📝 `tests/Tests/ORM/Functional/Ticket/GH10387Test.php` (+1 -1) ➕ `tests/Tests/ORM/Functional/Ticket/GH12166/GH12166Test.php` (+32 -0) _...and 3 more files_ </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:17 +01:00

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