orphanRemoval belongs in the base relation object

Author: jrushlow

src/Doctrine/BaseCollectionRelation.php

@@ -18,8 +18,6 @@
  */
 abstract class BaseCollectionRelation extends BaseRelation
 {
-    abstract public function getOrphanRemoval(): bool;
-
     abstract public function getTargetSetterMethodName(): string;
 
     public function getAdderMethodName(): string

src/Doctrine/BaseRelation.php

@@ -25,7 +25,8 @@ public function __construct(
         private bool $avoidSetter = false,
         private bool $isCustomReturnTypeNullable = false,
         private ?string $customReturnType = null,
-        protected bool $isOwning = false,
+        private bool $isOwning = false,
+        private bool $orphanRemoval = false,
     ) {
         // @TODO - triggers are tmp, do not merge w/ them in place.
         if (null === $this->targetPropertyName) {
@@ -77,4 +78,9 @@ public function isOwning(): bool
     {
         return $this->isOwning;
     }
+
+    public function getOrphanRemoval(): bool
+    {
+        return $this->orphanRemoval;
+    }
 }

src/Doctrine/EntityRegenerator.php

@@ -140,9 +140,8 @@ public function regenerateEntities(string $classOrNamespace): void
                             propertyName: $mapping['fieldName'],
                             targetClassName: $mapping['targetEntity'],
                             targetPropertyName: $mapping['mappedBy'],
-                        ))
-                            ->setOrphanRemoval($mapping['orphanRemoval'])
-                        ;
+                            orphanRemoval: $mapping['orphanRemoval'],
+                        ));
 
                         $manipulator->addOneToManyRelation($relation);
 

src/Doctrine/EntityRelation.php

@@ -119,8 +119,8 @@ public function getInverseRelation(): RelationManyToMany|RelationOneToOne|Relati
                 targetClassName: $this->owningClass,
                 targetPropertyName: $this->owningProperty,
                 isSelfReferencing: $this->isSelfReferencing,
-            ))
-                ->setOrphanRemoval($this->orphanRemoval),
+                orphanRemoval: $this->orphanRemoval,
+            )),
             self::MANY_TO_MANY => (new RelationManyToMany(
                 propertyName: $this->inverseProperty,
                 targetClassName: $this->owningClass,

src/Doctrine/RelationManyToMany.php

@@ -18,11 +18,6 @@
  */
 final class RelationManyToMany extends BaseCollectionRelation
 {
-    public function getOrphanRemoval(): bool
-    {
-        return false;
-    }
-
     public function getTargetSetterMethodName(): string
     {
         return 'add'.Str::asCamelCase(Str::pluralCamelCaseToSingular($this->getTargetPropertyName()));

src/Doctrine/RelationOneToMany.php

@@ -18,20 +18,6 @@
  */
 final class RelationOneToMany extends BaseCollectionRelation
 {
-    private $orphanRemoval;
-
-    public function getOrphanRemoval(): bool
-    {
-        return $this->orphanRemoval;
-    }
-
-    public function setOrphanRemoval($orphanRemoval): self
-    {
-        $this->orphanRemoval = $orphanRemoval;
-
-        return $this;
-    }
-
     public function getTargetGetterMethodName(): string
     {
         return 'get'.Str::asCamelCase($this->getTargetPropertyName());

tests/Util/ClassSourceManipulatorTest.php

@@ -492,8 +492,7 @@ public function getAddOneToManyRelationTests(): \Generator
                 propertyName: 'avatarPhotos',
                 targetClassName: \App\Entity\UserAvatarPhoto::class,
                 targetPropertyName: 'user',
-            ))
-                ->setOrphanRemoval(false),
+            )),
         ];
 
         // interesting also because the source file has its
@@ -505,8 +504,7 @@ public function getAddOneToManyRelationTests(): \Generator
                 propertyName: 'avatarPhotos',
                 targetClassName: \App\Entity\UserAvatarPhoto::class,
                 targetPropertyName: 'user',
-            ))
-                ->setOrphanRemoval(false),
+            )),
         ];
 
         yield 'one_to_many_orphan_removal' => [
@@ -516,8 +514,8 @@ public function getAddOneToManyRelationTests(): \Generator
                 propertyName: 'avatarPhotos',
                 targetClassName: \App\Entity\UserAvatarPhoto::class,
                 targetPropertyName: 'user',
-            ))
-                ->setOrphanRemoval(true),
+                orphanRemoval: true,
+            )),
         ];
 
         // todo test existing constructor