[PR #12194] [MERGED] Merge 3.5.x into 3.6.x #13562

New Issue

Closed

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

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

Owner

Copy Link

📋 Pull Request Information

Original PR: https://github.com/doctrine/orm/pull/12194
Author: @derrabus
Created: 10/7/2025
Status: ✅ Merged
Merged: 10/7/2025
Merged by: @derrabus

Base: 3.6.x ← Head: 3.6.x

---

📝 Commits (10+)

• 9bf407f Fix IN/NOT IN expression handling and support enums when matching on to-many-collections
• b7423c9 Migrate away from getMockForAbstractClass()
• 9d5f112 Migrate to willReturn()
• 680a9ef Migrate away from assertStringNotMatchesFormat()
• 17059e5 Migrate away from annotations in tests
• 2d90917 Use PHPUnit 11 when possible
• db45697 Check extra condition to decide if a test was skipped
• 21e9fcb Merge pull request #12146 from greg0ire/upg-phpunit
• c164ae4 docs: generation strategies differences between DBAL 3 and 4
• f7d4e37 docs: consistent PostgreSQL's name case

📊 Changes

47 files changed (+548 additions, -303 deletions)

View changed files

📝 .github/workflows/continuous-integration.yml (+68 -4)
📝 composer.json (+1 -1)
📝 docs/en/reference/advanced-configuration.rst (+2 -0)
📝 docs/en/reference/architecture.rst (+3 -2)
📝 docs/en/reference/basic-mapping.rst (+7 -5)
📝 docs/en/sidebar.rst (+0 -2)
➖ docs/en/tutorials/getting-started-database.rst (+0 -26)
➖ docs/en/tutorials/getting-started-models.rst (+0 -24)
📝 docs/en/tutorials/getting-started.rst (+5 -4)
📝 phpstan-baseline.neon (+30 -36)
📝 phpstan-dbal3.neon (+5 -5)
📝 phpstan.neon (+3 -3)
📝 src/Persisters/Collection/ManyToManyPersister.php (+10 -3)
📝 src/Persisters/Entity/BasicEntityPersister.php (+7 -129)
📝 src/Persisters/Entity/JoinedSubclassPersister.php (+1 -1)
📝 src/Query/SqlWalker.php (+6 -2)
📝 src/Tools/Pagination/LimitSubqueryOutputWalker.php (+3 -1)
📝 src/Utility/PersisterHelper.php (+127 -0)
➕ tests/Tests/Models/Enums/BookCategory.php (+30 -0)
➕ tests/Tests/Models/Enums/BookGenre.php (+11 -0)

...and 27 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/12194 **Author:** [@derrabus](https://github.com/derrabus) **Created:** 10/7/2025 **Status:** ✅ Merged **Merged:** 10/7/2025 **Merged by:** [@derrabus](https://github.com/derrabus) **Base:** `3.6.x` ← **Head:** `3.6.x` --- ### 📝 Commits (10+) - [`9bf407f`](https://github.com/doctrine/orm/commit/9bf407f3369b1c6d2e46cacd0e4ed756da26cc3b) Fix `IN`/`NOT IN` expression handling and support enums when matching on to-many-collections - [`b7423c9`](https://github.com/doctrine/orm/commit/b7423c96cfcc42a090eb8b2385d1b474dd655155) Migrate away from getMockForAbstractClass() - [`9d5f112`](https://github.com/doctrine/orm/commit/9d5f112c7e4d4b28af023493a4e3ca73ab70867a) Migrate to willReturn() - [`680a9ef`](https://github.com/doctrine/orm/commit/680a9ef63294d3475c712fdd9ba1dffd763e3da9) Migrate away from assertStringNotMatchesFormat() - [`17059e5`](https://github.com/doctrine/orm/commit/17059e526536d5cea2665a2d84db5e1c9be7da01) Migrate away from annotations in tests - [`2d90917`](https://github.com/doctrine/orm/commit/2d9091778fc68983720088fdb3ee0666138ea757) Use PHPUnit 11 when possible - [`db45697`](https://github.com/doctrine/orm/commit/db456976eddd0aebcb83c42fb45c2af740f4e5c8) Check extra condition to decide if a test was skipped - [`21e9fcb`](https://github.com/doctrine/orm/commit/21e9fcbfbbf9a72abd8bf0d3f3e9d8c397fb80f3) Merge pull request #12146 from greg0ire/upg-phpunit - [`c164ae4`](https://github.com/doctrine/orm/commit/c164ae434febef66681caed86ec148a4adc265c4) docs: generation strategies differences between DBAL 3 and 4 - [`f7d4e37`](https://github.com/doctrine/orm/commit/f7d4e379bc15a8b8d1d0de63174ac13fbc8c6840) docs: consistent PostgreSQL's name case ### 📊 Changes **47 files changed** (+548 additions, -303 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/continuous-integration.yml` (+68 -4) 📝 `composer.json` (+1 -1) 📝 `docs/en/reference/advanced-configuration.rst` (+2 -0) 📝 `docs/en/reference/architecture.rst` (+3 -2) 📝 `docs/en/reference/basic-mapping.rst` (+7 -5) 📝 `docs/en/sidebar.rst` (+0 -2) ➖ `docs/en/tutorials/getting-started-database.rst` (+0 -26) ➖ `docs/en/tutorials/getting-started-models.rst` (+0 -24) 📝 `docs/en/tutorials/getting-started.rst` (+5 -4) 📝 `phpstan-baseline.neon` (+30 -36) 📝 `phpstan-dbal3.neon` (+5 -5) 📝 `phpstan.neon` (+3 -3) 📝 `src/Persisters/Collection/ManyToManyPersister.php` (+10 -3) 📝 `src/Persisters/Entity/BasicEntityPersister.php` (+7 -129) 📝 `src/Persisters/Entity/JoinedSubclassPersister.php` (+1 -1) 📝 `src/Query/SqlWalker.php` (+6 -2) 📝 `src/Tools/Pagination/LimitSubqueryOutputWalker.php` (+3 -1) 📝 `src/Utility/PersisterHelper.php` (+127 -0) ➕ `tests/Tests/Models/Enums/BookCategory.php` (+30 -0) ➕ `tests/Tests/Models/Enums/BookGenre.php` (+11 -0) _...and 27 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:33 +01:00

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