Merge pull request #2208 from Haehnchen/feature/variadic-doctrine-where

support Doctrine querybuilder "where" methods to be "variadic"
Haehnchen · Aug 12, 2023 · eacb705 · eacb705
2 parents 0ef0fcb + da12529
commit eacb705
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/...enbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java b/...enbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java
@@ -213,7 +213,7 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters
                     return;
                 }
 
-                MethodMatcher.MethodMatchParameter methodMatchParameter = new MethodMatcher.StringParameterMatcher(psiElement.getContext(), 0)
+                MethodMatcher.MethodMatchParameter methodMatchParameter = new MethodMatcher.StringParameterMatcher(psiElement.getContext())
                     .withSignature(WHERES)
                     .match();
 

diff --git a/...enbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderMethodReferenceParser.java b/...enbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderMethodReferenceParser.java
@@ -186,19 +186,21 @@ private void collectJoins(QueryBuilderScopeContext qb, MethodReference methodRef
     }
 
     private void collectParameter(QueryBuilderScopeContext qb, MethodReference methodReference, String name) {
-
-        if(!collectParameter || !Arrays.asList("where", "andWhere").contains(name)) {
+        if (!collectParameter || !Arrays.asList("where", "andWhere").contains(name)) {
             return;
         }
 
-        String value = PsiElementUtils.getMethodParameterAt(methodReference, 0);
-        if(value != null) {
+        for (PsiElement parameter : methodReference.getParameters()) {
+            String value = PsiElementUtils.getMethodParameter(parameter);
+            if (value == null) {
+                continue;
+            }
+
             Matcher matcher = Pattern.compile(":(\\w+)", Pattern.MULTILINE).matcher(value);
-            while(matcher.find()){
+            while (matcher.find()){
                 qb.addParameter(matcher.group(1));
             }
         }
-
     }
 
     /**

diff --git a/...main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/util/MatcherUtil.java b/...main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/util/MatcherUtil.java
@@ -63,7 +63,7 @@ public static MethodMatcher.MethodMatchParameter matchJoin(PsiElement psiElement
 
     @Nullable
     public static MethodMatcher.MethodMatchParameter matchWhere(PsiElement psiElement) {
-        return new MethodMatcher.StringParameterMatcher(psiElement, 0)
+        return new MethodMatcher.StringParameterMatcher(psiElement)
             .withSignature("\\Doctrine\\ORM\\QueryBuilder", "andWhere")
             .withSignature("\\Doctrine\\ORM\\QueryBuilder", "where")
             .withSignature("\\Doctrine\\ORM\\QueryBuilder", "orWhere")

diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodMatcher.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodMatcher.java
@@ -117,14 +117,21 @@ public StringParameterMatcher(PsiElement psiElement, int parameterIndex) {
             super(psiElement, parameterIndex);
         }
 
+        public StringParameterMatcher(PsiElement psiElement) {
+            super(psiElement, -1);
+        }
+
         @Nullable
         public MethodMatchParameter match() {
 
             if (!Symfony2ProjectComponent.isEnabled(psiElement)) {
                 return null;
             }
 
-            MethodReferenceBag bag = PhpElementsUtil.getMethodParameterReferenceBag(psiElement, this.parameterIndex);
+            MethodReferenceBag bag = this.parameterIndex >= 0
+                ? PhpElementsUtil.getMethodParameterReferenceBag(psiElement, this.parameterIndex)
+                : PhpElementsUtil.getMethodParameterReferenceBag(psiElement);
+
             if(bag == null) {
                 return null;
             }