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 #12293] [MERGED] Merge 3.5.x. up into 3.6.x #13661

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

📋 Pull Request Information

Original PR: https://github.com/doctrine/orm/pull/12293
Author: @greg0ire
Created: 11/24/2025
Status: ✅ Merged
Merged: 11/24/2025
Merged by: @greg0ire

Base: 3.6.x ← Head: 3.5.x

📝 Commits (6)

  • bc95c7c Fix check for composite foreign key
  • 15537bc Merge pull request #12285 from HypeMC/fix-is-foreign-key-composite
  • 649048f Merge remote-tracking branch 'origin/2.20.x' into 3.5.x
  • ffa50a7 Merge pull request #12286 from greg0ire/3.5.x
  • 01c178b Add ORDER BY clause to more test cases
  • ee70178 Merge pull request #12287 from greg0ire/more-order-by

📊 Changes

2 files changed (+17 additions, -7 deletions)

View changed files

📝 src/UnitOfWork.php (+8 -4)
📝 tests/Tests/ORM/Functional/QueryTest.php (+9 -3)

📄 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/12293 **Author:** [@greg0ire](https://github.com/greg0ire) **Created:** 11/24/2025 **Status:** ✅ Merged **Merged:** 11/24/2025 **Merged by:** [@greg0ire](https://github.com/greg0ire) **Base:** `3.6.x` ← **Head:** `3.5.x` --- ### 📝 Commits (6) - [`bc95c7c`](https://github.com/doctrine/orm/commit/bc95c7c08d56a155c19244b94e08b7fa6e419215) Fix check for composite foreign key - [`15537bc`](https://github.com/doctrine/orm/commit/15537bc2180719bbfbafbcab92d4c6912b566c40) Merge pull request #12285 from HypeMC/fix-is-foreign-key-composite - [`649048f`](https://github.com/doctrine/orm/commit/649048f745c3952c261c7328c2406df38a7ac03f) Merge remote-tracking branch 'origin/2.20.x' into 3.5.x - [`ffa50a7`](https://github.com/doctrine/orm/commit/ffa50a777f39b9bb9a722958e347feebd7ccdfd0) Merge pull request #12286 from greg0ire/3.5.x - [`01c178b`](https://github.com/doctrine/orm/commit/01c178b297f8dfb6e1348afbb77b4d4b8e08b27e) Add ORDER BY clause to more test cases - [`ee70178`](https://github.com/doctrine/orm/commit/ee701783145696014f04843103299f28b5bc9519) Merge pull request #12287 from greg0ire/more-order-by ### 📊 Changes **2 files changed** (+17 additions, -7 deletions) <details> <summary>View changed files</summary> 📝 `src/UnitOfWork.php` (+8 -4) 📝 `tests/Tests/ORM/Functional/QueryTest.php` (+9 -3) </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:18:00 +01:00
admin closed this issue 2026-01-22 16:18:00 +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#13661
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?