move property attribute logic to one place

Author: jrushlow

src/Maker/MakeRegistrationForm.php

@@ -391,18 +391,9 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             );
             $userManipulator->setIo($io);
 
-//            $annotation = [];
-//            $attrNode = [];
-//
-//            if ($usesAttributes) {
-//                $attrNode = [$userManipulator->buildAttributeNode('ORM\Column', ['type' => 'boolean'])];
-//            } else {
-//                $annotation = ['@ORM\Column(type="boolean")'];
-//            }
-
             $userManipulator->addProperty(
                 'isVerified',
-                ['@ORM\Column(type="boolean")'],
+                ['@ORM\Column(type="boolean")'], // @legacy - Remove when annotation support is dropped.
                 false,
                 [$userManipulator->buildAttributeNode('ORM\Column', ['type' => 'boolean'])]
             );

src/Util/ClassSourceManipulator.php

@@ -90,20 +90,19 @@ public function addEntityField(string $propertyName, array $columnOptions, array
         $typeHint = $this->getEntityTypeHint($columnOptions['type']);
         $nullable = $columnOptions['nullable'] ?? false;
         $isId = (bool) ($columnOptions['id'] ?? false);
-        $attributes = [];
-
-        if ($this->useAttributesForDoctrineMapping) {
-            $attributes[] = $this->buildAttributeNode('ORM\Column', $columnOptions);
-        } else {
-            $comments[] = $this->buildAnnotationLine('@ORM\Column', $columnOptions);
-        }
+        $comments[] = $this->buildAnnotationLine('@ORM\Column', $columnOptions);
 
         $defaultValue = null;
         if ('array' === $typeHint) {
             $defaultValue = new Node\Expr\Array_([], ['kind' => Node\Expr\Array_::KIND_SHORT]);
         }
 
-        $this->addProperty($propertyName, $comments, $defaultValue, $attributes);
+        $this->addProperty(
+            $propertyName,
+            $comments,
+            $defaultValue,
+            [$this->buildAttributeNode('ORM\Column', $columnOptions)]
+        );
 
         $this->addGetter(
             $propertyName,
@@ -123,30 +122,12 @@ public function addEmbeddedEntity(string $propertyName, string $className): void
     {
         $typeHint = $this->addUseStatementIfNecessary($className);
 
-        $annotations = [];
-        $attributes = [];
-
-        if (!$this->useAttributesForDoctrineMapping) {
-            $annotations = [
-                $this->buildAnnotationLine(
-                    '@ORM\\Embedded',
-                    [
-                        'class' => new ClassNameValue($className, $typeHint),
-                    ]
-                ),
-            ];
-        } else {
-            $attributes = [
-                $this->buildAttributeNode(
-                    'ORM\\Embedded',
-                    [
-                        'class' => new ClassNameValue($className, $typeHint),
-                    ]
-                ),
-            ];
-        }
-
-        $this->addProperty($propertyName, $annotations, null, $attributes);
+        $this->addProperty(
+            $propertyName,
+            [$this->buildAnnotationLine('@ORM\\Embedded', ['class' => new ClassNameValue($className, $typeHint)])],
+            null,
+            [$this->buildAttributeNode('ORM\\Embedded', ['class' => new ClassNameValue($className, $typeHint)])]
+        );
 
         // logic to avoid re-adding the same ArrayCollection line
         $addEmbedded = true;
@@ -345,15 +326,12 @@ public function addProperty(string $name, array $annotationLines = [], $defaultV
 
         $newPropertyBuilder = (new Builder\Property($name))->makePrivate();
 
-//        if ($annotationLines && $this->useAnnotations) {
-//            $newPropertyBuilder->setDocComment($this->createDocBlock($annotationLines));
-//        }
-
-        if ($this->useAttributesForDoctrineMapping) {
+        if ($attributes && $this->useAttributesForDoctrineMapping) {
             foreach ($attributes as $attribute) {
                 $newPropertyBuilder->addAttribute($attribute);
             }
         } elseif ($annotationLines && $this->useAnnotations) {
+            // @legacy - Remove when annotation support is dropped.
             $newPropertyBuilder->setDocComment($this->createDocBlock($annotationLines));
         }
 
@@ -526,35 +504,12 @@ private function addSingularRelation(BaseRelation $relation): void
             $annotationOptions['cascade'] = ['persist', 'remove'];
         }
 
-        $annotations = [];
-        $attributes = [];
-
-        if (!$this->useAttributesForDoctrineMapping) {
-            $annotations = [
-                $this->buildAnnotationLine(
-                    $relation instanceof RelationManyToOne ? '@ORM\\ManyToOne' : '@ORM\\OneToOne',
-                    $annotationOptions
-                ),
-            ];
-        } else {
-            $attributes = [
-                $this->buildAttributeNode(
-                    $relation instanceof RelationManyToOne ? 'ORM\\ManyToOne' : 'ORM\\OneToOne',
-                    $annotationOptions
-                ),
-            ];
-        }
+        $annotations = [$this->buildAnnotationLine($relation instanceof RelationManyToOne ? '@ORM\\ManyToOne' : '@ORM\\OneToOne', $annotationOptions)];
+        $attributes = [$this->buildAttributeNode($relation instanceof RelationManyToOne ? 'ORM\\ManyToOne' : 'ORM\\OneToOne', $annotationOptions)];
 
         if (!$relation->isNullable() && $relation->isOwning()) {
-            if (!$this->useAttributesForDoctrineMapping) {
-                $annotations[] = $this->buildAnnotationLine('@ORM\\JoinColumn', [
-                    'nullable' => false,
-                ]);
-            } else {
-                $attributes[] = $this->buildAttributeNode('ORM\\JoinColumn', [
-                    'nullable' => false,
-                ]);
-            }
+            $annotations[] = $this->buildAnnotationLine('@ORM\\JoinColumn', ['nullable' => false]);
+            $attributes[] = $this->buildAttributeNode('ORM\\JoinColumn', ['nullable' => false]);
         }
 
         $this->addProperty($relation->getPropertyName(), $annotations, null, $attributes);
@@ -622,26 +577,12 @@ private function addCollectionRelation(BaseCollectionRelation $relation): void
             $annotationOptions['orphanRemoval'] = true;
         }
 
-        $annotations = [];
-        $attributes = [];
-
-        if (!$this->useAttributesForDoctrineMapping) {
-            $annotations = [
-                $this->buildAnnotationLine(
-                    $relation instanceof RelationManyToMany ? '@ORM\\ManyToMany' : '@ORM\\OneToMany',
-                    $annotationOptions
-                ),
-            ];
-        } else {
-            $attributes = [
-                $this->buildAttributeNode(
-                    $relation instanceof RelationManyToMany ? 'ORM\\ManyToMany' : 'ORM\\OneToMany',
-                    $annotationOptions
-                ),
-            ];
-        }
-
-        $this->addProperty($relation->getPropertyName(), $annotations, null, $attributes);
+        $this->addProperty(
+            $relation->getPropertyName(),
+            [$this->buildAnnotationLine($relation instanceof RelationManyToMany ? '@ORM\\ManyToMany' : '@ORM\\OneToMany', $annotationOptions)],
+            null,
+            [$this->buildAttributeNode($relation instanceof RelationManyToMany ? 'ORM\\ManyToMany' : 'ORM\\OneToMany', $annotationOptions)]
+        );
 
         // logic to avoid re-adding the same ArrayCollection line
         $addArrayCollection = true;