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

[PR #12224] [MERGED] Merge 2.20.x up into 3.5.x #13593

New Issue
Open
opened 2026-01-22 16:17:41 +01:00 by admin · 0 comments
admin commented 2026-01-22 16:17:41 +01:00
Owner
Copy Link

📋 Pull Request Information

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

Base: 3.5.x ← Head: 3.5.x

📝 Commits (9)

  • 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
  • 5f6896a Avoid using LIBRARY as table name (#12170)
  • c1ce2bb Merge pull request #12220 from mbeccati/fix-mysql9-library
  • 693acbf Bump doctrine/.github from 8.0.0 to 10.1.0
  • 5def068 Merge pull request #12223 from doctrine/dependabot/github_actions/2.20.x/doctrine/dot-github-10.1.0
  • 214b1ad Merge remote-tracking branch 'origin/2.20.x' into 3.5.x

📊 Changes

8 files changed (+17 additions, -40 deletions)

View changed files

📝 .github/workflows/coding-standards.yml (+1 -1)
📝 .github/workflows/continuous-integration.yml (+4 -0)
📝 .github/workflows/documentation.yml (+1 -1)
📝 .github/workflows/release-on-milestone-closed.yml (+1 -1)
📝 docs/en/reference/limitations-and-known-issues.rst (+8 -0)
📝 src/Mapping/Driver/ReflectionBasedDriver.php (+0 -5)
📝 tests/Tests/Models/Enums/Library.php (+2 -0)
📝 tests/Tests/ORM/Functional/Ticket/GH10450Test.php (+0 -32)

📄 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/12224 **Author:** [@greg0ire](https://github.com/greg0ire) **Created:** 10/13/2025 **Status:** ✅ Merged **Merged:** 10/13/2025 **Merged by:** [@greg0ire](https://github.com/greg0ire) **Base:** `3.5.x` ← **Head:** `3.5.x` --- ### 📝 Commits (9) - [`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 - [`5f6896a`](https://github.com/doctrine/orm/commit/5f6896a2f9d963167ba99533ce757399b3d8bfa0) Avoid using LIBRARY as table name (#12170) - [`c1ce2bb`](https://github.com/doctrine/orm/commit/c1ce2bb6874e9201823d7ff888fb0830048c8261) Merge pull request #12220 from mbeccati/fix-mysql9-library - [`693acbf`](https://github.com/doctrine/orm/commit/693acbf8129adff640e0f3b1445f3f7e67fc8208) Bump doctrine/.github from 8.0.0 to 10.1.0 - [`5def068`](https://github.com/doctrine/orm/commit/5def068fe96a7e0da1e354da19f9124b4dbb90af) Merge pull request #12223 from doctrine/dependabot/github_actions/2.20.x/doctrine/dot-github-10.1.0 - [`214b1ad`](https://github.com/doctrine/orm/commit/214b1ad739fa7de57867d08dde1692a94888a95d) Merge remote-tracking branch 'origin/2.20.x' into 3.5.x ### 📊 Changes **8 files changed** (+17 additions, -40 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/coding-standards.yml` (+1 -1) 📝 `.github/workflows/continuous-integration.yml` (+4 -0) 📝 `.github/workflows/documentation.yml` (+1 -1) 📝 `.github/workflows/release-on-milestone-closed.yml` (+1 -1) 📝 `docs/en/reference/limitations-and-known-issues.rst` (+8 -0) 📝 `src/Mapping/Driver/ReflectionBasedDriver.php` (+0 -5) 📝 `tests/Tests/Models/Enums/Library.php` (+2 -0) 📝 `tests/Tests/ORM/Functional/Ticket/GH10450Test.php` (+0 -32) </details> ### 📄 Description _No description provided_ --- <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:41 +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#13593
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?