Merge pull request #25 from irontec/use-latest-ivoz-core-enhancements

Use latest ivoz core enhancements
irontec · Nov 29, 2023 · 88398e1 · 88398e1
2 parents 4d00e2f + 5f1b013
commit 88398e1
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 852 deletions.
diff --git a/EntityGeneratorBundle/Doctrine/Dto/DtoManipulator.php b/EntityGeneratorBundle/Doctrine/Dto/DtoManipulator.php
@@ -17,6 +17,7 @@
 use PhpParser\Parser;
 use Symfony\Bundle\MakerBundle\Doctrine\BaseCollectionRelation;
 use Symfony\Bundle\MakerBundle\Doctrine\BaseSingleRelation;
+use Symfony\Bundle\MakerBundle\Doctrine\DoctrineHelper;
 use Symfony\Bundle\MakerBundle\Doctrine\RelationManyToMany;
 use Symfony\Bundle\MakerBundle\Doctrine\RelationManyToOne;
 use Symfony\Bundle\MakerBundle\Doctrine\RelationOneToMany;
@@ -49,8 +50,10 @@ final class DtoManipulator implements ManipulatorInterface
     /** @var UseStatement[]  */
     private $useStatements = [];
 
-    public function __construct(string $sourceCode)
-    {
+    public function __construct(
+        string $sourceCode,
+        private DoctrineHelper $doctrineHelper,
+    ) {
         $this->lexer = new Lexer\Emulative([
             'usedAttributes' => [
                 'comments',
@@ -418,9 +421,25 @@ private function addSingularRelation(BaseSingleRelation $relation, $classMetadat
             $classMetadata,
         );
 
+        $targetClassName = substr(
+            $relation->getTargetClassName(),
+            0,
+            -3
+        );
+
+        /** @var \IvozDevTools\EntityGeneratorBundle\Doctrine\Metadata\ClassMetadata $targetClassMetadata */
+        $targetClassMetadata = $this->doctrineHelper->getMetadata($targetClassName);
+        $identifier = $targetClassMetadata->getIdentifier();
+        $targetPkField = $targetClassMetadata->getFieldMapping(
+            current($identifier)
+        );
+        $targetPkHint = $this->getEntityTypeHint(
+            $targetPkField["type"]
+        );
+
         $this->addIdGetter(
             $relation->getPropertyName(),
-            $relation->getCustomReturnType() ?: $typeHint,
+            $relation->getCustomReturnType() ?: $targetPkHint,
             true,
             []
         );

diff --git a/EntityGeneratorBundle/Doctrine/Dto/DtoRegenerator.php b/EntityGeneratorBundle/Doctrine/Dto/DtoRegenerator.php
@@ -162,7 +162,8 @@ private function createClassManipulator(
     {
         $classContent = $content ?? $this->fileManager->getFileContents($classPath);
         return new DtoManipulator(
-            $classContent
+            $classContent,
+            $this->doctrineHelper
         );
     }
 

diff --git a/EntityGeneratorBundle/Doctrine/Dto/FkGetter.php b/EntityGeneratorBundle/Doctrine/Dto/FkGetter.php
@@ -10,11 +10,18 @@ class FkGetter extends Getter
     public function toString(string $nlLeftPad = ''): string
     {
         $methodName = 'get' . Str::asCamelCase($this->propertyName);
+        $returnHint = '';
+        if ($this->returnType && strpos($this->returnType, '|')) {
+            $returnHint = ': ' . $this->returnType . '|null';
+        } elseif ($this->returnType) {
+            $returnHint = ': ?' . $this->returnType;
+        }
 
         $response = [];
         $response[] = sprintf(
-            'public function %sId()',
-            $methodName
+            'public function %sId()%s',
+            $methodName,
+            $returnHint
         );
         $response[] = '{';
         $response[] = '    if ($dto = $this->' . $methodName . '()) {';

diff --git a/EntityGeneratorBundle/Doctrine/EntityTrait/TraitManipulator.php b/EntityGeneratorBundle/Doctrine/EntityTrait/TraitManipulator.php
@@ -672,7 +672,7 @@ private function getAssociationMappings(ClassMetadata $classMetadata): array
             $classMetadata->associationMappings,
             function ($property) {
                 return in_array(
-                    $property['type'] ?? null,
+                    $property['type'],
                     [
                         ClassMetadata::ONE_TO_MANY,
                         ClassMetadata::MANY_TO_MANY

diff --git a/EntityGeneratorBundle/Doctrine/EntityTrait/TraitRegenerator.php b/EntityGeneratorBundle/Doctrine/EntityTrait/TraitRegenerator.php
@@ -115,7 +115,7 @@ private function getMappedFieldsInEntity(ClassMetadata $classMetadata)
             $classMetadata->associationMappings,
             function ($mapping) {
                 return in_array(
-                    $mapping['type'] ?? null,
+                    $mapping['type'],
                     [
                         ClassMetadata::ONE_TO_ONE,
                         ClassMetadata::ONE_TO_MANY,

diff --git a/EntityGeneratorBundle/Doctrine/Property.php b/EntityGeneratorBundle/Doctrine/Property.php
@@ -4,6 +4,7 @@
 
 class Property implements CodeGeneratorUnitInterface
 {
+    /** @var mixed | null */
     private $defaultValue;
 
     public function __construct(
@@ -130,7 +131,7 @@ public function toString(string $nlLeftPad = ''): string
                             : 'false';
                         break;
                     case 'string':
-                        if (!is_null($this->defaultValue)) {
+                        if (!empty($this->defaultValue)) {
                             $defaultValue = '\'' . $this->defaultValue . '\'';
                         }
                         break;

diff --git a/EntityGeneratorBundle/Doctrine/Repository/RepositoryRegenerator.php b/EntityGeneratorBundle/Doctrine/Repository/RepositoryRegenerator.php
@@ -74,13 +74,18 @@ public function makeEmptyInterface($classMetadata)
             return;
         }
 
+        $entityClassNameSegments = explode("\\", $classMetadata->name);
+        $entityClassName = end($entityClassNameSegments);
+
         $classMetadata->name = $fqdn;
         $classMetadata->rootEntityName = $fqdn;
 
         [$classPath, $content] = $this->getDoctrineClassTemplate(
             $classMetadata,
             'doctrine/RepositoryInterface.tpl.php',
-            []
+            [
+                'entity_classname' => $entityClassName
+            ]
         );
 
         $manipulator = $this->createClassManipulator(
@@ -140,38 +145,6 @@ private function getDoctrineClassTemplate(
         ];
     }
 
-    private function getClassTemplate(
-        ClassMetadata $metadata,
-                      $templateName
-    ): array
-    {
-        [$path, $variables] = $this->generator->generateClassContentVariables(
-            $metadata->name,
-            $templateName,
-            []
-        );
-
-        if (file_exists($variables['relative_path'])) {
-            $variables['relative_path'] = realpath($variables['relative_path']);
-        } else {
-            $variables['relative_path'] = str_replace(
-                'vendor/composer/../../',
-                '',
-                $variables['relative_path']
-            );
-        }
-
-
-        return [
-            $variables['relative_path'],
-            $this->fileManager->parseTemplate(
-                $path,
-                $variables
-            )
-        ];
-    }
-
-
     private function createClassManipulator(
         string  $classPath,
         ?string $content