Skip to content

[make:crud] use save instead of add repository methods #1204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 22, 2022
Merged

[make:crud] use save instead of add repository methods #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d0d0a5
- rename `add` method of repository to `save`
bdaler Aug 20, 2022
756b2c6
[make:crud] fix custom repo test
jrushlow Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Resources/skeleton/crud/controller/Controller.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function index(EntityManagerInterface $entityManager): Response
<?php endif ?>

<?= $generator->generateRouteForControllerMethod('/new', sprintf('%s_new', $route_name), ['GET', 'POST']) ?>
<?php if (isset($repository_full_class_name) && $generator->repositoryHasAddRemoveMethods($repository_full_class_name)) { ?>
<?php if (isset($repository_full_class_name) && $generator->repositoryHasSaveAndRemoveMethods($repository_full_class_name)) { ?>
public function new(Request $request, <?= $repository_class_name ?> $<?= $repository_var ?>): Response
<?php } else { ?>
public function new(Request $request, EntityManagerInterface $entityManager): Response
Expand All @@ -39,9 +39,9 @@ public function new(Request $request, EntityManagerInterface $entityManager): Re
$form = $this->createForm(<?= $form_class_name ?>::class, $<?= $entity_var_singular ?>);
$form->handleRequest($request);

<?php if (isset($repository_full_class_name) && $generator->repositoryHasAddRemoveMethods($repository_full_class_name)) { ?>
<?php if (isset($repository_full_class_name) && $generator->repositoryHasSaveAndRemoveMethods($repository_full_class_name)) { ?>
if ($form->isSubmitted() && $form->isValid()) {
$<?= $repository_var ?>->add($<?= $entity_var_singular ?>, true);
$<?= $repository_var ?>->save($<?= $entity_var_singular ?>, true);

return $this->redirectToRoute('<?= $route_name ?>_index', [], Response::HTTP_SEE_OTHER);
}
Expand Down Expand Up @@ -76,7 +76,7 @@ public function show(<?= $entity_class_name ?> $<?= $entity_var_singular ?>): Re
}

<?= $generator->generateRouteForControllerMethod(sprintf('/{%s}/edit', $entity_identifier), sprintf('%s_edit', $route_name), ['GET', 'POST']) ?>
<?php if (isset($repository_full_class_name) && $generator->repositoryHasAddRemoveMethods($repository_full_class_name)) { ?>
<?php if (isset($repository_full_class_name) && $generator->repositoryHasSaveAndRemoveMethods($repository_full_class_name)) { ?>
public function edit(Request $request, <?= $entity_class_name ?> $<?= $entity_var_singular ?>, <?= $repository_class_name ?> $<?= $repository_var ?>): Response
<?php } else { ?>
public function edit(Request $request, <?= $entity_class_name ?> $<?= $entity_var_singular ?>, EntityManagerInterface $entityManager): Response
Expand All @@ -85,9 +85,9 @@ public function edit(Request $request, <?= $entity_class_name ?> $<?= $entity_va
$form = $this->createForm(<?= $form_class_name ?>::class, $<?= $entity_var_singular ?>);
$form->handleRequest($request);

<?php if (isset($repository_full_class_name) && $generator->repositoryHasAddRemoveMethods($repository_full_class_name)) { ?>
<?php if (isset($repository_full_class_name) && $generator->repositoryHasSaveAndRemoveMethods($repository_full_class_name)) { ?>
if ($form->isSubmitted() && $form->isValid()) {
$<?= $repository_var ?>->add($<?= $entity_var_singular ?>, true);
$<?= $repository_var ?>->save($<?= $entity_var_singular ?>, true);

return $this->redirectToRoute('<?= $route_name ?>_index', [], Response::HTTP_SEE_OTHER);
}
Expand All @@ -113,13 +113,13 @@ public function edit(Request $request, <?= $entity_class_name ?> $<?= $entity_va
}

<?= $generator->generateRouteForControllerMethod(sprintf('/{%s}', $entity_identifier), sprintf('%s_delete', $route_name), ['POST']) ?>
<?php if (isset($repository_full_class_name) && $generator->repositoryHasAddRemoveMethods($repository_full_class_name)) { ?>
<?php if (isset($repository_full_class_name) && $generator->repositoryHasSaveAndRemoveMethods($repository_full_class_name)) { ?>
public function delete(Request $request, <?= $entity_class_name ?> $<?= $entity_var_singular ?>, <?= $repository_class_name ?> $<?= $repository_var ?>): Response
<?php } else { ?>
public function delete(Request $request, <?= $entity_class_name ?> $<?= $entity_var_singular ?>, EntityManagerInterface $entityManager): Response
<?php } ?>
{
<?php if (isset($repository_full_class_name) && $generator->repositoryHasAddRemoveMethods($repository_full_class_name)) { ?>
<?php if (isset($repository_full_class_name) && $generator->repositoryHasSaveAndRemoveMethods($repository_full_class_name)) { ?>
if ($this->isCsrfTokenValid('delete'.$<?= $entity_var_singular ?>->get<?= ucfirst($entity_identifier) ?>(), $request->request->get('_token'))) {
$<?= $repository_var ?>->remove($<?= $entity_var_singular ?>, true);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/skeleton/doctrine/Repository.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public function __construct(ManagerRegistry $registry)
parent::__construct($registry, <?= $entity_class_name; ?>::class);
}

public function add(<?= $entity_class_name ?> $entity, bool $flush = false): void
public function save(<?= $entity_class_name ?> $entity, bool $flush = false): void
{
$this->getEntityManager()->persist($entity);

Expand Down
4 changes: 2 additions & 2 deletions src/Util/TemplateComponentGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ public function getPropertyType(ClassNameDetails $classNameDetails): ?string
/**
* @throws ReflectionException
*/
public function repositoryHasAddRemoveMethods(string $repositoryFullClassName): bool
public function repositoryHasSaveAndRemoveMethods(string $repositoryFullClassName): bool
{
$reflectedComponents = new ReflectionClass($repositoryFullClassName);

return $reflectedComponents->hasMethod('add') && $reflectedComponents->hasMethod('remove');
return $reflectedComponents->hasMethod('save') && $reflectedComponents->hasMethod('remove');
}
}
2 changes: 1 addition & 1 deletion tests/Doctrine/fixtures/expected_xml/src/Repository/UserRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function __construct(ManagerRegistry $registry)
parent::__construct($registry, UserXml::class);
}

public function add(UserXml $entity, bool $flush = false): void
public function save(UserXml $entity, bool $flush = false): void
{
$this->getEntityManager()->persist($entity);

Expand Down
2 changes: 1 addition & 1 deletion tests/Doctrine/fixtures/expected_xml/src/Repository/XOtherRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function __construct(ManagerRegistry $registry)
parent::__construct($registry, XOther::class);
}

public function add(XOther $entity, bool $flush = false): void
public function save(XOther $entity, bool $flush = false): void
{
$this->getEntityManager()->persist($entity);

Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/make-crud/SweetFoodRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function __construct(ManagerRegistry $registry)
parent::__construct($registry, SweetFood::class);
}

public function add(SweetFood $entity, bool $flush = false): void
public function save(SweetFood $entity, bool $flush = false): void
{
($em = $this->getEntityManager())->persist($entity);

Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/make-crud/expected/WithCustomRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function new(Request $request, SweetFoodRepository $sweetFoodRepository):
$form->handleRequest($request);

if ($form->isSubmitted() && $form->isValid()) {
$sweetFoodRepository->add($sweetFood, true);
$sweetFoodRepository->save($sweetFood, true);

return $this->redirectToRoute('app_sweet_food_index', [], Response::HTTP_SEE_OTHER);
}
Expand All @@ -55,7 +55,7 @@ public function edit(Request $request, SweetFood $sweetFood, SweetFoodRepository
$form->handleRequest($request);

if ($form->isSubmitted() && $form->isValid()) {
$sweetFoodRepository->add($sweetFood, true);
$sweetFoodRepository->save($sweetFood, true);

return $this->redirectToRoute('app_sweet_food_index', [], Response::HTTP_SEE_OTHER);
}
Expand Down