Fix original data incomplete after flush

olsavmic · olsavmic · commit fa3916c98cd4 · 2021-12-29T13:50:46.000+01:00
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -658,6 +658,7 @@ public function computeChangeSet(ClassMetadata $class, $entity)
             if ($class->isCollectionValuedAssociation($name) && $value !== null) {
                 if ($value instanceof PersistentCollection) {
                     if ($value->getOwner() === $entity) {
+                        $actualData[$name] = $value;
                         continue;
                     }
 
diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
@@ -828,6 +828,75 @@ public function testItThrowsWhenLookingUpIdentifierForUnknownEntity(): void
         $this->expectException(EntityNotFoundException::class);
         $this->_unitOfWork->getEntityIdentifier(new stdClass());
     }
+
+    /**
+     * @group #9300
+     */
+    public function testPersistedCollectionIsPresentInOriginalDataAfterComputeChangeset(): void
+    {
+        $entity = new EntityWithCollection();
+        $entity->children->add(new ChildEntity());
+        $entity->name = 'abc';
+
+        $this->_unitOfWork->persist($entity);
+        $this->_unitOfWork->commit();
+
+        $entity->name = 'abcd';
+        $this->_unitOfWork->computeChangeSets();
+
+        self::assertArrayHasKey('children', $this->_unitOfWork->getOriginalEntityData($entity));
+    }
+}
+
+/**
+ * @Entity
+ */
+class EntityWithCollection
+{
+    /**
+     * @var Collection|ChildEntity[]
+     * @OneToMany(targetEntity="ChildEntity", mappedBy="parent", cascade={"persist"})
+     */
+    public $children;
+
+    /**
+     * @var int
+     * @Id
+     * @Column(type="integer")
+     * @GeneratedValue
+     */
+    public $id;
+
+    /**
+     * @var string
+     * @Column(type="string")
+     */
+    public $name;
+
+    public function __construct()
+    {
+        $this->children = new ArrayCollection();
+    }
+}
+
+/**
+ * @Entity
+ */
+class ChildEntity
+{
+    /**
+     * @var int
+     * @Id
+     * @Column(type="integer")
+     * @GeneratedValue
+     */
+    public $id;
+
+    /**
+     * @var int
+     * @ManyToOne(targetEntity="EntityWithCollection", inversedBy="children")
+     */
+    public $parent;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -658,6 +658,7 @@ public function computeChangeSet(ClassMetadata $class, $entity)`
`658`	`658`	`if ($class->isCollectionValuedAssociation($name) && $value !== null) {`
`659`	`659`	`if ($value instanceof PersistentCollection) {`
`660`	`660`	`if ($value->getOwner() === $entity) {`
	`661`	`+ $actualData[$name] = $value;`
`661`	`662`	`continue;`
`662`	`663`	`}`
`663`	`664`