Merge 1.x into 2.x

sonata-project · Aug 3, 2023 · dc45b90 · dc45b90
2 parents 84c72e9 + 8f11cb1
commit dc45b90
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/tests/Fixtures/Relation/OwnedEntity2.php b/tests/Fixtures/Relation/OwnedEntity2.php
@@ -37,7 +37,7 @@ class OwnedEntity2
      * @var OwnerEntity|null
      */
     #[ORM\ManyToOne(targetEntity: OwnerEntity::class)]
-    #[ORM\JoinColumn(name: 'owner_id_goes_here', referencedColumnName: 'some_strange_key_name')]
+    #[ORM\JoinColumn(name: 'owner_id_goes_here', referencedColumnName: 'some_strange_key_name', onDelete: 'SET NULL')]
     protected $owner;
 
     public function getId(): ?int

diff --git a/tests/RelationTest.php b/tests/RelationTest.php
@@ -108,17 +108,21 @@ public function testUndefinedIndexesInUOWForRelations(): void
 
         $em->flush();
 
+        $ownerId = $owner->getId();
+        $ownedId1 = $owned1->getId();
+        $ownedId2 = $owned2->getId();
+
         unset($owner, $owned1, $owned2);
 
         $em->clear();
 
-        $owner = $em->getReference(OwnerEntity::class, 1);
+        $owner = $em->getReference(OwnerEntity::class, $ownerId);
         static::assertNotNull($owner);
         $em->remove($owner);
-        $owned1 = $em->getReference(OwnedEntity1::class, 1);
+        $owned1 = $em->getReference(OwnedEntity1::class, $ownedId1);
         static::assertNotNull($owned1);
         $em->remove($owned1);
-        $owned2 = $em->getReference(OwnedEntity2::class, 1);
+        $owned2 = $em->getReference(OwnedEntity2::class, $ownedId2);
         static::assertNotNull($owned2);
         $em->remove($owned2);