rebase

rectorphp · Feb 14, 2024 · 708043a · 708043a
1 parent 9a0f729
commit 708043a
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/...lity/AnnotationTransformer/ClassAnnotationTransformer/TableClassAnnotationTransformer.php b/...lity/AnnotationTransformer/ClassAnnotationTransformer/TableClassAnnotationTransformer.php
@@ -24,11 +24,7 @@ final class TableClassAnnotationTransformer implements ClassAnnotationTransforme
     /**
      * @var string
      */
-<<<<<<< HEAD
-    private const UNIQUE_CONSTRAINTS_CLASS = 'Doctrine\ORM\Mapping\UniqueConstraint';
-=======
     private const UNIQUE_CONSTRAINT_CLASS = 'Doctrine\ORM\Mapping\UniqueConstraint';
->>>>>>> c6d0a51 (misc)
 
     public function transform(EntityMapping $entityMapping, PhpDocInfo $classPhpDocInfo): void
     {
@@ -58,11 +54,7 @@ public function transform(EntityMapping $entityMapping, PhpDocInfo $classPhpDocI
 
                 $uniqueConstraintDoctrineAnnotationTagValueNodes[] = new ArrayItemNode(
                     new DoctrineAnnotationTagValueNode(
-<<<<<<< HEAD
-                        new IdentifierTypeNode('@\\' . self::UNIQUE_CONSTRAINTS_CLASS),
-=======
-                        new IdentifierTypeNode('@\\' . self::UNIQUE_CONSTRAINT_CLASS . ''),
->>>>>>> c6d0a51 (misc)
+                        new IdentifierTypeNode('@\\' . self::UNIQUE_CONSTRAINT_CLASS),
                         null,
                         [
                             new ArrayItemNode(new StringNode($name), 'name'),