Skip to content

support form type extraction of FormFactoryInterface::createNamed inside Twig type resolving #1525

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 1 commit into from
Jul 25, 2020
Merged

support form type extraction of FormFactoryInterface::createNamed inside Twig type resolving #1525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 29 additions & 12 deletions ...a/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormFieldResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,28 +80,45 @@ public void resolve(Collection<TwigTypeContainer> targets, Collection<TwigTypeCo
}

private static void attachFormFields(@Nullable MethodReference methodReference, @NotNull Collection<TwigTypeContainer> targets) {
if(methodReference != null && PhpElementsUtil.isMethodReferenceInstanceOf(
if (methodReference == null) {
return;
}

int index = -1;

if (PhpElementsUtil.isMethodReferenceInstanceOf(
methodReference,
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller", "createForm"),
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "createForm"),
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "createForm"),
new MethodMatcher.CallToSignature("\\Symfony\\Component\\Form\\FormFactoryInterface", "create")
)) {
PsiElement formType = PsiElementUtils.getMethodParameterPsiElementAt(methodReference, 0);
if(formType != null) {
PhpClass phpClass = FormUtil.getFormTypeClassOnParameter(formType);
index = 0;
} else if (PhpElementsUtil.isMethodReferenceInstanceOf(
methodReference,
new MethodMatcher.CallToSignature("\\Symfony\\Component\\Form\\FormFactoryInterface", "createNamed")
)) {
index = 1;
}

if(phpClass == null) {
return;
}
if (index < 0) {
return;
}

Method method = phpClass.findMethodByName("buildForm");
if(method == null) {
return;
}
PsiElement formType = PsiElementUtils.getMethodParameterPsiElementAt(methodReference, index);
if(formType != null) {
PhpClass phpClass = FormUtil.getFormTypeClassOnParameter(formType);

targets.addAll(getTwigTypeContainer(method, phpClass));
if(phpClass == null) {
return;
}

Method method = phpClass.findMethodByName("buildForm");
if(method == null) {
return;
}

targets.addAll(getTwigTypeContainer(method, phpClass));
}
}

Expand Down