[make:entity] better repo methods

src/Doctrine/EntityClassGenerator.php

@@ -35,7 +35,7 @@ public function __construct(
     ) {
     }
 
-    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 $useLegacyRepoMethods = false): string
     {
         $repoClassDetails = $this->generator->createClassNameDetails(
             $entityClassDetails->getRelativeName(),
@@ -77,14 +77,15 @@ public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $
                 $repoClassDetails->getFullName(),
                 $entityClassDetails->getFullName(),
                 $withPasswordUpgrade,
-                true
+                true,
+                $useLegacyRepoMethods
             );
         }
 
         return $entityPath;
     }
 
-    public function generateRepositoryClass(string $repositoryClass, string $entityClass, bool $withPasswordUpgrade, bool $includeExampleComments = true): void
+    public function generateRepositoryClass(string $repositoryClass, string $entityClass, bool $withPasswordUpgrade, bool $includeExampleComments = true, bool $useLegacyMethods = false): void
     {
         $shortEntityClass = Str::getShortClassName($entityClass);
         $entityAlias = strtolower($shortEntityClass[0]);
@@ -121,6 +122,7 @@ public function generateRepositoryClass(string $repositoryClass, string $entityC
                 'with_password_upgrade' => $withPasswordUpgrade,
                 'password_upgrade_user_interface' => $interfaceClassNameDetails,
                 'include_example_comments' => $includeExampleComments,
+                'use_legacy_methods' => $useLegacyMethods,
             ]
         );
     }

src/Maker/MakeEntity.php

@@ -103,6 +103,7 @@ public function configureCommand(Command $command, InputConfiguration $inputConf
             ->addOption('broadcast', 'b', InputOption::VALUE_NONE, 'Add the ability to broadcast entity updates using Symfony UX Turbo?')
             ->addOption('regenerate', null, InputOption::VALUE_NONE, 'Instead of adding new fields, simply generate the methods (e.g. getter/setter) for existing fields')
             ->addOption('overwrite', null, InputOption::VALUE_NONE, 'Overwrite any existing getter/setter methods')
+            ->addOption('legacy-methods', null, InputOption::VALUE_NONE, 'Generate repository with legacy <fg=yellow>save()</> and <fg=yellow>remove()</> methods.')
             ->setHelp(file_get_contents(__DIR__.'/../Resources/help/MakeEntity.txt'))
         ;
 

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

@@ -19,6 +19,7 @@ public function __construct(ManagerRegistry $registry)
         parent::__construct($registry, <?= $entity_class_name; ?>::class);
     }
 
+<?php if ($use_legacy_methods): ?>
     public function save(<?= $entity_class_name ?> $entity, bool $flush = false): void
     {
         $this->getEntityManager()->persist($entity);
@@ -36,6 +37,34 @@ public function remove(<?= $entity_class_name ?> $entity, bool $flush = false):
             $this->getEntityManager()->flush();
         }
     }
+<?php else: ?>
+    public function persist(<?= $entity_class_name ?> $entity): void
+    {
+        $this->_em->persist($entity);
+    }
+
+    public function persistAndFlush(<?= $entity_class_name ?> $entity): void
+    {
+        $this->persist($entity);
+        $this->flush();
+    }
+
+    public function flush(): void
+    {
+        $this->_em->flush();
+    }
+
+    public function remove(<?= $entity_class_name ?> $entity): void
+    {
+        $this->_em->remove($entity);
+    }
+
+    public function removeAndFlush(<?= $entity_class_name ?> $entity): void
+    {
+        $this->remove($entity);
+        $this->flush();
+    }
+<?php endif; ?>
 <?php if ($include_example_comments): // When adding a new method without existing default comments, the blank line is automatically added.?>
 
 <?php endif; ?>