[PR #12314] [MERGED] Merge 3.6.x into 4.0.x #13681

New Issue

Closed

opened 2026-01-22 16:18:06 +01:00 by admin · 0 comments

admin commented 2026-01-22 16:18:06 +01:00

Owner

Copy Link

📋 Pull Request Information

Original PR: https://github.com/doctrine/orm/pull/12314
Author: @derrabus
Created: 11/30/2025
Status: ✅ Merged
Merged: 11/30/2025
Merged by: @derrabus

Base: 4.0.x ← Head: 4.0.x

---

📝 Commits (10+)

• e38278b Fix eager fetch composite foreign key (#11397)
• 9f19310 Merge remote-tracking branch 'origin/2.20.x' into 3.5.x
• 6087054 Merge pull request #12277 from greg0ire/3.5.x
• e4d7df2 Fix documentation about default values
• c1becd5 Merge pull request #12281 from greg0ire/document-default-expressions
• 3df11d5 Merge pull request #12283 from doctrine/2.20.x
• 6982c8a Merge pull request #12284 from doctrine/3.5.x
• 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

📊 Changes

23 files changed (+123 additions, -58 deletions)

View changed files

📝 .github/workflows/coding-standards.yml (+1 -1)
📝 .github/workflows/composer-lint.yml (+1 -1)
📝 .github/workflows/continuous-integration.yml (+5 -5)
📝 .github/workflows/documentation.yml (+1 -1)
📝 .github/workflows/phpbench.yml (+1 -1)
📝 .github/workflows/release-on-milestone-closed.yml (+1 -1)
📝 .github/workflows/static-analysis.yml (+1 -1)
📝 composer.json (+0 -1)
📝 docs/en/reference/basic-mapping.rst (+15 -0)
➕ docs/en/reference/basic-mapping/DefaultValues.php (+15 -0)
➕ docs/en/reference/basic-mapping/default-values.xml (+9 -0)
📝 docs/en/reference/faq.rst (+0 -24)
📝 phpstan-baseline.neon (+7 -1)
📝 src/Tools/Console/ApplicationCompatibility.php (+2 -1)
📝 src/Tools/SchemaTool.php (+1 -4)
📝 src/UnitOfWork.php (+9 -2)
📝 tests/Tests/Models/EagerFetchedCompositeOneToMany/RootEntity.php (+8 -3)
➕ tests/Tests/Models/EagerFetchedCompositeOneToMany/SecondLevelWithoutCompositePrimaryKey.php (+31 -0)
📝 tests/Tests/ORM/Functional/EagerFetchOneToManyWithCompositeKeyTest.php (+2 -1)
📝 tests/Tests/ORM/Functional/ParserResultSerializationTest.php (+0 -6)

...and 3 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/12314 **Author:** [@derrabus](https://github.com/derrabus) **Created:** 11/30/2025 **Status:** ✅ Merged **Merged:** 11/30/2025 **Merged by:** [@derrabus](https://github.com/derrabus) **Base:** `4.0.x` ← **Head:** `4.0.x` --- ### 📝 Commits (10+) - [`e38278b`](https://github.com/doctrine/orm/commit/e38278bfca0ea258e3f733b6664f4672906e5bd5) Fix eager fetch composite foreign key (#11397) - [`9f19310`](https://github.com/doctrine/orm/commit/9f19310f27d6c808b19f92f3591729cbadeaf66f) Merge remote-tracking branch 'origin/2.20.x' into 3.5.x - [`6087054`](https://github.com/doctrine/orm/commit/608705427ec6ce451987f0032c567e4a7ea5ccc3) Merge pull request #12277 from greg0ire/3.5.x - [`e4d7df2`](https://github.com/doctrine/orm/commit/e4d7df29c237b8bbe37eed0f33b543337948a533) Fix documentation about default values - [`c1becd5`](https://github.com/doctrine/orm/commit/c1becd54e66f841a6361d9d77001fa67fb523541) Merge pull request #12281 from greg0ire/document-default-expressions - [`3df11d5`](https://github.com/doctrine/orm/commit/3df11d518cbdeec50fd591cbe17ebf47eb4ff988) Merge pull request #12283 from doctrine/2.20.x - [`6982c8a`](https://github.com/doctrine/orm/commit/6982c8ab9d65a0913193b5f8f9bd6347d2a00484) Merge pull request #12284 from doctrine/3.5.x - [`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 ### 📊 Changes **23 files changed** (+123 additions, -58 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/coding-standards.yml` (+1 -1) 📝 `.github/workflows/composer-lint.yml` (+1 -1) 📝 `.github/workflows/continuous-integration.yml` (+5 -5) 📝 `.github/workflows/documentation.yml` (+1 -1) 📝 `.github/workflows/phpbench.yml` (+1 -1) 📝 `.github/workflows/release-on-milestone-closed.yml` (+1 -1) 📝 `.github/workflows/static-analysis.yml` (+1 -1) 📝 `composer.json` (+0 -1) 📝 `docs/en/reference/basic-mapping.rst` (+15 -0) ➕ `docs/en/reference/basic-mapping/DefaultValues.php` (+15 -0) ➕ `docs/en/reference/basic-mapping/default-values.xml` (+9 -0) 📝 `docs/en/reference/faq.rst` (+0 -24) 📝 `phpstan-baseline.neon` (+7 -1) 📝 `src/Tools/Console/ApplicationCompatibility.php` (+2 -1) 📝 `src/Tools/SchemaTool.php` (+1 -4) 📝 `src/UnitOfWork.php` (+9 -2) 📝 `tests/Tests/Models/EagerFetchedCompositeOneToMany/RootEntity.php` (+8 -3) ➕ `tests/Tests/Models/EagerFetchedCompositeOneToMany/SecondLevelWithoutCompositePrimaryKey.php` (+31 -0) 📝 `tests/Tests/ORM/Functional/EagerFetchOneToManyWithCompositeKeyTest.php` (+2 -1) 📝 `tests/Tests/ORM/Functional/ParserResultSerializationTest.php` (+0 -6) _...and 3 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:18:06 +01:00

admin closed this issue 2026-01-22 16:18:07 +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#13681