add attribute support

Author: Simon Marx

src/DependencyInjection/CompilerPass/SetDoctrineAnnotatedPrefixesPass.php

@@ -41,10 +41,6 @@ public function process(ContainerBuilder $container)
             $methodCalls = $metadataDriverImpl->getMethodCalls();
 
             foreach ($methodCalls as $i => [$method, $arguments]) {
-                if ('addDriver' !== $method) {
-                    continue;
-                }
-
                 if ($arguments[0] instanceof Definition) {
                     $class = $arguments[0]->getClass();
                     $namespace = substr($class, 0, strrpos($class, '\\'));
@@ -59,10 +55,9 @@ public function process(ContainerBuilder $container)
                     $methodCalls[$i] = $arguments;
                 }
 
-                $isAnnotated = false !== strpos($arguments[0], '_annotation_metadata_driver');
                 $annotatedPrefixes[$managerName][] = [
                     $arguments[1],
-                    $isAnnotated ? new Reference($arguments[0]) : null,
+                    new Reference($arguments[0]),
                 ];
             }
 

src/Doctrine/DoctrineHelper.php

@@ -23,6 +23,7 @@
 use Doctrine\Persistence\Mapping\AbstractClassMetadataFactory;
 use Doctrine\Persistence\Mapping\ClassMetadata;
 use Doctrine\Persistence\Mapping\Driver\AnnotationDriver;
+use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Doctrine\Persistence\Mapping\MappingException as PersistenceMappingException;
 use Symfony\Bundle\MakerBundle\Util\ClassNameDetails;
@@ -85,6 +86,7 @@ public function getEntityNamespace(): string
         return $this->entityNamespace;
     }
 
+    // check is not needed anymore
     public function isClassAnnotated(string $className): bool
     {
         /** @var EntityManagerInterface $em */
@@ -268,4 +270,22 @@ public function isKeyword(string $name): bool
 
         return $connection->getDatabasePlatform()->getReservedKeywordsList()->isKeyword($name);
     }
+
+    public function getMappingDriverForNamespace(string $namespace): ?MappingDriver
+    {
+        $lowestCharacterDiff = null;
+        $foundDriver = null;
+
+        foreach ($this->annotatedPrefixes as $key => $mappings) {
+            foreach($mappings as [$prefix, $driver]) {
+                $diff = substr_compare($namespace, $prefix, 0);
+
+                if (null === $lowestCharacterDiff || $diff < $lowestCharacterDiff) {
+                    $foundDriver = $driver;
+                }
+            }
+        }
+
+        return $foundDriver;
+    }
 }

src/Doctrine/EntityClassGenerator.php

@@ -33,7 +33,7 @@ public function __construct(Generator $generator, DoctrineHelper $doctrineHelper
         $this->doctrineHelper = $doctrineHelper;
     }
 
-    public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $apiResource, bool $withPasswordUpgrade = false, bool $generateRepositoryClass = true, bool $broadcast = false): string
+    public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $apiResource, bool $withPasswordUpgrade = false, bool $generateRepositoryClass = true, bool $broadcast = false, bool $doctrineAttributes = false): string
     {
         $repoClassDetails = $this->generator->createClassNameDetails(
             $entityClassDetails->getRelativeName(),
@@ -53,6 +53,7 @@ public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $
                 'broadcast' => $broadcast,
                 'should_escape_table_name' => $this->doctrineHelper->isKeyword($tableName),
                 'table_name' => $tableName,
+                'doctrine_use_attributes' => $doctrineAttributes
             ]
         );
 

src/Maker/MakeEntity.php

@@ -13,6 +13,9 @@
 
 use ApiPlatform\Core\Annotation\ApiResource;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\Mapping\Driver\AttributeDriver;
+use Doctrine\Persistence\Mapping\Driver\AnnotationDriver;
+use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
 use Symfony\Bundle\MakerBundle\Doctrine\DoctrineHelper;
@@ -160,6 +163,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             'Entity\\'
         );
 
+        $mappingDriver = $this->doctrineHelper->getMappingDriverForNamespace($entityClassDetails->getFullName());
         $classExists = class_exists($entityClassDetails->getFullName());
         if (!$classExists) {
             $broadcast = $input->getOption('broadcast');
@@ -168,7 +172,8 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
                 $input->getOption('api-resource'),
                 false,
                 true,
-                $broadcast
+                $broadcast,
+                $mappingDriver instanceof AttributeDriver
             );
 
             if ($broadcast) {
@@ -186,10 +191,6 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             $generator->writeChanges();
         }
 
