{"push_id":1292251945,"size":7,"distinct_size":7,"ref":"refs/heads/master","head":"22105058facf07be1545ee3b718887ad1190eca9","before":"3e3bfbf6d80ace524fd21196c214ef56161b45f5","commits":[{"sha":"01d51bfca391e49bbb596c90d1a9c4766533155a","author":{"name":"Mathieu De Zutter","email":"0789618342d6bc1c49d35a034a18649599dd440c@dezutter.org"},"message":"Avoid conflicts due to spl_object_hash().\n\nWhen merging an entity with a to-many association, it will store the\noriginal entity data using the object hash of the to-be-merged entity\ninstead of the managed entity. Since this to-be-merged entity is not\nmanaged by Doctrine, it can disappear from the memory. A new object\ncan reuse the same memory location and thus have the same object hash.\nWhen one tries to persist this object as new, Doctrine will refuse it\nbecause it thinks that the entity is managed+dirty.\n\nThis patch is a very naive fix: it just disables storing the original\nentity data in case of to-many associations. It may not be the ideal\nor even a good solution at all, but it solves the problem of object\nhash reuse.\n\nThe test case relies on the immediate reusing of memory locations by\nPHP. The variable $user has twice the same object hash, though referring\na different object. Tested on PHP 5.6.17\n\nWithout the fix, the test fails on the last line with:\nA managed+dirty entity Doctrine\\Tests\\Models\\CMS\\CmsUser@[...] can not\nbe scheduled for insertion.","distinct":true,"url":"https://api.github.com/repos/doctrine/doctrine2/commits/01d51bfca391e49bbb596c90d1a9c4766533155a"},{"sha":"b8c7d871bee7a4290551439ce65c7a66cf92041d","author":{"name":"Mathieu De Zutter","email":"0789618342d6bc1c49d35a034a18649599dd440c@dezutter.org"},"message":"Remove old code in comments.","distinct":true,"url":"https://api.github.com/repos/doctrine/doctrine2/commits/b8c7d871bee7a4290551439ce65c7a66cf92041d"},{"sha":"44af69c5d2299e46f90a94e91c35711afe8392de","author":{"name":"Mathieu De Zutter","email":"0789618342d6bc1c49d35a034a18649599dd440c@dezutter.org"},"message":"Additional assertion to check that unreferenced objects are not in UOW.","distinct":true,"url":"https://api.github.com/repos/doctrine/doctrine2/commits/44af69c5d2299e46f90a94e91c35711afe8392de"},{"sha":"75bf197e115ce7f66ff49adc7c96f2f72c896762","author":{"name":"Marco Pivetta","email":"12aff7f47a1f9ab130c2e22e0fc28956995f6c7d@gmail.com"},"message":"#5689 moved `OidReuseTest` contents into the `UnitOfWork` tests","distinct":true,"url":"https://api.github.com/repos/doctrine/doctrine2/commits/75bf197e115ce7f66ff49adc7c96f2f72c896762"},{"sha":"f8436b2165ea6878e0fb45dbd3c30493443f544d","author":{"name":"Marco Pivetta","email":"12aff7f47a1f9ab130c2e22e0fc28956995f6c7d@gmail.com"},"message":"#5689 removed `OidReuseTest`, which was moved to `UnitOfWork` tests","distinct":true,"url":"https://api.github.com/repos/doctrine/doctrine2/commits/f8436b2165ea6878e0fb45dbd3c30493443f544d"},{"sha":"503b211a22db02ea825942aacf6dbff87d438aaa","author":{"name":"Marco Pivetta","email":"12aff7f47a1f9ab130c2e22e0fc28956995f6c7d@gmail.com"},"message":"#5689 removed unused reflection access","distinct":true,"url":"https://api.github.com/repos/doctrine/doctrine2/commits/503b211a22db02ea825942aacf6dbff87d438aaa"},{"sha":"22105058facf07be1545ee3b718887ad1190eca9","author":{"name":"Marco Pivetta","email":"12aff7f47a1f9ab130c2e22e0fc28956995f6c7d@gmail.com"},"message":"Merge branch 'fix/#5689-avoid-object-hash-conflicts-due-to-merge-operations'\n\nClose #5689","distinct":true,"url":"https://api.github.com/repos/doctrine/doctrine2/commits/22105058facf07be1545ee3b718887ad1190eca9"}]}
{"actor":{"display_login":"Ocramius"}}