From 173431825dc9d70469e8acbbe0242ece73a932cc Mon Sep 17 00:00:00 2001 From: NACorp Date: Fri, 13 Jan 2023 16:48:09 +0100 Subject: [PATCH 1/6] Avoid generating deprecated $this->renderForm() in 6.2 --- src/Maker/MakeCrud.php | 3 ++- src/Resources/skeleton/crud/controller/Controller.tpl.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Maker/MakeCrud.php b/src/Maker/MakeCrud.php index c2e313ca9..066d78dba 100644 --- a/src/Maker/MakeCrud.php +++ b/src/Maker/MakeCrud.php @@ -179,7 +179,8 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen 'entity_var_singular' => $entityVarSingular, 'entity_twig_var_singular' => $entityTwigVarSingular, 'entity_identifier' => $entityDoctrineDetails->getIdentifier(), - 'use_render_form' => method_exists(AbstractController::class, 'renderForm'), + // @legacy - Remove when support for Symfony <6 is dropped - hack to determine version + 'use_render_form' => method_exists(AbstractController::class, 'getDoctrine'), ], $repositoryVars ) diff --git a/src/Resources/skeleton/crud/controller/Controller.tpl.php b/src/Resources/skeleton/crud/controller/Controller.tpl.php index c50bea82e..d20f837d1 100644 --- a/src/Resources/skeleton/crud/controller/Controller.tpl.php +++ b/src/Resources/skeleton/crud/controller/Controller.tpl.php @@ -62,7 +62,7 @@ public function new(Request $request, EntityManagerInterface $entityManager): Re return $this->render('/new.html.twig', [ '' => $, - 'form' => $form->createView(), + 'form' => $form, ]); } @@ -107,7 +107,7 @@ public function edit(Request $request, $ return $this->render('/edit.html.twig', [ '' => $, - 'form' => $form->createView(), + 'form' => $form, ]); } From caa53b1cddb02d69b0741600fbd5d632f1e4e195 Mon Sep 17 00:00:00 2001 From: NACorp Date: Fri, 13 Jan 2023 16:55:40 +0100 Subject: [PATCH 2/6] CS --- src/Maker/MakeCrud.php | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/Maker/MakeCrud.php b/src/Maker/MakeCrud.php index 066d78dba..d63a5dcff 100644 --- a/src/Maker/MakeCrud.php +++ b/src/Maker/MakeCrud.php @@ -70,8 +70,7 @@ public function configureCommand(Command $command, InputConfiguration $inputConf { $command ->addArgument('entity-class', InputArgument::OPTIONAL, sprintf('The class name of the entity to create CRUD (e.g. %s)', Str::asClassName(Str::getRandomTerm()))) - ->setHelp(file_get_contents(__DIR__.'/../Resources/help/MakeCrud.txt')) - ; + ->setHelp(file_get_contents(__DIR__.'/../Resources/help/MakeCrud.txt')); $inputConfig->setArgumentAsNonInteractive('entity-class'); } @@ -168,20 +167,20 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen $controllerClassDetails->getFullName(), 'crud/controller/Controller.tpl.php', array_merge([ - 'use_statements' => $useStatements, - 'entity_class_name' => $entityClassDetails->getShortName(), - 'form_class_name' => $formClassDetails->getShortName(), - 'route_path' => Str::asRoutePath($controllerClassDetails->getRelativeNameWithoutSuffix()), - 'route_name' => $routeName, - 'templates_path' => $templatesPath, - 'entity_var_plural' => $entityVarPlural, - 'entity_twig_var_plural' => $entityTwigVarPlural, - 'entity_var_singular' => $entityVarSingular, - 'entity_twig_var_singular' => $entityTwigVarSingular, - 'entity_identifier' => $entityDoctrineDetails->getIdentifier(), - // @legacy - Remove when support for Symfony <6 is dropped - hack to determine version - 'use_render_form' => method_exists(AbstractController::class, 'getDoctrine'), - ], + 'use_statements' => $useStatements, + 'entity_class_name' => $entityClassDetails->getShortName(), + 'form_class_name' => $formClassDetails->getShortName(), + 'route_path' => Str::asRoutePath($controllerClassDetails->getRelativeNameWithoutSuffix()), + 'route_name' => $routeName, + 'templates_path' => $templatesPath, + 'entity_var_plural' => $entityVarPlural, + 'entity_twig_var_plural' => $entityTwigVarPlural, + 'entity_var_singular' => $entityVarSingular, + 'entity_twig_var_singular' => $entityTwigVarSingular, + 'entity_identifier' => $entityDoctrineDetails->getIdentifier(), + // @legacy - Remove when support for Symfony <6 is dropped - hack to determine version + 'use_render_form' => method_exists(AbstractController::class, 'getDoctrine'), + ], $repositoryVars ) ); From 70a31f30611ed1221cba0c8ce25f6c3ff3f2330e Mon Sep 17 00:00:00 2001 From: NACorp Date: Mon, 23 Jan 2023 13:40:53 +0100 Subject: [PATCH 3/6] CS --- src/Maker/MakeCrud.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Maker/MakeCrud.php b/src/Maker/MakeCrud.php index d63a5dcff..582bfbde6 100644 --- a/src/Maker/MakeCrud.php +++ b/src/Maker/MakeCrud.php @@ -167,20 +167,20 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen $controllerClassDetails->getFullName(), 'crud/controller/Controller.tpl.php', array_merge([ - 'use_statements' => $useStatements, - 'entity_class_name' => $entityClassDetails->getShortName(), - 'form_class_name' => $formClassDetails->getShortName(), - 'route_path' => Str::asRoutePath($controllerClassDetails->getRelativeNameWithoutSuffix()), - 'route_name' => $routeName, - 'templates_path' => $templatesPath, - 'entity_var_plural' => $entityVarPlural, - 'entity_twig_var_plural' => $entityTwigVarPlural, - 'entity_var_singular' => $entityVarSingular, - 'entity_twig_var_singular' => $entityTwigVarSingular, - 'entity_identifier' => $entityDoctrineDetails->getIdentifier(), - // @legacy - Remove when support for Symfony <6 is dropped - hack to determine version - 'use_render_form' => method_exists(AbstractController::class, 'getDoctrine'), - ], + 'use_statements' => $useStatements, + 'entity_class_name' => $entityClassDetails->getShortName(), + 'form_class_name' => $formClassDetails->getShortName(), + 'route_path' => Str::asRoutePath($controllerClassDetails->getRelativeNameWithoutSuffix()), + 'route_name' => $routeName, + 'templates_path' => $templatesPath, + 'entity_var_plural' => $entityVarPlural, + 'entity_twig_var_plural' => $entityTwigVarPlural, + 'entity_var_singular' => $entityVarSingular, + 'entity_twig_var_singular' => $entityTwigVarSingular, + 'entity_identifier' => $entityDoctrineDetails->getIdentifier(), + // @legacy - Remove when support for Symfony <6 is dropped - hack to determine version + 'use_render_form' => method_exists(AbstractController::class, 'getDoctrine'), + ], $repositoryVars ) ); From 0cdc6885496b6fce0afabd9644f36a3ea588c8e9 Mon Sep 17 00:00:00 2001 From: NACorp Date: Mon, 23 Jan 2023 13:41:34 +0100 Subject: [PATCH 4/6] CS --- src/Maker/MakeCrud.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Maker/MakeCrud.php b/src/Maker/MakeCrud.php index 582bfbde6..091ddb6ec 100644 --- a/src/Maker/MakeCrud.php +++ b/src/Maker/MakeCrud.php @@ -70,7 +70,8 @@ public function configureCommand(Command $command, InputConfiguration $inputConf { $command ->addArgument('entity-class', InputArgument::OPTIONAL, sprintf('The class name of the entity to create CRUD (e.g. %s)', Str::asClassName(Str::getRandomTerm()))) - ->setHelp(file_get_contents(__DIR__.'/../Resources/help/MakeCrud.txt')); + ->setHelp(file_get_contents(__DIR__.'/../Resources/help/MakeCrud.txt')) + ; $inputConfig->setArgumentAsNonInteractive('entity-class'); } From 38eafed9f8639b536626c62da771f1a442e4e15d Mon Sep 17 00:00:00 2001 From: NACorp Date: Fri, 24 Feb 2023 08:52:36 +0100 Subject: [PATCH 5/6] fix: using Kernel::VERSION --- src/Maker/MakeCrud.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Maker/MakeCrud.php b/src/Maker/MakeCrud.php index 091ddb6ec..7ae6f3499 100644 --- a/src/Maker/MakeCrud.php +++ b/src/Maker/MakeCrud.php @@ -38,6 +38,7 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Csrf\CsrfTokenManager; use Symfony\Component\Validator\Validation; @@ -179,8 +180,8 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen 'entity_var_singular' => $entityVarSingular, 'entity_twig_var_singular' => $entityTwigVarSingular, 'entity_identifier' => $entityDoctrineDetails->getIdentifier(), - // @legacy - Remove when support for Symfony <6 is dropped - hack to determine version - 'use_render_form' => method_exists(AbstractController::class, 'getDoctrine'), + // @legacy - Remove when support for Symfony <6 is dropped + 'use_render_form' => Kernel::VERSION_ID < 60000, ], $repositoryVars ) From c181d10e7a286d6c31a4a5e50684049d22008fc3 Mon Sep 17 00:00:00 2001 From: Nicolas Attard Date: Wed, 1 Mar 2023 14:59:19 +0100 Subject: [PATCH 6/6] Update src/Maker/MakeCrud.php Co-authored-by: Ryan Weaver --- src/Maker/MakeCrud.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Maker/MakeCrud.php b/src/Maker/MakeCrud.php index 7ae6f3499..b55718572 100644 --- a/src/Maker/MakeCrud.php +++ b/src/Maker/MakeCrud.php @@ -181,7 +181,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen 'entity_twig_var_singular' => $entityTwigVarSingular, 'entity_identifier' => $entityDoctrineDetails->getIdentifier(), // @legacy - Remove when support for Symfony <6 is dropped - 'use_render_form' => Kernel::VERSION_ID < 60000, + 'use_render_form' => Kernel::VERSION_ID < 62000, ], $repositoryVars )