remove / disable annotation references

Author: jrushlow

src/Doctrine/EntityRegenerator.php

@@ -204,7 +204,7 @@ private function createClassManipulator(string $classPath): ClassSourceManipulat
             // if properties need to be generated then, by definition,
             // some non-annotation config is being used, and so, the
             // properties should not have annotations added to them
-            useAttributesForDoctrineMapping: false
+            useAttributesForDoctrineMapping: true // We always want to use attributes?
         );
     }
 

src/Maker/MakeController.php

@@ -120,10 +120,10 @@ public function configureDependencies(DependencyBuilder $dependencies): void
             return;
         }
 
-        $dependencies->addClassDependency(
-            Annotation::class,
-            'doctrine/annotations'
-        );
+//        $dependencies->addClassDependency(
+//            Annotation::class,
+//            'doctrine/annotations'
+//        );
     }
 
     private function isTwigInstalled(): bool

src/Maker/MakeRegistrationForm.php

@@ -143,11 +143,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)));
+        $addAttribute = false;
+        if (!$userClassDetails->isClassUnique()) {
+            $addAttribute = $io->confirm(sprintf('Do you want to add a <comment>#[UniqueEntity]</comment> validation attribute on your <comment>%s</comment> class to make sure duplicate accounts aren\'t created?', Str::getShortClassName($this->userClass)));
         }
-        $this->addUniqueEntityConstraint = $addAnnotation;
+        $this->addUniqueEntityConstraint = $addAttribute;
 
         $this->willVerifyEmail = $io->confirm('Do you want to send an email to verify the user\'s email address after registration?', true);
 
@@ -488,10 +488,10 @@ private function getMissingComponentsComposerMessage(): ?string
 
     public function configureDependencies(DependencyBuilder $dependencies): void
     {
-        $dependencies->addClassDependency(
-            Annotation::class,
-            'doctrine/annotations'
-        );
+//        $dependencies->addClassDependency(
+//            Annotation::class,
+//            'doctrine/annotations'
+//        );
 
         $dependencies->addClassDependency(
             AbstractType::class,

src/Maker/MakeResetPassword.php

@@ -122,7 +122,7 @@ public function configureDependencies(DependencyBuilder $dependencies): void
 
         ORMDependencyBuilder::buildDependencies($dependencies);
 
-        $dependencies->addClassDependency(Annotation::class, 'annotations');
+//        $dependencies->addClassDependency(Annotation::class, 'annotations');
 
         // reset-password-bundle 1.6 includes the ability to generate a fake token.
         // we need to check that version 1.6 is installed

src/Util/ClassDetails.php

@@ -11,6 +11,8 @@
 
 namespace Symfony\Bundle\MakerBundle\Util;
 
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+
 /**
  * @internal
  */
@@ -61,6 +63,7 @@ public function getPath(): string
      * An imperfect, but simple way to check for the presence of an annotation.
      *
      * @param string $annotation The annotation - e.g. @UniqueEntity
+     * @deprecated We dont support anntations anymore..
      */
     public function doesDocBlockContainAnnotation(string $annotation): bool
     {
@@ -72,4 +75,11 @@ public function doesDocBlockContainAnnotation(string $annotation): bool
 
         return str_contains($docComment, $annotation);
     }
+
+    public function isClassUnique(): bool
+    {
+        $reflected = new \ReflectionClass($this->fullClassName);
+
+        return !empty($reflected->getAttributes(UniqueEntity::class));
+    }
 }