-        if (!$this->doesEntityUseAnnotationMapping($entityClassDetails->getFullName())) {
-            throw new RuntimeCommandException(sprintf('Only annotation mapping is supported by make:entity, but the <info>%s</info> class uses a different format. If you would like this command to generate the properties & getter/setter methods, add your mapping configuration, and then re-run this command with the <info>--regenerate</info> flag.', $entityClassDetails->getFullName()));
-        }
-
         if ($classExists) {
             $entityPath = $this->getPathOfClass($entityClassDetails->getFullName());
             $io->text([
@@ -204,7 +205,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         }
 
         $currentFields = $this->getPropertyNames($entityClassDetails->getFullName());
-        $manipulator = $this->createClassManipulator($entityPath, $io, $overwrite);
+        $manipulator = $this->createClassManipulator($entityPath, $io, $overwrite, $mappingDriver);
 
         $isFirstField = true;
         while (true) {
@@ -232,7 +233,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
                     $otherManipulator = $manipulator;
                 } else {
                     $otherManipulatorFilename = $this->getPathOfClass($newField->getInverseClass());
-                    $otherManipulator = $this->createClassManipulator($otherManipulatorFilename, $io, $overwrite);
+                    $otherManipulator = $this->createClassManipulator($otherManipulatorFilename, $io, $overwrite, $mappingDriver);
                 }
                 switch ($newField->getType()) {
                     case EntityRelation::MANY_TO_ONE:
@@ -247,7 +248,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
                             // the new field being added to THIS entity is the inverse
                             $newFieldName = $newField->getInverseProperty();
                             $otherManipulatorFilename = $this->getPathOfClass($newField->getOwningClass());
-                            $otherManipulator = $this->createClassManipulator($otherManipulatorFilename, $io, $overwrite);
+                            $otherManipulator = $this->createClassManipulator($otherManipulatorFilename, $io, $overwrite, $mappingDriver);
 
                             // The *other* class will receive the ManyToOne
                             $otherManipulator->addManyToOneRelation($newField->getOwningRelation());
@@ -791,9 +792,13 @@ private function askRelationType(ConsoleStyle $io, string $entityClass, string $
         return $io->askQuestion($question);
     }
 
-    private function createClassManipulator(string $path, ConsoleStyle $io, bool $overwrite): ClassSourceManipulator
+    private function createClassManipulator(string $path, ConsoleStyle $io, bool $overwrite, ?MappingDriver $mappingDriver = null): ClassSourceManipulator
     {
-        $manipulator = new ClassSourceManipulator($this->fileManager->getFileContents($path), $overwrite);
+        $useAnnotations = null === $mappingDriver || $mappingDriver instanceof AnnotationDriver && !$mappingDriver instanceof AttributeDriver;
+        $useAttributes = $mappingDriver instanceof AttributeDriver;
+
+        $manipulator = new ClassSourceManipulator($this->fileManager->getFileContents($path), $overwrite, $useAnnotations, true, $useAttributes);
+
         $manipulator->setIo($io);
 
         return $manipulator;
@@ -832,6 +837,7 @@ private function getPropertyNames(string $class): array
         }, $reflClass->getProperties());
     }
 
+    // not needed anymore
     private function doesEntityUseAnnotationMapping(string $className): bool
     {
         if (!class_exists($className)) {

src/Resources/skeleton/doctrine/Entity.tpl.php

@@ -9,29 +9,39 @@
 <?php if ($broadcast): ?>use Symfony\UX\Turbo\Attribute\Broadcast;
 <?php endif ?>
 
+<?php if(!$use_attributes || !$doctrine_use_attributes): ?>
 /**
 <?php if ($api_resource && !$use_attributes): ?> * @ApiResource()
 <?php endif ?>
 <?php if ($broadcast && !$use_attributes): ?> * @Broadcast()
 <?php endif ?>
- * @ORM\Entity(repositoryClass=<?= $repository_class_name ?>::class)
+<?php if(!$doctrine_use_attributes): ?> * @ORM\Entity(repositoryClass=<?= $repository_class_name ?>::class)
+<?php endif ?>
 <?php if ($should_escape_table_name): ?> * @ORM\Table(name="`<?= $table_name ?>`")
 <?php endif ?>
  */
+<?php endif ?>
 <?php if ($api_resource && $use_attributes): ?>
 #[ApiResource]
 <?php endif ?>
 <?php if ($broadcast && $use_attributes): ?>
 #[Broadcast]
 <?php endif ?>
+<?php if($doctrine_use_attributes): ?>
+#[ORM\Entity(repositoryClass: <?= $repository_class_name ?>::class)]
+<?php if($should_escape_table_name): ?> #[ORM\Table(name: '`<?= $table_name ?>`')]<?php endif ?>
+<?php endif?>
 class <?= $class_name."\n" ?>
 {
-    /**
+    <?php if(!$doctrine_use_attributes): ?>/**
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
      */
-    private $id;
+    <?php else: ?>#[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
+    <?php endif ?>private $id;
 
     public function getId(): ?int
     {