[make:registration] use UniqueEntity attribute instead of annotation

Author: jrushlow

src/Maker/MakeRegistrationForm.php

@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\MakerBundle\Maker;
 
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
-use Doctrine\Common\Annotations\Annotation;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\Column;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
@@ -143,11 +142,11 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
 
         // see if it makes sense to add the UniqueEntity constraint
         $userClassDetails = new ClassDetails($this->userClass);
-        $addAnnotation = false;
-        if (!$userClassDetails->doesDocBlockContainAnnotation('@UniqueEntity')) {
-            $addAnnotation = $io->confirm(sprintf('Do you want to add a <comment>@UniqueEntity</comment> validation annotation on your <comment>%s</comment> class to make sure duplicate accounts aren\'t created?', Str::getShortClassName($this->userClass)));
+        $this->addUniqueEntityConstraint = false;
+
+        if (!$userClassDetails->hasAttribute(UniqueEntity::class)) {
+            $this->addUniqueEntityConstraint = $io->confirm(sprintf('Do you want to add a <comment>#[UniqueEntity]</comment> validation attribute to your <comment>%s</comment> class to make sure duplicate accounts aren\'t created?', Str::getShortClassName($this->userClass)));
         }
-        $this->addUniqueEntityConstraint = $addAnnotation;
 
         $this->willVerifyEmail = $io->confirm('Do you want to send an email to verify the user\'s email address after registration?', true);
 
@@ -488,11 +487,6 @@ private function getMissingComponentsComposerMessage(): ?string
 
     public function configureDependencies(DependencyBuilder $dependencies): void
     {
-        $dependencies->addClassDependency(
-            Annotation::class,
-            'doctrine/annotations'
-        );
-
         $dependencies->addClassDependency(
             AbstractType::class,
             'form'

src/Util/ClassDetails.php

@@ -57,19 +57,16 @@ public function getPath(): string
         return (new \ReflectionClass($this->fullClassName))->getFileName();
     }
 
-    /**
-     * An imperfect, but simple way to check for the presence of an annotation.
-     *
-     * @param string $annotation The annotation - e.g. @UniqueEntity
-     */
-    public function doesDocBlockContainAnnotation(string $annotation): bool
+    public function hasAttribute(string $attributeClassName): bool
     {
-        $docComment = (new \ReflectionClass($this->fullClassName))->getDocComment();
+        $reflected = new \ReflectionClass($this->fullClassName);
 
-        if (false === $docComment) {
-            return false;
+        foreach ($reflected->getAttributes($attributeClassName) as $reflectedAttribute) {
+            if ($reflectedAttribute->getName() === $attributeClassName) {
+                return true;
+            }
         }
 
-        return str_contains($docComment, $annotation);
+        return false;
     }
 }

tests/Util/ClassDetailsTest.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\MakerBundle\Tests\Util;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Bundle\MakerBundle\Util\ClassDetails;
+
+/**
+ * @author Jesse Rushlow <[email protected]>
+ */
+final class ClassDetailsTest extends TestCase
+{
+    public function testHasAttribute(): void
+    {
+        self::assertTrue((new ClassDetails(FixtureClassDetails::class))->hasAttribute(UniqueEntity::class));
+
+        self::assertFalse((new ClassDetails(__CLASS__))->hasAttribute(UniqueEntity::class));
+    }
+}
+
+#[UniqueEntity]
+final class FixtureClassDetails
+{
+}