Fix #4252 Cascade first before refreshing the entity itself so toMany…

… associations are not reset to empty collections
doctrine · Apr 24, 2022 · 3b12f46 · 3b12f46
1 parent 676a1bb
commit 3b12f46
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -2216,12 +2216,12 @@ private function doRefresh($entity, array &$visited): void
             throw ORMInvalidArgumentException::entityNotManaged($entity);
         }
 
+        $this->cascadeRefresh($entity, $visited);
+
         $this->getEntityPersister($class->name)->refresh(
             array_combine($class->getIdentifierFieldNames(), $this->entityIdentifiers[$oid]),
             $entity
         );
-
-        $this->cascadeRefresh($entity, $visited);
     }
 
     /**

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH4252Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH4252Test.php
@@ -1,24 +1,27 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\Tests\OrmFunctionalTestCase;
 
 /**
  * @group GH-4252
  */
-class GH4252Test extends \Doctrine\Tests\OrmFunctionalTestCase
+class GH4252Test extends OrmFunctionalTestCase
 {
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema([
             $this->_em->getClassMetadata(GH4252City::class),
             $this->_em->getClassMetadata(GH4252Resident::class),
             $this->_em->getClassMetadata(GH4252Address::class),
-        ));
+        ]);
     }
 
     public function testIssue()
@@ -42,7 +45,7 @@ public function testIssue()
         $this->_em->refresh($city);
 
         $resident = $city->getResidents()->first();
-        $address = $resident->getAddresses()->first();
+        $address  = $resident->getAddresses()->first();
 
         $this->assertTrue($city->getFlag());
         $this->assertTrue($resident->getFlag());
@@ -69,7 +72,6 @@ class GH4252City
 
     /**
      * @var GH4252Resident[]|Collection
-     *
      * @OneToMany(targetEntity="Doctrine\Tests\ORM\Functional\Ticket\GH4252Resident", mappedBy="city", cascade={"persist","refresh"})
      */
     private $residents;
@@ -130,7 +132,6 @@ class GH4252Resident
 
     /**
      * @var GH4252Address[]|Collection
-     *
      * @ManyToMany(targetEntity="Doctrine\Tests\ORM\Functional\Ticket\GH4252Address", fetch="EXTRA_LAZY", cascade={"persist","refresh"})
      */
     private $addresses;