Merge pull request #3280 from rectorphp/tag-value-node

rectorphp · Apr 30, 2020 · 0bbfd8b · 0bbfd8b
2 parents 4d1810f + 170a925
commit 0bbfd8b
Show file tree

Hide file tree

Showing 56 changed files with 120 additions and 606 deletions.
diff --git a/packages/better-php-doc-parser/src/PhpDocNode/AbstractTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/AbstractTagValueNode.php
@@ -18,14 +18,9 @@ abstract class AbstractTagValueNode implements AttributeAwareNodeInterface, PhpD
     use PrintTagValueNodeTrait;
 
     /**
-     * @var string
+     * @var mixed[]
      */
-    protected const PRINT_TYPE_ATTRIBUTE = 'print_attribute';
-
-    /**
-     * @var string
-     */
-    protected const PRINT_TYPE_ANNOTATION = 'print_annotation';
+    protected $items = [];
 
     /**
      * @var bool
@@ -72,6 +67,16 @@ abstract class AbstractTagValueNode implements AttributeAwareNodeInterface, PhpD
      */
     private $keysByQuotedStatus = [];
 
+    /**
+     * Generic fallback
+     */
+    public function __toString(): string
+    {
+        $items = $this->completeItemsQuotes($this->items);
+        $items = $this->makeKeysExplicit($items);
+        return $this->printContentItems($items);
+    }
+
     /**
      * @param mixed[] $item
      */

diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/EmbeddableTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/EmbeddableTagValueNode.php
@@ -4,20 +4,17 @@
 
 namespace Rector\BetterPhpDocParser\PhpDocNode\Doctrine\Class_;
 
