Add cascade annotation option support in ClassSourceManipulator

src/Doctrine/BaseRelation.php

@@ -28,6 +28,7 @@ public function __construct(
         private bool $isOwning = false,
         private bool $orphanRemoval = false,
         private bool $isNullable = false,
+        private array $cascade = []
     ) {
     }
 
@@ -85,4 +86,9 @@ public function isNullable(): bool
     {
         return $this->isNullable;
     }
+
+    public function getCascade(): array
+    {
+        return $this->cascade;
+    }
 }

src/Util/ClassSourceManipulator.php

@@ -464,6 +464,10 @@ private function addSingularRelation(BaseRelation $relation): void
             $annotationOptions['targetEntity'] = new ClassNameValue($typeHint, $relation->getTargetClassName());
         }
 
+        if ($cascade = $relation->getCascade()) {
+            $annotationOptions['cascade'] = $cascade;
+        }
+
         if ($relation instanceof RelationOneToOne) {
             $annotationOptions['cascade'] = ['persist', 'remove'];
         }
@@ -550,6 +554,10 @@ private function addCollectionRelation(BaseCollectionRelation $relation): void
             $annotationOptions['orphanRemoval'] = true;
         }
 
+        if ($cascade = $relation->getCascade()) {
+            $annotationOptions['cascade'] = $cascade;
+        }
+
         $attributes = [
             $this->buildAttributeNode(
                 $relation instanceof RelationManyToMany ? ManyToMany::class : OneToMany::class,

tests/Util/ClassSourceManipulatorTest.php

@@ -404,6 +404,20 @@ public function getAddManyToOneRelationTests(): \Generator
                 isNullable: true,
             ),
         ];
+
+        yield 'many_to_one_cascade_persist' => [
+            'User_simple.php',
+            'User_simple_cascade_persist.php',
+            new RelationManyToOne(
+                propertyName: 'category',
+                targetClassName: \App\Entity\Category::class,
+                targetPropertyName: 'foods',
+                mapInverseRelation: false,
+                isOwning: true,
+                isNullable: true,
+                cascade: ['persist'],
+            ),
+        ];
     }
 
     /**
@@ -464,6 +478,17 @@ public function getAddOneToManyRelationTests(): \Generator
             ),
         ];
 
+        yield 'one_to_many_cascade_persist' => [
+            'User_simple.php',
+            'User_simple_cascade_persist.php',
+            new RelationOneToMany(
+                propertyName: 'avatarPhotos',
+                targetClassName: \App\Entity\UserAvatarPhoto::class,
+                targetPropertyName: 'user',
+                cascade: ['persist'],
+            ),
+        ];
+
         // todo test existing constructor
     }
 
@@ -524,6 +549,19 @@ public function getAddManyToManyRelationTests(): \Generator
                 isOwning: true,
             ),
         ];
+
+        yield 'many_to_many_cascade_persist' => [
+            'User_simple.php',
+            'User_simple_cascade_persist.php',
+            new RelationManyToMany(
+                propertyName: 'recipes',
+                targetClassName: \App\Entity\Recipe::class,
+                targetPropertyName: 'foods',
+                mapInverseRelation: false,
+                isOwning: true,
+                cascade: ['persist'],
+            ),
+        ];
     }
 
     /**
@@ -643,6 +681,19 @@ public function getAddOneToOneRelationTests(): \Generator
                 isNullable: true,
             ),
         ];
+
+        yield 'one_to_one_cascade_persist_only' => [
+            'User_simple.php',
+            'User_simple_owning.php', // Same because ['persist', 'remove'] is forced
+            new RelationOneToOne(
+                propertyName: 'userProfile',
+                targetClassName: \App\Entity\UserProfile::class,
+                targetPropertyName: 'user',
+                isOwning: true,
+                isNullable: true,
+                cascade: ['persist'],
+            ),
+        ];
     }
 
     public function testAddInterface(): void

tests/Util/fixtures/add_many_to_many_relation/User_simple_cascade_persist.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+class User
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column()]
+    private ?int $id = null;
+
+    #[ORM\ManyToMany(targetEntity: Recipe::class, cascade: ['persist'])]
+    private Collection $recipes;
+
+    public function __construct()
+    {
+        $this->recipes = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return Collection<int, Recipe>
+     */
+    public function getRecipes(): Collection
+    {
+        return $this->recipes;
+    }
+
+    public function addRecipe(Recipe $recipe): static
+    {
+        if (!$this->recipes->contains($recipe)) {
+            $this->recipes->add($recipe);
+        }
+
+        return $this;
+    }
+
+    public function removeRecipe(Recipe $recipe): static
+    {
+        $this->recipes->removeElement($recipe);
+
+        return $this;
+    }
+}

tests/Util/fixtures/add_many_to_one_relation/User_simple_cascade_persist.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+class User
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column()]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne(cascade: ['persist'])]
+    private ?Category $category = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getCategory(): ?Category
+    {
+        return $this->category;
+    }
+
+    public function setCategory(?Category $category): static
+    {
+        $this->category = $category;
+
+        return $this;
+    }
+}

tests/Util/fixtures/add_one_to_many_relation/User_simple_cascade_persist.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+class User
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column()]
+    private ?int $id = null;
+
+    #[ORM\OneToMany(mappedBy: 'user', targetEntity: UserAvatarPhoto::class, cascade: ['persist'])]
+    private Collection $avatarPhotos;
+
+    public function __construct()
+    {
+        $this->avatarPhotos = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return Collection<int, UserAvatarPhoto>
+     */
+    public function getAvatarPhotos(): Collection
+    {
+        return $this->avatarPhotos;
+    }
+
+    public function addAvatarPhoto(UserAvatarPhoto $avatarPhoto): static
+    {
+        if (!$this->avatarPhotos->contains($avatarPhoto)) {
+            $this->avatarPhotos->add($avatarPhoto);
+            $avatarPhoto->setUser($this);
+        }
+
+        return $this;
+    }
+
+    public function removeAvatarPhoto(UserAvatarPhoto $avatarPhoto): static
+    {
+        if ($this->avatarPhotos->removeElement($avatarPhoto)) {
+            // set the owning side to null (unless already changed)
+            if ($avatarPhoto->getUser() === $this) {
+                $avatarPhoto->setUser(null);
+            }
+        }
+
+        return $this;
+    }
+}