[make:entity] use sorted use statements for repositories

Author: jrushlow

src/Doctrine/EntityClassGenerator.php

@@ -12,13 +12,19 @@
 namespace Symfony\Bundle\MakerBundle\Doctrine;
 
 use ApiPlatform\Metadata\ApiResource;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\ORM\Exception\ORMException;
 use Doctrine\ORM\Mapping;
+use Doctrine\ORM\OptimisticLockException;
+use Doctrine\ORM\ORMException as LegacyORMException;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bundle\MakerBundle\Generator;
 use Symfony\Bundle\MakerBundle\Str;
 use Symfony\Bundle\MakerBundle\Util\ClassNameDetails;
 use Symfony\Bundle\MakerBundle\Util\TemplateComponentGenerator;
+use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
+use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\UX\Turbo\Attribute\Broadcast;
 
@@ -49,7 +55,7 @@ public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $
 
         $useStatements = [
             $repoClassDetails->getFullName(),
-            [Mapping::class => 'ORM']
+            [Mapping::class => 'ORM'],
         ];
 
         if ($broadcast) {
@@ -100,16 +106,35 @@ public function generateRepositoryClass(string $repositoryClass, string $entityC
 
         $interfaceClassNameDetails = new ClassNameDetails($passwordUserInterfaceName, 'Symfony\Component\Security\Core\User');
 
+        $useStatements = [
+            $entityClass,
+            ManagerRegistry::class,
+            ServiceEntityRepository::class,
+            OptimisticLockException::class,
+        ];
+
+        // @Legacy Drop LegacyORMException when XXXXXXX
+        $useStatements[] = class_exists(ORMException::class) ? ORMException::class : LegacyORMException::class;
+
+        if ($withPasswordUpgrade) {
+            $passwordClasses = [
+                $interfaceClassNameDetails->getFullName(),
+                PasswordUpgraderInterface::class,
+                UnsupportedUserException::class,
+            ];
+
+            $useStatements = array_merge($passwordClasses, $useStatements);
+        }
+
         $this->generator->generateClass(
             $repositoryClass,
             'doctrine/Repository.tpl.php',
             [
-                'entity_full_class_name' => $entityClass,
+                'use_statements' => TemplateComponentGenerator::generateUseStatements($useStatements),
                 'entity_class_name' => $shortEntityClass,
                 'entity_alias' => $entityAlias,
                 'with_password_upgrade' => $withPasswordUpgrade,
                 'password_upgrade_user_interface' => $interfaceClassNameDetails,
-                'doctrine_registry_class' => $this->managerRegistryClassName,
                 'include_example_comments' => $includeExampleComments,
             ]
         );

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

@@ -2,15 +2,7 @@
 
 namespace <?= $namespace; ?>;
 
-use <?= $entity_full_class_name; ?>;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\ORM\OptimisticLockException;
-use Doctrine\ORM\ORMException;
-use <?= $doctrine_registry_class; ?>;
-<?= $with_password_upgrade ? "use Symfony\Component\Security\Core\Exception\UnsupportedUserException;\n" : '' ?>
-<?= ($with_password_upgrade && str_contains($password_upgrade_user_interface->getFullName(), 'Password')) ? sprintf("use %s;\n", $password_upgrade_user_interface->getFullName()) : null ?>
-<?= $with_password_upgrade ? "use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;\n" : '' ?>
-<?= ($with_password_upgrade && str_contains($password_upgrade_user_interface->getFullName(), '\UserInterface')) ? sprintf("use %s;\n", $password_upgrade_user_interface->getFullName()) : null ?>
+<?= $use_statements; ?>
 
 /**
  * @extends ServiceEntityRepository<<?= $entity_class_name; ?>>