[PR #12198] [MERGED] Update DQL arbitrary joins to use the ON keyword instead of WITH #13570

New Issue

Closed

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

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

Owner

Copy Link

📋 Pull Request Information

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

Base: 3.6.x ← Head: arbitrary_join_on

---

📝 Commits (1)

• 587caf8 Update DQL arbitrary joins to use the ON keyword instead of WITH

📊 Changes

14 files changed (+77 additions, -41 deletions)

View changed files

📝 UPGRADE.md (+8 -0)
📝 docs/en/reference/dql-doctrine-query-language.rst (+13 -6)
📝 src/Query/Parser.php (+22 -13)
📝 src/Query/TokenType.php (+1 -0)
📝 tests/Tests/ORM/Functional/QueryTest.php (+3 -3)
📝 tests/Tests/ORM/Functional/Ticket/DDC3042Test.php (+1 -1)
📝 tests/Tests/ORM/Functional/Ticket/GH6362Test.php (+1 -1)
📝 tests/Tests/ORM/Functional/Ticket/GH6464Test.php (+1 -1)
📝 tests/Tests/ORM/Functional/Ticket/GH7496WithToIterableTest.php (+1 -1)
📝 tests/Tests/ORM/Query/LanguageRecognitionTest.php (+12 -1)
📝 tests/Tests/ORM/Query/SelectSqlGenerationTest.php (+9 -9)
📝 tests/Tests/ORM/Tools/Pagination/CountWalkerTest.php (+1 -1)
📝 tests/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php (+2 -2)
📝 tests/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php (+2 -2)

📄 Description

DQL arbitrary joins are semantically equivalent to SQL joins, so using the same keyword reduces confusion. It also means that in next major version, the WITH keyword will only be about applying adhoc filtering on relations instead of having 2 responsibilities.

Closes https://github.com/doctrine/orm/issues/12192
Closes https://github.com/doctrine/orm/issues/7891 (the confusion is solved)
Closes https://github.com/doctrine/orm/issues/3544 (that constant now produces valid code)

---

_{🔄 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/12198 **Author:** [@stof](https://github.com/stof) **Created:** 10/7/2025 **Status:** ✅ Merged **Merged:** 10/25/2025 **Merged by:** [@stof](https://github.com/stof) **Base:** `3.6.x` ← **Head:** `arbitrary_join_on` --- ### 📝 Commits (1) - [`587caf8`](https://github.com/doctrine/orm/commit/587caf88a753d8573f7e44cdae76200731e033ce) Update DQL arbitrary joins to use the ON keyword instead of WITH ### 📊 Changes **14 files changed** (+77 additions, -41 deletions) <details> <summary>View changed files</summary> 📝 `UPGRADE.md` (+8 -0) 📝 `docs/en/reference/dql-doctrine-query-language.rst` (+13 -6) 📝 `src/Query/Parser.php` (+22 -13) 📝 `src/Query/TokenType.php` (+1 -0) 📝 `tests/Tests/ORM/Functional/QueryTest.php` (+3 -3) 📝 `tests/Tests/ORM/Functional/Ticket/DDC3042Test.php` (+1 -1) 📝 `tests/Tests/ORM/Functional/Ticket/GH6362Test.php` (+1 -1) 📝 `tests/Tests/ORM/Functional/Ticket/GH6464Test.php` (+1 -1) 📝 `tests/Tests/ORM/Functional/Ticket/GH7496WithToIterableTest.php` (+1 -1) 📝 `tests/Tests/ORM/Query/LanguageRecognitionTest.php` (+12 -1) 📝 `tests/Tests/ORM/Query/SelectSqlGenerationTest.php` (+9 -9) 📝 `tests/Tests/ORM/Tools/Pagination/CountWalkerTest.php` (+1 -1) 📝 `tests/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php` (+2 -2) 📝 `tests/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php` (+2 -2) </details> ### 📄 Description DQL arbitrary joins are semantically equivalent to SQL joins, so using the same keyword reduces confusion. It also means that in next major version, the WITH keyword will only be about applying adhoc filtering on relations instead of having 2 responsibilities. Closes https://github.com/doctrine/orm/issues/12192 Closes https://github.com/doctrine/orm/issues/7891 (the confusion is solved) Closes https://github.com/doctrine/orm/issues/3544 (that constant now produces valid code) --- _{🔄 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:35 +01:00

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