doctrine/archived-orm
1
0
Fork 0
mirror of https://github.com/doctrine/orm.git synced 2026-03-24 06:52:09 +01:00
Code Issues 5.3k Packages Projects Releases 100 Wiki Activity

[PR #12242] [MERGED] Merge release 2.20.7 into 2.21.x #13612

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/12242
Author: @github-actions[bot]
Created: 10/27/2025
Status: ✅ Merged
Merged: 10/27/2025
Merged by: @greg0ire

Base: 2.21.x ← Head: 2.20.x-merge-up-into-2.21.x_urr9kua6

📝 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)
  • 2ad720b Revert "Fix fields of transient classes being considered duplicate with reportFieldsWhereDeclared (#11769)"
  • 8afaa63 Add a recommendation not to use multiple private fields of the same name in entity hierarchies
  • 3b7de17 add jobs using PHP 8.5 in the CI (#12180)
  • 930a790 Merge pull request #12212 from mpdude/revert-11769

📊 Changes

62 files changed (+694 additions, -277 deletions)

View changed files

📝 .github/workflows/coding-standards.yml (+1 -1)
📝 .github/workflows/continuous-integration.yml (+9 -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/limitations-and-known-issues.rst (+8 -0)
📝 docs/en/reference/second-level-cache.rst (+2 -2)
📝 docs/en/reference/security.rst (+1 -1)
📝 phpstan-baseline.neon (+0 -12)
📝 phpstan-persistence2.neon (+6 -0)
📝 src/AbstractQuery.php (+0 -5)
📝 src/Internal/Hydration/AbstractHydrator.php (+5 -1)

...and 42 more files

📄 Description

Release Notes for 2.20.7

2.20.x bugfix release (patch)

2.20.7

  • Total issues resolved: 0
  • Total pull requests resolved: 25
  • Total contributors: 10

CI

Improvement

Documentation

Test Suite

Bug

Code Style

🔄 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/12242 **Author:** [@github-actions[bot]](https://github.com/apps/github-actions) **Created:** 10/27/2025 **Status:** ✅ Merged **Merged:** 10/27/2025 **Merged by:** [@greg0ire](https://github.com/greg0ire) **Base:** `2.21.x` ← **Head:** `2.20.x-merge-up-into-2.21.x_urr9kua6` --- ### 📝 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) - [`2ad720b`](https://github.com/doctrine/orm/commit/2ad720b30421848f7a593c5a25f131ffb941469d) Revert "Fix fields of transient classes being considered duplicate with `reportFieldsWhereDeclared` (#11769)" - [`8afaa63`](https://github.com/doctrine/orm/commit/8afaa63d7355c11b5fab29abc9ced7a20d3bb65d) Add a recommendation not to use multiple private fields of the same name in entity hierarchies - [`3b7de17`](https://github.com/doctrine/orm/commit/3b7de17f2e6804560f6b370073f691cb026ea5e0) add jobs using PHP 8.5 in the CI (#12180) - [`930a790`](https://github.com/doctrine/orm/commit/930a790a5a316656cb322f374030b4fe5ac1fff8) Merge pull request #12212 from mpdude/revert-11769 ### 📊 Changes **62 files changed** (+694 additions, -277 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/coding-standards.yml` (+1 -1) 📝 `.github/workflows/continuous-integration.yml` (+9 -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/limitations-and-known-issues.rst` (+8 -0) 📝 `docs/en/reference/second-level-cache.rst` (+2 -2) 📝 `docs/en/reference/security.rst` (+1 -1) 📝 `phpstan-baseline.neon` (+0 -12) 📝 `phpstan-persistence2.neon` (+6 -0) 📝 `src/AbstractQuery.php` (+0 -5) 📝 `src/Internal/Hydration/AbstractHydrator.php` (+5 -1) _...and 42 more files_ </details> ### 📄 Description ### Release Notes for [2.20.7](https://github.com/doctrine/orm/milestone/191) 2.20.x bugfix release (patch) ### 2.20.7 - Total issues resolved: **0** - Total pull requests resolved: **25** - Total contributors: **10** CI -- - [12240: Bump actions/upload-artifact from 4 to 5](https://github.com/doctrine/orm/pull/12240) thanks to @dependabot[bot] - [12239: Bump actions/download-artifact from 5 to 6](https://github.com/doctrine/orm/pull/12239) thanks to @dependabot[bot] - [12227: Bump doctrine/.github from 10.1.0 to 12.0.0](https://github.com/doctrine/orm/pull/12227) thanks to @dependabot[bot] - [12223: Bump doctrine/.github from 8.0.0 to 10.1.0](https://github.com/doctrine/orm/pull/12223) thanks to @dependabot[bot] - [12185: Bump doctrine/.github from 7.3.0 to 8.0.0](https://github.com/doctrine/orm/pull/12185) thanks to @dependabot[bot] - [12180: add jobs using PHP 8.5 in the CI](https://github.com/doctrine/orm/pull/12180) thanks to @xabbuh - [12139: Bump actions/checkout from 4 to 5](https://github.com/doctrine/orm/pull/12139) thanks to @dependabot[bot] - [12127: Bump actions/download-artifact from 4 to 5](https://github.com/doctrine/orm/pull/12127) thanks to @dependabot[bot] #### Improvement - [12238: Avoid triggering a deprecation notice in doctrine/collections](https://github.com/doctrine/orm/pull/12238) thanks to @mpdude - [12216: Use docs builder in ORM repo](https://github.com/doctrine/orm/pull/12216) thanks to @paulinevos #### Documentation - [12233: Docs: fix typos and grammar across reference docs](https://github.com/doctrine/orm/pull/12233) thanks to @alisolphp #### Test Suite - [12220: Escape library as a table name in tests (#12170)](https://github.com/doctrine/orm/pull/12220) thanks to @mbeccati - [12200: Fix DQL JOIN syntax in two test cases](https://github.com/doctrine/orm/pull/12200) thanks to @mpdude - [12003: Remove calls to `getMockForAbstractClass()`](https://github.com/doctrine/orm/pull/12003) thanks to @derrabus #### Bug - [12212: Revert &quot;Fix fields of transient classes being considered duplicate with `reportFieldsWhereDeclared` (#11769)&quot;](https://github.com/doctrine/orm/pull/12212) thanks to @mpdude - [12190: Fix collection filtering API for `IN`/`NOT IN` comparisons that require type conversions](https://github.com/doctrine/orm/pull/12190) thanks to @mpdude - [12187: &#91;GH-9219&#93; Add support for toIterable over mixed or scalar results.](https://github.com/doctrine/orm/pull/12187) thanks to @beberlei - [12183: Paginator with output walker returns count 0 when the query has previously been executed](https://github.com/doctrine/orm/pull/12183) thanks to @mpdude - [12182: do not call setAccessible() on PHP &gt;= 8.1](https://github.com/doctrine/orm/pull/12182) thanks to @xabbuh - [12181: use the empty string instead of null as an array offset](https://github.com/doctrine/orm/pull/12181) thanks to @xabbuh - [12174: Do not eagerly set metadata from `ResolveTargetEntityListener`](https://github.com/doctrine/orm/pull/12174) thanks to @mpdude - [11895: Fix `IN`/`NOT IN` expression handling and support enums when matching on to-many-collections](https://github.com/doctrine/orm/pull/11895) thanks to @mpdude #### Code Style - [12134: PHPCS 3.13.2](https://github.com/doctrine/orm/pull/12134) thanks to @greg0ire - [12133: PHPStan 2.1.22](https://github.com/doctrine/orm/pull/12133) thanks to @greg0ire - [12053: chore: remove run-all.sh](https://github.com/doctrine/orm/pull/12053) thanks to @alexislefebvre --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
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
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
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: doctrine/archived-orm#13612
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?