[PR #12253] [MERGED] Merge 3.6.x up into 4.0.x #13625

New Issue

Closed

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

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

Owner

Copy Link

📋 Pull Request Information

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

Base: 4.0.x ← Head: 4.0.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
• 048e308 Fix DQL JOIN syntax in two test cases
• f8186b1 Merge pull request #12200 from mpdude/fix-invalid-dql-test-case
• a939dc2 [GH-9219] Add support for toIterable over mixed or scalar results. (#12187)
• a9bd00a Improve migration docs from ORM 2 to 3. (#12207)
• d3e1440 Handle quoted PK columns properly on DBAL 4 (#12208)
• f1a8ee1 Add deprecation messages for two methods that were only annotated as being @deprecated
• 64cd5ca Merge remote-tracking branch 'origin/2.20.x' into 3.5.x

📊 Changes

96 files changed (+1326 additions, -506 deletions)

View changed files

📝 .github/workflows/coding-standards.yml (+1 -1)
➕ .github/workflows/composer-lint.yml (+20 -0)
📝 .github/workflows/continuous-integration.yml (+9 -5)
📝 .github/workflows/documentation.yml (+1 -1)
📝 .github/workflows/release-on-milestone-closed.yml (+1 -1)
📝 UPGRADE.md (+74 -0)
📝 composer.json (+43 -23)
📝 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/index.rst (+0 -1)
📝 docs/en/reference/advanced-configuration.rst (+1 -1)
📝 docs/en/reference/architecture.rst (+1 -1)
📝 docs/en/reference/dql-doctrine-query-language.rst (+13 -6)
📝 docs/en/reference/filters.rst (+1 -1)
📝 docs/en/reference/limitations-and-known-issues.rst (+8 -0)
📝 docs/en/reference/second-level-cache.rst (+2 -2)
📝 docs/en/reference/security.rst (+1 -1)

...and 76 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/12253 **Author:** [@greg0ire](https://github.com/greg0ire) **Created:** 10/29/2025 **Status:** ✅ Merged **Merged:** 10/29/2025 **Merged by:** [@greg0ire](https://github.com/greg0ire) **Base:** `4.0.x` ← **Head:** `4.0.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 - [`048e308`](https://github.com/doctrine/orm/commit/048e3082416f99990816f9ec45d50e5dc056462e) Fix DQL JOIN syntax in two test cases - [`f8186b1`](https://github.com/doctrine/orm/commit/f8186b12031d082211aecfbe9945cf27cc60894d) Merge pull request #12200 from mpdude/fix-invalid-dql-test-case - [`a939dc2`](https://github.com/doctrine/orm/commit/a939dc2e0d885fd7861f845c7e20536fbb495ff5) [GH-9219] Add support for toIterable over mixed or scalar results. (#12187) - [`a9bd00a`](https://github.com/doctrine/orm/commit/a9bd00a70bc24e8356c524cf8fa411966ceb8db4) Improve migration docs from ORM 2 to 3. (#12207) - [`d3e1440`](https://github.com/doctrine/orm/commit/d3e144017568f58fcd764c3635ebc4c6a724f50e) Handle quoted PK columns properly on DBAL 4 (#12208) - [`f1a8ee1`](https://github.com/doctrine/orm/commit/f1a8ee175c9e35497e4f1e3e74981a1e8108f2b8) Add deprecation messages for two methods that were only annotated as being `@deprecated` - [`64cd5ca`](https://github.com/doctrine/orm/commit/64cd5cad20ff742c2e4a3a0652eef0e4add11f30) Merge remote-tracking branch 'origin/2.20.x' into 3.5.x ### 📊 Changes **96 files changed** (+1326 additions, -506 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/coding-standards.yml` (+1 -1) ➕ `.github/workflows/composer-lint.yml` (+20 -0) 📝 `.github/workflows/continuous-integration.yml` (+9 -5) 📝 `.github/workflows/documentation.yml` (+1 -1) 📝 `.github/workflows/release-on-milestone-closed.yml` (+1 -1) 📝 `UPGRADE.md` (+74 -0) 📝 `composer.json` (+43 -23) 📝 `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/index.rst` (+0 -1) 📝 `docs/en/reference/advanced-configuration.rst` (+1 -1) 📝 `docs/en/reference/architecture.rst` (+1 -1) 📝 `docs/en/reference/dql-doctrine-query-language.rst` (+13 -6) 📝 `docs/en/reference/filters.rst` (+1 -1) 📝 `docs/en/reference/limitations-and-known-issues.rst` (+8 -0) 📝 `docs/en/reference/second-level-cache.rst` (+2 -2) 📝 `docs/en/reference/security.rst` (+1 -1) _...and 76 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:49 +01:00

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