+use Doctrine\ORM\Mapping\Embeddable;
 use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\AbstractDoctrineTagValueNode;
 
 final class EmbeddableTagValueNode extends AbstractDoctrineTagValueNode
 {
-    public function __construct(string $originalContent)
+    public function __construct(Embeddable $embeddable, string $originalContent)
     {
+        $this->items = get_object_vars($embeddable);
         $this->resolveOriginalContentSpacingAndOrder($originalContent);
     }
 
-    public function __toString(): string
-    {
-        return $this->originalContent;
-    }
-
     public function getShortName(): string
     {
         return '@ORM\Embeddable';

diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/EntityTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/EntityTagValueNode.php
@@ -13,11 +13,6 @@ final class EntityTagValueNode extends AbstractDoctrineTagValueNode implements P
 {
     use PhpAttributePhpDocNodePrintTrait;
 
-    /**
-     * @var mixed[]
-     */
-    private $items = [];
-
     public function __construct(?Entity $entity = null, ?string $originalContent = null)
     {
         if ($entity !== null) {
@@ -27,14 +22,6 @@ public function __construct(?Entity $entity = null, ?string $originalContent = n
         $this->resolveOriginalContentSpacingAndOrder($originalContent);
     }
 
-    public function __toString(): string
-    {
-        $items = $this->completeItemsQuotes($this->items);
-        $items = $this->makeKeysExplicit($items);
-
-        return $this->printContentItems($items);
-    }
-
     public function removeRepositoryClass(): void
     {
         $this->items['repositoryClass'] = null;
@@ -47,26 +34,24 @@ public function getShortName(): string
 
     public function toAttributeString(): string
     {
-        $items = $this->createItems(self::PRINT_TYPE_ATTRIBUTE);
+        $items = $this->createAttributeItems();
         $items = $this->filterOutMissingItems($items);
 
         $content = $this->printPhpAttributeItems($items);
 
         return $this->printAttributeContent($content);
     }
 
-    private function createItems(string $printType = self::PRINT_TYPE_ANNOTATION): array
+    private function createAttributeItems(): array
     {
         $items = $this->items;
 
-        if ($printType === self::PRINT_TYPE_ATTRIBUTE) {
-            if ($items['repositoryClass'] !== null) {
-                $items['repositoryClass'] .= '::class';
-            }
+        if ($items['repositoryClass'] !== null) {
+            $items['repositoryClass'] .= '::class';
+        }
 
-            if ($items['readOnly'] !== null) {
-                $items['readOnly'] = $items['readOnly'] ? 'ORM\Entity::READ_ONLY' : '';
-            }
+        if ($items['readOnly'] !== null) {
+            $items['readOnly'] = $items['readOnly'] ? 'ORM\Entity::READ_ONLY' : '';
         }
 
         return $items;

diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/IndexTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/IndexTagValueNode.php
@@ -15,11 +15,6 @@ final class IndexTagValueNode extends AbstractDoctrineTagValueNode implements Ta
      */
     private $tag;
 
-    /**
-     * @var mixed[]
-     */
-    private $items = [];
-
     public function __construct(Index $index, ?string $originalContent = null, ?string $originalTag = null)
     {
         $this->items = get_object_vars($index);
@@ -28,13 +23,6 @@ public function __construct(Index $index, ?string $originalContent = null, ?stri
         $this->resolveOriginalContentSpacingAndOrder($originalContent);
     }
 
-    public function __toString(): string
-    {
-        $items = $this->completeItemsQuotes($this->items);
-        $items = $this->makeKeysExplicit($items);
-        return $this->printContentItems($items);
-    }
-
     public function getTag(): ?string
     {
         return $this->tag ?: $this->getShortName();

diff --git a/...ages/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/InheritanceTypeTagValueNode.php b/...ages/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/InheritanceTypeTagValueNode.php
@@ -9,26 +9,13 @@
 
 final class InheritanceTypeTagValueNode extends AbstractDoctrineTagValueNode
 {
-    /**
-     * @var mixed[]
-     */
-    private $items = [];
-
     public function __construct(InheritanceType $inheritanceType, ?string $originalContent)
     {
         $this->items = get_object_vars($inheritanceType);
 
         $this->resolveOriginalContentSpacingAndOrder($originalContent, 'value');
     }
 
-    public function __toString(): string
-    {
-        $items = $this->completeItemsQuotes($this->items);
-        $items = $this->makeKeysExplicit($items);
-
-        return $this->printContentItems($items);
-    }
-
     public function getShortName(): string
     {
         return '@ORM\InheritanceType';

diff --git a/...ges/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/UniqueConstraintTagValueNode.php b/...ges/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/UniqueConstraintTagValueNode.php
@@ -15,11 +15,6 @@ final class UniqueConstraintTagValueNode extends AbstractDoctrineTagValueNode im
      */
     private $tag;
 
-    /**
-     * @var mixed[]
-     */
-    private $items = [];
-
     public function __construct(
         UniqueConstraint $uniqueConstraint,
         ?string $originalContent = null,
@@ -31,14 +26,6 @@ public function __construct(
         $this->resolveOriginalContentSpacingAndOrder($originalContent);
     }
 
-    public function __toString(): string
-    {
-        $items = $this->completeItemsQuotes($this->items);
-        $items = $this->makeKeysExplicit($items);
-
-        return $this->printContentItems($items);
-    }
-
     public function getTag(): ?string
     {
         return $this->tag ?: $this->getShortName();

diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/ColumnTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/ColumnTagValueNode.php
@@ -13,29 +13,15 @@ final class ColumnTagValueNode extends AbstractDoctrineTagValueNode implements P
 {
     use PhpAttributePhpDocNodePrintTrait;
 
-    /**
-     * @var mixed[]
-     */
-    private $items = [];
-
     public function __construct($items, ?string $originalContent = null)
     {
         $this->items = $items;
         $this->resolveOriginalContentSpacingAndOrder($originalContent);
     }
 
-    public function __toString(): string
-    {
-        $items = $this->completeItemsQuotes($this->items);
-        $items = $this->makeKeysExplicit($items);
-
-        return $this->printContentItems($items);
-    }
-
     public static function fromColumnAndOriginalContent(Column $column, string $originalContent): self
     {
         $items = get_object_vars($column);
-
         return new self($items, $originalContent);
     }
 

diff --git a/...better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/CustomIdGeneratorTagValueNode.php b/...better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/CustomIdGeneratorTagValueNode.php
@@ -9,25 +9,12 @@
 
 final class CustomIdGeneratorTagValueNode extends AbstractDoctrineTagValueNode
 {
-    /**
-     * @var mixed[]
-     */
-    private $items = [];
-
     public function __construct(CustomIdGenerator $customIdGenerator, ?string $originalContent = null)
     {
         $this->items = get_object_vars($customIdGenerator);
         $this->resolveOriginalContentSpacingAndOrder($originalContent);
     }
 
-    public function __toString(): string
-    {
-        $items = $this->completeItemsQuotes($this->items);
-        $items = $this->makeKeysExplicit($items);
-
-        return $this->printContentItems($items);
-    }
-
     public function getShortName(): string
     {
         return '@ORM\CustomIdGenerator';

diff --git a/...es/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/GeneratedValueTagValueNode.php b/...es/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/GeneratedValueTagValueNode.php
@@ -16,31 +16,17 @@ final class GeneratedValueTagValueNode extends AbstractDoctrineTagValueNode impl
 {
     use PhpAttributePhpDocNodePrintTrait;
 
-    /**
-     * @var mixed[]
-     */
-    private $items = [];
-
     public function __construct(array $items, ?string $annotationContent = null)
     {
         $this->items = $items;
         $this->resolveOriginalContentSpacingAndOrder($annotationContent, 'strategy');
     }
 
-    public function __toString(): string
-    {
-        $items = $this->completeItemsQuotes($this->items);
-        $items = $this->makeKeysExplicit($items);
-
-        return $this->printContentItems($items);
-    }
-
-    public static function createFromAnnotationAndAnnotationContent(
+    public static function createFromAnnotationAndContent(
         GeneratedValue $generatedValue,
         string $annotationContent
     ): self {
         $items = get_object_vars($generatedValue);
-
         return new self($items, $annotationContent);
     }
 

diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/IdTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/IdTagValueNode.php
@@ -17,21 +17,6 @@ public function __construct(?string $annotationContent = null)
         $this->resolveOriginalContentSpacingAndOrder($annotationContent);
     }
 
-    public function __toString(): string
-    {
-        $content = '';
-
-        if ($this->hasOpeningBracket) {
-            $content .= '(';
-        }
-
-        if ($this->hasClosingBracket) {
-            $content .= ')';
-        }
-
-        return $content;
-    }
-
     public function getShortName(): string
     {
         return '@ORM\Id';

diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/JoinColumnTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/JoinColumnTagValueNode.php
@@ -14,20 +14,15 @@ final class JoinColumnTagValueNode extends AbstractDoctrineTagValueNode implemen
 {
     use PhpAttributePhpDocNodePrintTrait;
 
-    /**
-     * @var string|null
-     */
-    private $tag;
-
     /**
      * @var string
      */
     private $shortName = '@ORM\JoinColumn';
 
     /**
-     * @var mixed[]
+     * @var string|null
      */
-    private $items = [];
+    private $tag;
 
     public function __construct(array $items, ?string $originalContent = null, ?string $originalTag = null)
     {
@@ -37,14 +32,6 @@ public function __construct(array $items, ?string $originalContent = null, ?stri
         $this->tag = $originalTag;
     }
 
-    public function __toString(): string
-    {
-        $items = $this->completeItemsQuotes($this->items);
-        $items = $this->makeKeysExplicit($items);
-
-        return $this->printContentItems($items);
-    }
-
     public static function createFromAnnotationAndOriginalContent(
         JoinColumn $joinColumn,
         string $originalContent,

diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/ManyToManyTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/ManyToManyTagValueNode.php
@@ -21,11 +21,6 @@ final class ManyToManyTagValueNode extends AbstractDoctrineTagValueNode implemen
      */
     private $fullyQualifiedTargetEntity;
 
-    /**
-     * @var mixed[]
-     */
-    private $items = [];
-
     public function __construct(
         array $items,
         ?string $originalContent = null,
@@ -36,14 +31,6 @@ public function __construct(
         $this->resolveOriginalContentSpacingAndOrder($originalContent);
     }
 
-    public function __toString(): string
-    {
-        $items = $this->completeItemsQuotes($this->items);
-        $items = $this->makeKeysExplicit($items);
-
-        return $this->printContentItems($items);
-    }
-
     public static function createFromAnnotationAndOriginalContent(
         ManyToMany $manyToMany,
         string $originalContent,
@@ -96,19 +83,17 @@ public function getShortName(): string
 
     public function toAttributeString(): string
     {
-        $items = $this->createItems(self::PRINT_TYPE_ATTRIBUTE);
+        $items = $this->createAttributeItems();
         $items = $this->filterOutMissingItems($items);
 
         $content = $this->printPhpAttributeItems($items);
         return $this->printAttributeContent($content);
     }
 
-    private function createItems(string $printType = self::PRINT_TYPE_ANNOTATION): array
+    private function createAttributeItems(): array
     {
         $items = $this->items;
-        if ($printType === self::PRINT_TYPE_ATTRIBUTE) {
-            $items['targetEntity'] .= '::class';
-        }
+        $items['targetEntity'] .= '::class';
 
         return $items;
     }