[Twig] Remove phpType variable, add reflectionProperty variable

Author: hlecorche

UPGRADE-4.0.md

@@ -6,6 +6,8 @@
 
 ## Template
 
-* When generating getters/setters for a field, the `types` variable passed to the Twig template no longer exists.
-  It has been replaced by the `type` variable, which returns a `Symfony\Component\TypeInfo\Type` object or null.
-
+* When generating getters/setters for a field :
+  * The `types` variable passed to the Twig template no longer exists.
+     It has been replaced by the `type` variable, which returns a `Symfony\Component\TypeInfo\Type` object or null.
+  * The `phpType` variable passed to the Twig template no longer exists.
+     It has been replaced by the `reflectionProperty` variable, which returns a `\ReflectionProperty` object.

src/EntityGenerator/EntityGenerator.php

@@ -283,7 +283,6 @@ protected function addField(GenerateEntityRequest $request, FieldMapping $fieldM
         $fieldName = $fieldMapping->fieldName;
         $type = $request->doctrineExtractor->getType($request->reflectionClass->getName(), $fieldName);
         $reflectionProperty = new \ReflectionProperty($request->reflectionClass->getName(), $fieldName);
-        $phpType = $reflectionProperty->getType();
 
         $blockPrefix = 'field';
         $enum = $fieldMapping->enumType;
@@ -300,7 +299,7 @@ protected function addField(GenerateEntityRequest $request, FieldMapping $fieldM
                     'fieldName' => $fieldName,
                     'variableName' => $this->buildVariableName(self::TYPE_SET, $fieldName),
                     'type' => $type,
-                    'phpType' => $phpType,
+                    'reflectionProperty' => $reflectionProperty,
                     'request' => $request,
                     'fieldMapping' => $fieldMapping,
                     'enum' => $enum,
@@ -316,7 +315,7 @@ protected function addField(GenerateEntityRequest $request, FieldMapping $fieldM
                 'methodName' => $getMethodName,
                 'fieldName' => $fieldName,
                 'type' => $type,
-                'phpType' => $phpType,
+                'reflectionProperty' => $reflectionProperty,
                 'request' => $request,
                 'fieldMapping' => $fieldMapping,
                 'enum' => $enum,
@@ -329,7 +328,8 @@ protected function addField(GenerateEntityRequest $request, FieldMapping $fieldM
     protected function addEmbedded(GenerateEntityRequest $request, string $fieldName, EmbeddedClassMapping $embeddedMapping): void
     {
         $targetClass = $embeddedMapping->class;
-        $phpType = (new \ReflectionProperty($request->reflectionClass->getName(), $fieldName))->getType();
+        $type = $request->doctrineExtractor->getType($request->reflectionClass->getName(), $fieldName);
+        $reflectionProperty = new \ReflectionProperty($request->reflectionClass->getName(), $fieldName);
 
         $targetClassAlias = $request->useStatementManipulator->addUseStatementIfNecessary($targetClass);
         if ($request->reflectionClass->getName() === $targetClass) {
@@ -344,7 +344,8 @@ protected function addEmbedded(GenerateEntityRequest $request, string $fieldName
                 'variableName' => $this->buildVariableName(self::TYPE_SET, $fieldName),
                 'targetClass' => $targetClass,
                 'targetClassAlias' => $targetClassAlias,
-                'phpType' => $phpType,
+                'type' => $type,
+                'reflectionProperty' => $reflectionProperty,
                 'request' => $request,
                 'embeddedMapping' => $embeddedMapping,
             ]);
@@ -357,7 +358,8 @@ protected function addEmbedded(GenerateEntityRequest $request, string $fieldName
                 'fieldName' => $fieldName,
                 'targetClass' => $targetClass,
                 'targetClassAlias' => $targetClassAlias,
-                'phpType' => $phpType,
+                'type' => $type,
+                'reflectionProperty' => $reflectionProperty,
                 'request' => $request,
                 'embeddedMapping' => $embeddedMapping,
             ]);
@@ -443,6 +445,8 @@ protected function addAssociation(GenerateEntityRequest $request, AssociationMap
     protected function addAssociationToOne(GenerateEntityRequest $request, AssociationMapping $associationMapping, string $block, ?string $foreignMethodNameSet): void
     {
         $fieldName = $associationMapping->fieldName;
+        $type = $request->doctrineExtractor->getType($request->reflectionClass->getName(), $fieldName);
+        $reflectionProperty = new \ReflectionProperty($request->reflectionClass->getName(), $fieldName);
         $targetEntity = $associationMapping->targetEntity;
 
         $targetEntityAlias = $request->useStatementManipulator->addUseStatementIfNecessary($targetEntity);
@@ -459,6 +463,8 @@ protected function addAssociationToOne(GenerateEntityRequest $request, Associati
                 'variableName' => $this->buildVariableName(self::TYPE_SET, $fieldName),
                 'targetEntity' => $targetEntity,
                 'targetEntityAlias' => $targetEntityAlias,
+                'type' => $type,
+                'reflectionProperty' => $reflectionProperty,
                 'request' => $request,
                 'associationMapping' => $associationMapping,
             ]);
@@ -471,6 +477,8 @@ protected function addAssociationToOne(GenerateEntityRequest $request, Associati
                 'fieldName' => $fieldName,
                 'targetEntity' => $targetEntity,
                 'targetEntityAlias' => $targetEntityAlias,
+                'type' => $type,
+                'reflectionProperty' => $reflectionProperty,
                 'request' => $request,
                 'associationMapping' => $associationMapping,
             ]);
@@ -480,6 +488,8 @@ protected function addAssociationToOne(GenerateEntityRequest $request, Associati
     protected function addAssociationToMany(GenerateEntityRequest $request, AssociationMapping $associationMapping, string $block, ?string $foreignMethodNameAdd, ?string $foreignMethodNameRemove): void
     {
         $fieldName = $associationMapping->fieldName;
+        $type = $request->doctrineExtractor->getType($request->reflectionClass->getName(), $fieldName);
+        $reflectionProperty = new \ReflectionProperty($request->reflectionClass->getName(), $fieldName);
         $targetEntity = $associationMapping->targetEntity;
 
         $targetEntityAlias = $request->useStatementManipulator->addUseStatementIfNecessary($targetEntity);
@@ -498,6 +508,8 @@ protected function addAssociationToMany(GenerateEntityRequest $request, Associat
                 'variableName' => $this->buildVariableName(self::TYPE_ADD, $fieldName),
                 'targetEntity' => $targetEntity,
                 'targetEntityAlias' => $targetEntityAlias,
+                'type' => $type,
+                'reflectionProperty' => $reflectionProperty,
                 'request' => $request,
                 'associationMapping' => $associationMapping,
                 'collectionAlias' => $collectionAlias,
@@ -513,6 +525,8 @@ protected function addAssociationToMany(GenerateEntityRequest $request, Associat
                 'variableName' => $this->buildVariableName(self::TYPE_REMOVE, $fieldName),
                 'targetEntity' => $targetEntity,
                 'targetEntityAlias' => $targetEntityAlias,
+                'type' => $type,
+                'reflectionProperty' => $reflectionProperty,
                 'request' => $request,
                 'associationMapping' => $associationMapping,
                 'collectionAlias' => $collectionAlias,
@@ -526,6 +540,8 @@ protected function addAssociationToMany(GenerateEntityRequest $request, Associat
                 'fieldName' => $fieldName,
                 'targetEntity' => $targetEntity,
                 'targetEntityAlias' => $targetEntityAlias,
+                'type' => $type,
+                'reflectionProperty' => $reflectionProperty,
                 'request' => $request,
                 'associationMapping' => $associationMapping,
                 'collectionAlias' => $collectionAlias,
@@ -536,6 +552,8 @@ protected function addAssociationToMany(GenerateEntityRequest $request, Associat
             'fieldName' => $fieldName,
             'targetEntity' => $targetEntity,
             'targetEntityAlias' => $targetEntityAlias,
+            'type' => $type,
+            'reflectionProperty' => $reflectionProperty,
             'request' => $request,
             'associationMapping' => $associationMapping,
             'collectionAlias' => $collectionAlias,