Store PersistentCollection changes in entity change set as array #9939
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
greg0ire
reviewed
Jul 28, 2022
lib/Doctrine/ORM/UnitOfWork.php
Outdated
| @@ -683,7 +683,7 @@ public function computeChangeSet(ClassMetadata $class, object $entity): void | |||
| } | |||
|
|
|||
| $this->collectionDeletions[$coid] = $orgValue; | |||
| $changeSet[$propName] = $orgValue; // Signal changeset, to-many assocs will be ignored. | |||
| $changeSet[$propName] = [$orgValue, $actualData]; | |||
There was a problem hiding this comment.
I wonder if this change will leave dead code somewhere that handled the non-array value of $changeSet[$propName] = $orgValue;, but I haven't found any.
franmomu
force-pushed
the
fix_entity_changeset_persistent_collection
branch
2 times, most recently
from
40216fc
to
60a407a
Compare
3 tasks
franmomu
force-pushed
the
fix_entity_changeset_persistent_collection
branch
3 times, most recently
from
702daeb
to
0942222
Compare
SenseException
previously approved these changes
Aug 15, 2022
franmomu
force-pushed
the
fix_entity_changeset_persistent_collection
branch
from
0942222
to
8d192f4
Compare
greg0ire
previously approved these changes
Jan 5, 2023
|
Can we prepare this change on 2.x somehow, e.g. by allowing apps to opt-in to it? |
SenseException
previously approved these changes
Jan 11, 2023
The property $entityChangeSets of UnitOfWork stores entity changes as an array of two items for each property changed. Before this change, when an entity with a property holding a Collection was changed, $entityChangeSets stored only the old Collection.
franmomu
dismissed stale reviews from SenseException and greg0ire
via
ec9f131
franmomu
force-pushed
the
fix_entity_changeset_persistent_collection
branch
2 times, most recently
from
754fde3
to
211347d
Compare
franmomu
force-pushed
the
fix_entity_changeset_persistent_collection
branch
from
211347d
to
f0df183
Compare
|
I forgot about this PR.
I cannot think a way to do that 😞 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The property
$entityChangeSetsof UnitOfWork stores entity changes as an array of two items for each property changed.orm/lib/Doctrine/ORM/UnitOfWork.php
Lines 143 to 149 in a3a8caa
But for
Collectionit has another behaviour as pointed out in #8955 and changed the phpdoc in #8959.That was added in 65bbdc3.
This PR modifies that case storing an
arrayinstead of thePersistentCollection, this will allowPreUpdateEventArgsto extend fromPreUpdateEventArgsofdoctrine/persistence.I'm not sure if this is the right fix, but apparently the test added in the original commit passes with this change.