Add optimizations for self-referencing entities

Author: codedmonkey

src/Maker/MakeEntity.php

@@ -201,12 +201,12 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             } elseif ($newField instanceof EntityRelation) {
                 // both overridden below for OneToMany
                 $newFieldName = $newField->getOwningProperty();
-                if ($newField->getInverseClass() !== $newField->getOwningClass()) {
-                    $otherManipulatorFilename = $this->getPathOfClass($newField->getInverseClass());
-                    $otherManipulator = $this->createClassManipulator($otherManipulatorFilename, $io, $overwrite);
-                } else {
+                if ($newField->isSelfReferencing()) {
                     $otherManipulatorFilename = $entityPath;
                     $otherManipulator = $manipulator;
+                } else {
+                    $otherManipulatorFilename = $this->getPathOfClass($newField->getInverseClass());
+                    $otherManipulator = $this->createClassManipulator($otherManipulatorFilename, $io, $overwrite);
                 }
                 switch ($newField->getType()) {
                     case EntityRelation::MANY_TO_ONE:

src/Util/ClassSourceManipulator.php

@@ -447,7 +447,7 @@ private function addSingularRelation(BaseRelation $relation)
 
     private function addCollectionRelation(BaseCollectionRelation $relation)
     {
-        $typeHint = !$relation->isSelfReferencing() ? $this->addUseStatementIfNecessary($relation->getTargetClassName()) : 'self';
+        $typeHint = $relation->isSelfReferencing() ? 'self' : $this->addUseStatementIfNecessary($relation->getTargetClassName());
 
         $arrayCollectionTypeHint = $this->addUseStatementIfNecessary(ArrayCollection::class);
         $collectionTypeHint = $this->addUseStatementIfNecessary(Collection::class);

tests/Maker/FunctionalTest.php

@@ -823,7 +823,7 @@ public function getCommandEntityTests()
                 // do you want to generate an inverse relation? (default to yes)
                 '',
                 // field name on opposite side
-                'wards',
+                'dependants',
                 // orphanRemoval (default to no)
                 '',
                 // finish adding fields

tests/fixtures/MakeEntitySelfReferencing/tests/GeneratedEntityTest.php

@@ -21,7 +21,7 @@ public function testGeneratedEntity()
 
         $user = new User();
         // check that the constructor was instantiated properly
-        $this->assertInstanceOf(ArrayCollection::class, $user->getWards());
+        $this->assertInstanceOf(ArrayCollection::class, $user->getDependants());
         // set existing field
         $user->setFirstName('Ryan');
         $em->persist($user);
@@ -34,7 +34,7 @@ public function testGeneratedEntity()
         // set via the inverse side
         $ward2 = new User();
         $ward2->setFirstName('Fabien');
-        $user->addWard($ward2);
+        $user->addDependant($ward2);
         $em->persist($ward2);
 
         $em->flush();
@@ -44,6 +44,6 @@ public function testGeneratedEntity()
             ->findAll();
 
         $this->assertCount(3, $actualUser);
-        $this->assertCount(2, $actualUser[0]->getWards());
+        $this->assertCount(2, $actualUser[0]->getDependants());
     }
 }