Not setting the owning side (from inverse) on OneToOne

Now consistent with other types

Author: weaverryan

src/Util/ClassSourceManipulator.php

@@ -293,17 +293,13 @@ private function addSingularRelation(BaseRelation $relation)
             $relation instanceof RelationOneToOne ? $relation->isNullable() : true
         );
 
-        // set the inverse side of the relation for OneToOne
-        // we don't do this for ManyToOne, because setting the inverse collection
-        // side could be dangerous, as it could cause many records to hydrate
-        if ($relation instanceof RelationOneToOne) {
-            // only set if this is the inverse side (i.e. we're setting the owning)
-            // of if the inverse side *is* being mapped
-            if (!$relation->isOwning() || $relation->getMapInverseRelation()) {
-                $setterNodeBuilder->addStmt($this->createBlankLineNode(self::CONTEXT_CLASS_METHOD));
+        // set the *owning* side of the relation
+        // OneToOne is the only "singular" relation type that
+        // may be the inverse side
+        if ($relation instanceof RelationOneToOne && !$relation->isOwning()) {
+            $setterNodeBuilder->addStmt($this->createBlankLineNode(self::CONTEXT_CLASS_METHOD));
 
-                $this->addNodesToSetOtherSideOfOneToOne($relation, $setterNodeBuilder);
-            }
+            $this->addNodesToSetOtherSideOfOneToOne($relation, $setterNodeBuilder);
         }
 
         $this->addMethod($setterNodeBuilder->getNode());
@@ -894,10 +890,7 @@ private function addNodesToSetOtherSideOfOneToOne(RelationOneToOne $relation, Bu
     {
         if (!$relation->isNullable()) {
             $setterNodeBuilder->addStmt($this->createSingleLineCommentNode(
-                sprintf(
-                    'set the %s side of the relation if necessary',
-                    $relation->isOwning() ? 'inverse' : 'owning'
-                ),
+                'set the owning side of the relation if necessary',
                 self::CONTEXT_CLASS_METHOD
             ));
 
@@ -925,10 +918,7 @@ private function addNodesToSetOtherSideOfOneToOne(RelationOneToOne $relation, Bu
 
         // at this point, we know the relation is nullable
         $setterNodeBuilder->addStmt($this->createSingleLineCommentNode(
-            sprintf(
-                'set (or unset) the %s side of the relation if necessary',
-                $relation->isOwning() ? 'inverse' : 'owning'
-            ),
+            'set (or unset) the owning side of the relation if necessary',
             self::CONTEXT_CLASS_METHOD
         ));
 

tests/Util/fixtures/add_one_to_one_relation/User_simple_owning.php

@@ -34,12 +34,6 @@ public function getUserProfile(): ?UserProfile
     public function setUserProfile(?UserProfile $userProfile)
     {
         $this->userProfile = $userProfile;
-
-        // set (or unset) the inverse side of the relation if necessary
-        $newUser = $userProfile === null ? null : $this;
-        if ($newUser !== $userProfile->getUser()) {
-            $userProfile->setUser($newUser);
-        }
     }
 
     // add your own fields

tests/Util/fixtures/add_one_to_one_relation/User_simple_self.php

@@ -34,12 +34,6 @@ public function getEmbeddedUser(): ?self
     public function setEmbeddedUser(?self $embeddedUser)
     {
         $this->embeddedUser = $embeddedUser;
-
-        // set (or unset) the inverse side of the relation if necessary
-        $newUser = $embeddedUser === null ? null : $this;
-        if ($newUser !== $embeddedUser->getUser()) {
-            $embeddedUser->setUser($newUser);
-        }
     }
 
     // add your own fields

tests/Util/fixtures/add_one_to_one_relation/User_with_use_statements_avoid_duplicate_use.php

@@ -37,12 +37,6 @@ public function getUserProfile(): ?\App\OtherEntity\UserProfile
     public function setUserProfile(?\App\OtherEntity\UserProfile $userProfile)
     {
         $this->userProfile = $userProfile;
-
-        // set (or unset) the inverse side of the relation if necessary
-        $newUser = $userProfile === null ? null : $this;
-        if ($newUser !== $userProfile->getUser()) {
-            $userProfile->setUser($newUser);
-        }
     }
 
     // add your own fields

tests/Util/fixtures/add_one_to_one_relation/User_with_use_statements_avoid_duplicate_use_alias.php

@@ -37,12 +37,6 @@ public function getCategory(): ?\App\OtherEntity\Category
     public function setCategory(?\App\OtherEntity\Category $category)
     {
         $this->category = $category;
-
-        // set (or unset) the inverse side of the relation if necessary
-        $newUser = $category === null ? null : $this;
-        if ($newUser !== $category->getUser()) {
-            $category->setUser($newUser);
-        }
     }
 
     // add your own fields