Skip to content

Merge release 3.5.2 into 3.6.x#12124

Merged
greg0ire merged 30 commits into3.6.xfrom
3.5.x-merge-up-into-3.6.x_N9Rr16zf
Aug 8, 2025
Merged

Merge release 3.5.2 into 3.6.x#12124
greg0ire merged 30 commits into3.6.xfrom
3.5.x-merge-up-into-3.6.x_N9Rr16zf

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Aug 8, 2025

Release Notes for 3.5.2

3.5.x bugfix release (patch)

3.5.2

  • Total issues resolved: 0
  • Total pull requests resolved: 2
  • Total contributors: 2

Test Suite

Bug

greg0ire and others added 30 commits December 7, 2024 15:39
Merge 2.20.x up into 2.21.x
Merge 2.20.x up into 2.21.x
…Yg2ZYgM

Merge release 2.20.1 into 2.21.x
* 2.20.x:
  Introduce testNotListedValueInEnumArray
  Fix documentation for JoinColumn nullable (#11798)
  Ignore deprecations from doctrine/common
  Fix fields of transient classes being considered duplicate with `reportFieldsWhereDeclared`
…O8nHxqC

Merge release 2.20.2 into 2.21.x
If scheduleForInsert was called in prePersist hook already, then persistNew need to check this case first, otherwise a ORMInvalidArgumentException will be thrown
…kdqS0u7

Merge release 2.20.3 into 2.21.x
Add functional strict-locking 2nd level cache test
When the persister is extended to do a multi update, the caching is not
wanted. The impact is minimal as the CPU/time overhead per query is
much bigger and the prepared statement is not cached anyway.
The new variable name is much more clearer.
Improve BasicEntityPersister to be more flexible and cleaner
Fix JoinedSubclassPersister as BasicEntityPersister was already fixed in GH-10735.

The fix can be verified by modifying UnitOfWork to execute `BasicEntityPersister::executeInserts()` for multiple entities at once for the same entity class/persister instance - https://github.com/doctrine/orm/blob/2.20.3/src/UnitOfWork.php#L1186 - then reproducible on `Doctrine\Tests\ORM\Functional\Ticket\GH10531Test::testInserts` test.

As extending/modifying UnitOfWork in tests in not easily possible, I submit this fix for v2.x without a test.
…_insert_of_multiple_entities

Fix JoinedSubclassPersister when multiple entities are inserted
…-branches-on-README

doc: update supported branches on README (2.20.x)
Inserts without post-inserted ID can be sent to DB grouped together
hence the extra test.
Using a nullable column that references another table as part of a
primary key makes no sense, and is ignored by DBAL. Let us ignore it at
the ORM level.
…ry_test

Add 2nd level cache test for insert without post-inserted ID
Merge 2.20.x up into 3.5.x
@greg0ire greg0ire merged commit e3c320c into 3.6.x Aug 8, 2025
320 of 329 checks passed
@greg0ire greg0ire deleted the 3.5.x-merge-up-into-3.6.x_N9Rr16zf branch August 8, 2025 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants