Skip to content

Support shortcuts instances of "Symfony\Bundle\FrameworkBundle\Controller\AbstractController" #1401 #1405

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
Haehnchen merged 1 commit into from
Dec 28, 2019
Merged

Support shortcuts instances of "Symfony\Bundle\FrameworkBundle\Controller\AbstractController" #1401 #1405

Show file tree
Hide file tree
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
9 changes: 9 additions & 0 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/config/SymfonyPhpReferenceContributor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ public class SymfonyPhpReferenceContributor extends PsiReferenceContributor {
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "get"),
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "has"),

// Symfony 4
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "get"),
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "has"),

new MethodMatcher.CallToSignature("\\Symfony\\Component\\DependencyInjection\\ContainerInterface", "get"),
new MethodMatcher.CallToSignature("\\Symfony\\Component\\DependencyInjection\\ContainerInterface", "has"),
new MethodMatcher.CallToSignature("\\Psr\\Container\\ContainerInterface", "get"),
Expand Down Expand Up @@ -70,6 +74,11 @@ public class SymfonyPhpReferenceContributor extends PsiReferenceContributor {
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "renderView"),
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "stream"),

// Symfony 4
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "render"),
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "stream"),
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "renderView"),

new MethodMatcher.CallToSignature("\\Twig_Environment", "render"),
new MethodMatcher.CallToSignature("\\Twig_Environment", "loadTemplate"),
new MethodMatcher.CallToSignature("\\Twig_Environment", "getTemplateClass"),
Expand Down
3 changes: 3 additions & 0 deletions ...in/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpConfigReferenceContributor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ public void registerReferenceProviders(@NotNull PsiReferenceRegistrar psiReferen

// Symfony 3.3 / 3.4
.addCall("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "has")

// Symfony 4
.addCall("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "has")
);

psiReferenceRegistrar.registerReferenceProvider(PhpElementsUtil.getMethodWithFirstStringPattern(), new PhpStringLiteralExpressionReference(ServiceIndexedReference.class)
Expand Down
3 changes: 3 additions & 0 deletions ...ain/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ public class ServiceContainerUtil {

// Symfony 3.3 / 3.4
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "get"),

// Symfony 4
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "get"),
};

private static String[] LOWER_PRIORITY = new String[] {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormGotoCompletionRegistrar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
// Symfony 3.3 / 3.4
.withSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "createForm")

// Symfony 4
.withSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "createForm")

.withSignature("\\Symfony\\Component\\Form\\FormFactoryInterface", "create")
.withSignature("\\Symfony\\Component\\Form\\FormFactory", "createBuilder")
.match();
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/PhpRouteReferenceContributor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ public class PhpRouteReferenceContributor extends PsiReferenceContributor {
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "generateUrl"),
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "redirectToRoute"),

// Symfony 4
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "generateUrl"),
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "redirectToRoute"),

new MethodMatcher.CallToSignature("\\Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface", "generate"),

};
Expand All @@ -33,7 +37,10 @@ public class PhpRouteReferenceContributor extends PsiReferenceContributor {
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller", "forward"),

// Symfony 3.3 / 3.4
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "forward")
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "forward"),

// Symfony 4
new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "forward"),
};

@Override
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/security/VoterGotoCompletionRegistrar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
MethodMatcher.MethodMatchParameter arrayMatchParameter = new MethodMatcher.ArrayParameterMatcher(context, 0)
.withSignature("Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller", "isGranted")
.withSignature("Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller", "denyAccessUnlessGranted")

// Symfony 4
.withSignature("Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "isGranted")
.withSignature("Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController", "denyAccessUnlessGranted")

.withSignature("Symfony\\Component\\Security\\Core\\Authorization\\AuthorizationCheckerInterface", "isGranted")
.match();

Expand Down
7 changes: 6 additions & 1 deletion ...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 @@ -81,7 +81,12 @@ public void resolve(Collection<TwigTypeContainer> targets, Collection<TwigTypeCo
}

private static void attachFormFields(@Nullable MethodReference methodReference, @NotNull Collection<TwigTypeContainer> targets) {
if(methodReference != null && PhpElementsUtil.isMethodReferenceInstanceOf(methodReference, new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller", "createForm"), new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait", "createForm"))) {
if(methodReference != null && 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")
)) {
PsiElement formType = PsiElementUtils.getMethodParameterPsiElementAt(methodReference, 0);
if(formType != null) {
PhpClass phpClass = FormUtil.getFormTypeClassOnParameter(formType);
Expand Down