Fixed trait manipulator to avoid duplicate interface calls

irontec · Aug 28, 2024 · 585600a · 585600a
1 parent 9a9f237
commit 585600a
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 12 deletions.
diff --git a/EntityGeneratorBundle/Doctrine/EntityTrait/Adder.php b/EntityGeneratorBundle/Doctrine/EntityTrait/Adder.php
@@ -15,14 +15,17 @@ class Adder implements CodeGeneratorUnitInterface
     protected $classMetadata;
     protected $visibility;
 
+    protected $returnHintCallable;
+
     public function __construct(
         string $propertyName,
         string $type,
         bool $isNullable,
         $classMetadata,
         array $commentLines = [],
         array $columnOptions = [],
-        string $visibility = 'protected'
+        string $visibility = 'protected',
+        callable $returnHintCallable
     ) {
         $this->propertyName = $propertyName;
         $this->type = $type;
@@ -31,6 +34,7 @@ public function __construct(
         $this->columnOptions = $columnOptions;
         $this->classMetadata = $classMetadata;
         $this->visibility = $visibility;
+        $this->returnHintCallable = $returnHintCallable;
     }
 
     public function toString(string $nlLeftPad = ''): string
@@ -41,7 +45,7 @@ public function toString(string $nlLeftPad = ''): string
         $methodName = 'add' . ucfirst($singularProperty);
 
         $fqdnSegments = explode('\\', $this->classMetadata->name);
-        $returnHint = $fqdnSegments[count($fqdnSegments) -2] . 'Interface';
+        $returnHint =  ($this->returnHintCallable)($fqdnSegments[count($fqdnSegments) -2] . 'Interface');
 
         $response = [];
         $response[] = sprintf(

diff --git a/EntityGeneratorBundle/Doctrine/EntityTrait/Remover.php b/EntityGeneratorBundle/Doctrine/EntityTrait/Remover.php
@@ -15,14 +15,17 @@ class Remover implements CodeGeneratorUnitInterface
     protected $classMetadata;
     protected $visibility;
 
+    protected $returnHintCallable;
+
     public function __construct(
         string $propertyName,
         string $type,
         bool $isNullable,
         $classMetadata,
         array $commentLines = [],
         array $columnOptions = [],
-        string $visibility = 'protected'
+        string $visibility = 'protected',
+        callable $returnHintCallable
     ) {
         $this->propertyName = $propertyName;
         $this->type = $type;
@@ -31,6 +34,7 @@ public function __construct(
         $this->columnOptions = $columnOptions;
         $this->classMetadata = $classMetadata;
         $this->visibility = $visibility;
+        $this->returnHintCallable = $returnHintCallable;
     }
 
     public function toString(string $nlLeftPad = ''): string
@@ -40,7 +44,7 @@ public function toString(string $nlLeftPad = ''): string
 
         $methodName = 'remove' . ucfirst($singularProperty);
         $fqdnSegments = explode('\\', $this->classMetadata->name);
-        $returnHint = $fqdnSegments[count($fqdnSegments) -2] . 'Interface';
+        $returnHint =  ($this->returnHintCallable)($fqdnSegments[count($fqdnSegments) -2] . 'Interface');
 
         $response = [];
         $response[] = sprintf(

diff --git a/EntityGeneratorBundle/Doctrine/EntityTrait/Replacer.php b/EntityGeneratorBundle/Doctrine/EntityTrait/Replacer.php
@@ -15,14 +15,17 @@ class Replacer implements CodeGeneratorUnitInterface
     protected $classMetadata;
     protected $visibility;
 
+    protected $returnHintCallable;
+
     public function __construct(
         string $propertyName,
         string $type,
         bool $isNullable,
         $classMetadata,
         array $commentLines = [],
         array $columnOptions = [],
-        string $visibility = 'protected'
+        string $visibility = 'protected',
+        callable $returnHintCallable
     ) {
         $this->propertyName = $propertyName;
         $this->type = $type;
@@ -31,6 +34,7 @@ public function __construct(
         $this->columnOptions = $columnOptions;
         $this->classMetadata = $classMetadata;
         $this->visibility = $visibility;
+        $this->returnHintCallable = $returnHintCallable;
     }
 
     public function toString(string $nlLeftPad = ''): string
@@ -45,7 +49,7 @@ public function toString(string $nlLeftPad = ''): string
 
         $methodName = 'replace' . $camelCaseProperty;
         $fqdnSegments = explode('\\', $this->classMetadata->name);
-        $returnHint = $fqdnSegments[count($fqdnSegments) -2] . 'Interface';
+        $returnHint =  ($this->returnHintCallable)($fqdnSegments[count($fqdnSegments) -2] . 'Interface');
 
         $response = [];
         $response[] = '/**';

diff --git a/EntityGeneratorBundle/Doctrine/EntityTrait/TraitManipulator.php b/EntityGeneratorBundle/Doctrine/EntityTrait/TraitManipulator.php
@@ -239,11 +239,31 @@ public function addGetter(string $propertyName, $returnType, bool $isReturnTypeN
         );
     }
 
+    public function getReturnHint(string $returnHint): string {
+        $similarInterfaces = false;
+
+        foreach (array_keys($this->useStatements) as $fqdn){
+            $parts = explode('\\', $fqdn);
+            $lastValue = end($parts);
+
+            if($lastValue === $returnHint){
+                $similarInterfaces = true;
+                break;
+            }
+        }
+
+        if($similarInterfaces){
+            $returnHint = 'static';
+        }
+
+        return $returnHint;
+    }
+
     public function addSetter(
         string $propertyName,
-        $type,
+               $type,
         bool $isNullable,
-        $classMetadata,
+               $classMetadata,
         array $commentLines = [],
         array $columnOptions = [],
         string $visibility = 'protected'
@@ -255,7 +275,8 @@ public function addSetter(
             $classMetadata,
             $commentLines,
             $columnOptions,
-            $visibility
+            $visibility,
+            [$this, 'getReturnHint']
         );
 
         $this->methods[] = new Remover(
@@ -265,7 +286,8 @@ public function addSetter(
             $classMetadata,
             $commentLines,
             $columnOptions,
-            $visibility
+            $visibility,
+            [$this, 'getReturnHint']
         );
 
         $this->methods[] = new Replacer(
@@ -275,7 +297,8 @@ public function addSetter(
             $classMetadata,
             $commentLines,
             $columnOptions,
-            $visibility
+            $visibility,
+            [$this, 'getReturnHint']
         );
     }
 
@@ -285,7 +308,7 @@ public function addProperty(
         string $columnName,
         string $fkFqdn,
         array $comments = [],
-        $defaultValue = null,
+               $defaultValue = null,
         bool $required = false,
         bool $isCollection = true
     ) {