[PR #12241] [MERGED] Merge 2.20.x up into 3.5.x #13611

New Issue

Open

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

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

Owner

Copy Link

📋 Pull Request Information

Original PR: https://github.com/doctrine/orm/pull/12241
Author: @greg0ire
Created: 10/27/2025
Status: ✅ Merged
Merged: 10/27/2025
Merged by: @greg0ire

Base: 3.5.x ← Head: 3.5.x

---

📝 Commits (10+)

• 3e34b8e Add a test to reproduce the issue
• e7e2fef Fix creation of the count query, to that a new RSM is being created
• 4372595 Fix CS
• 7a59281 Fix collection filtering API for IN/NOT IN comparisons that require type conversions
• 9d680a6 Do not eagerly set metadata from ResolveTargetEntityListener (#12174)
• 9a55cf4 Merge pull request #12190 from mpdude/criteria-matching-custom-type-retry
• 96f9b29 Merge pull request #12233 from alisolphp/fix-docs-typos-2-20
• f71956f Use docs-builder to generate ORM docs
• aa62efa Adapt to latest coding standard
• c1047b3 Merge pull request #12216 from paulinevos/docs-builder

📊 Changes

53 files changed (+521 additions, -215 deletions)

View changed files

📝 .github/workflows/coding-standards.yml (+1 -1)
📝 .github/workflows/continuous-integration.yml (+5 -5)
📝 .github/workflows/documentation.yml (+1 -1)
📝 .github/workflows/release-on-milestone-closed.yml (+1 -1)
📝 composer.json (+3 -0)
📝 docs/.gitignore (+1 -1)
➖ docs/Makefile (+0 -24)
📝 docs/README.md (+4 -8)
📝 docs/composer.json (+2 -3)
📝 docs/en/cookbook/dql-custom-walkers.rst (+11 -3)
📝 docs/en/reference/advanced-configuration.rst (+1 -1)
📝 docs/en/reference/architecture.rst (+1 -1)
📝 docs/en/reference/filters.rst (+1 -1)
📝 docs/en/reference/second-level-cache.rst (+2 -2)
📝 docs/en/reference/security.rst (+1 -1)
📝 phpstan-baseline.neon (+0 -12)
📝 src/Persisters/Collection/ManyToManyPersister.php (+8 -7)
📝 src/Persisters/Collection/OneToManyPersister.php (+3 -3)
📝 src/Persisters/Entity/BasicEntityPersister.php (+63 -27)
📝 src/Persisters/Entity/EntityPersister.php (+1 -1)

...and 33 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/12241 **Author:** [@greg0ire](https://github.com/greg0ire) **Created:** 10/27/2025 **Status:** ✅ Merged **Merged:** 10/27/2025 **Merged by:** [@greg0ire](https://github.com/greg0ire) **Base:** `3.5.x` ← **Head:** `3.5.x` --- ### 📝 Commits (10+) - [`3e34b8e`](https://github.com/doctrine/orm/commit/3e34b8e86ae599dd851d508c24c1f09c8e81aa5c) Add a test to reproduce the issue - [`e7e2fef`](https://github.com/doctrine/orm/commit/e7e2fef56c632ee5d31dcc5ac8ef74288097dc26) Fix creation of the count query, to that a new RSM is being created - [`4372595`](https://github.com/doctrine/orm/commit/437259556c89528495a1e209b9cace382b5fbf37) Fix CS - [`7a59281`](https://github.com/doctrine/orm/commit/7a5928115745a47dde054b12647d425a7ffcb5d7) Fix collection filtering API for IN/NOT IN comparisons that require type conversions - [`9d680a6`](https://github.com/doctrine/orm/commit/9d680a6de4308839fda21095e2f0a84a736b2705) Do not eagerly set metadata from `ResolveTargetEntityListener` (#12174) - [`9a55cf4`](https://github.com/doctrine/orm/commit/9a55cf4f305fde5a79de8a26a3b65c460aacbd8f) Merge pull request #12190 from mpdude/criteria-matching-custom-type-retry - [`96f9b29`](https://github.com/doctrine/orm/commit/96f9b29573e1a547310a974aa4d3ddf60078c3fb) Merge pull request #12233 from alisolphp/fix-docs-typos-2-20 - [`f71956f`](https://github.com/doctrine/orm/commit/f71956f001a4b025297f43a8ad7709ff447f893f) Use `docs-builder` to generate ORM docs - [`aa62efa`](https://github.com/doctrine/orm/commit/aa62efa30a96d6b6a214adb9bd71c71212c4fe86) Adapt to latest coding standard - [`c1047b3`](https://github.com/doctrine/orm/commit/c1047b30e3d0b93e3dd8e9b8d45218efad507f12) Merge pull request #12216 from paulinevos/docs-builder ### 📊 Changes **53 files changed** (+521 additions, -215 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/coding-standards.yml` (+1 -1) 📝 `.github/workflows/continuous-integration.yml` (+5 -5) 📝 `.github/workflows/documentation.yml` (+1 -1) 📝 `.github/workflows/release-on-milestone-closed.yml` (+1 -1) 📝 `composer.json` (+3 -0) 📝 `docs/.gitignore` (+1 -1) ➖ `docs/Makefile` (+0 -24) 📝 `docs/README.md` (+4 -8) 📝 `docs/composer.json` (+2 -3) 📝 `docs/en/cookbook/dql-custom-walkers.rst` (+11 -3) 📝 `docs/en/reference/advanced-configuration.rst` (+1 -1) 📝 `docs/en/reference/architecture.rst` (+1 -1) 📝 `docs/en/reference/filters.rst` (+1 -1) 📝 `docs/en/reference/second-level-cache.rst` (+2 -2) 📝 `docs/en/reference/security.rst` (+1 -1) 📝 `phpstan-baseline.neon` (+0 -12) 📝 `src/Persisters/Collection/ManyToManyPersister.php` (+8 -7) 📝 `src/Persisters/Collection/OneToManyPersister.php` (+3 -3) 📝 `src/Persisters/Entity/BasicEntityPersister.php` (+63 -27) 📝 `src/Persisters/Entity/EntityPersister.php` (+1 -1) _...and 33 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:17:46 +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#13611