-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merging a new entity with PrePersist event make changes in callback not be considered #6174
Merging a new entity with PrePersist event make changes in callback not be considered #6174
Conversation
… lifecyle events changes be persisted
…ener when using merge instead of persist)
@Ocramius it seems tests fail due to Travis |
@moroine everything seems fine in the code changes, but the test is reusing some code that seems unrelated (entity resolver listeners). I'm currently rewriting the test to get rid of that. |
… triggering on `UnitOfWork` into the `UnitOfWorkTest`
…es are merged, but are already in the UoW
…ener`, since `UnitOfWorkTest` now completely encapsulates the scenarios being covered
…es are merged, but are already in the UoW
…ener`, since `UnitOfWorkTest` now completely encapsulates the scenarios being covered
Moved to #6177, applied fixes locally, rewrote the tests to reduce cross-test dependencies. 👍 |
Amazing ! Thanks a lot ! The next patch version will make me abandon my one year fork !!! |
This release relaxes [`doctrine/common`](https://github.com/doctrine/common) requirements in order to allow installation of versions that support PHP 7.1 features in proxy class generation. Please note that a similar requirement relaxation still needs to be applied to [`doctrine/dbal`](https://github.com/doctrine/dbal) in order to allow installation of the latest `doctrine/common` versions. [doctrine#6156](doctrine#6156) This version also backports some fixes around the eviction of the second level cache entries of inverse side associations in one-to-many - many-to-one mappings. [doctrine#6159](doctrine#6159) Further fixes were applied in order to have child classes in inheritance mapping share the same timestamp region when the second level cache is enabled. [doctrine#6028](doctrine#6028) Also, `Doctrine\ORM\EntityManager#merge()` now triggers `Doctrine\ORM\Events::prePersist` listeners with the merged entity state whenever an internal `Doctrine\ORM\UnitOfWork#persist()` call is implied. [doctrine#6177](doctrine#6177). Total issues resolved: **8** - [5570: Fix PrePersist EventListener when using merge instead of persist](doctrine#5570) - [6028: Make child entity share the timestamp region with parent class](doctrine#6028) - [6110: Clear $this->collection even when empty, to reset keys](doctrine#6110) - [6156: Allow doctrine/common 2.7](doctrine#6156) - [6159: doctrine#5821 Backport doctrine#1551 - Fixed support for inverse side second level cache](doctrine#6159) - [6174: Merging a new entity with PrePersist event make changes in callback not be considered](doctrine#6174) - [6177: Fix doctrine#6174 doctrine#5570: merging new entities should also trigger prepersist lifecycle callbacks with merged entity data](doctrine#6177) - [6178: Backport doctrine#6177 - fix doctrine#6174 doctrine#5570: merging new entities should also trigger prepersist lifecycle callbacks with the merged data](doctrine#6178) # gpg: directory `/c/Users/PC/.gnupg' created # gpg: new configuration file `/c/Users/PC/.gnupg/gpg.conf' created # gpg: WARNING: options in `/c/Users/PC/.gnupg/gpg.conf' are not yet active during this run # gpg: keyring `/c/Users/PC/.gnupg/pubring.gpg' created # gpg: Signature made Tue Dec 20 00:49:05 2016 FLEST using DSA key ID 12EC2DF8 # gpg: Can't check signature: public key not found # Conflicts: # lib/Doctrine/ORM/Event/LoadClassMetadataEventArgs.php # lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php # tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php # tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php # tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php
… event subscriber triggering on `UnitOfWork` into the `UnitOfWorkTest`
…lled when entities are merged, but are already in the UoW
…-cases it's in
…panyContractListener`, since `UnitOfWorkTest` now completely encapsulates the scenarios being covered
…or PHP 5.4 compat (still supported in ORM 2.5.x)
When merging a new entity, the must act like a basic persist. But it seems that changes made into the PrePersist event callback are not persisted.
To fix this I firstly refactor two features in the
doMerge
:ensureVersionMatch
: that check the requested merge entity version is correct (in case of versionned one)isLoaded
test used before ̀mergeEntityStateIntoManagedCopyinto
mergeEntityStateIntoManagedCopy`Then I move
mergeEntityStateIntoManagedCopy
calls to ensure that it will be called always beforepersistNew
.This will also fixed one of my previously PR (#5570) that is schedule for the next patch release.