api migration for upcoming PhpStorm 2016.3 eap Haehnchen#782

Haehnchen · Haehnchen · commit da6f790abcca · 2016-08-24T19:23:05.000+02:00
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/xml/ParameterXmlReference.java b/src/fr/adrienbrault/idea/symfony2plugin/config/xml/ParameterXmlReference.java
@@ -23,7 +23,7 @@ public ParameterXmlReference(@NotNull XmlText element) {
     @NotNull
     @Override
     public ResolveResult[] multiResolve(boolean incompleteCode) {
-        return PhpResolveResult.create(ServiceUtil.getServiceClassTargets(getElement().getProject(), this.parameterName));
+        return PhpResolveResult.createResults(ServiceUtil.getServiceClassTargets(getElement().getProject(), this.parameterName));
     }
 
     @NotNull
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ConstraintPropertyReference.java b/src/fr/adrienbrault/idea/symfony2plugin/dic/ConstraintPropertyReference.java
@@ -39,7 +39,7 @@ public ResolveResult[] multiResolve(boolean b) {
             }
         }
 
-        return PhpResolveResult.create(psiElements);
+        return PhpResolveResult.createResults(psiElements);
     }
 
     @NotNull
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/RouteXmlReferenceContributor.java b/src/fr/adrienbrault/idea/symfony2plugin/routing/RouteXmlReferenceContributor.java
@@ -8,8 +8,6 @@
 import fr.adrienbrault.idea.symfony2plugin.util.controller.ControllerIndex;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
-
 public class RouteXmlReferenceContributor extends PsiReferenceContributor {
 
     @Override
@@ -45,8 +43,9 @@ public RouteActionReference(PsiElement psiElement) {
         @NotNull
         @Override
         public ResolveResult[] multiResolve(boolean b) {
-            PsiElement[] methodsOnControllerShortcut = RouteHelper.getMethodsOnControllerShortcut(getElement().getProject(), getElement().getText());
-            return PhpResolveResult.create(Arrays.asList(methodsOnControllerShortcut));
+            return PhpResolveResult.createResults(
+                RouteHelper.getMethodsOnControllerShortcut(getElement().getProject(), getElement().getText())
+            );
         }
 
         @NotNull

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public ParameterXmlReference(@NotNull XmlText element) {`
`23`	`23`	`@NotNull`
`24`	`24`	`@Override`
`25`	`25`	`public ResolveResult[] multiResolve(boolean incompleteCode) {`
`26`		`- return PhpResolveResult.create(ServiceUtil.getServiceClassTargets(getElement().getProject(), this.parameterName));`
	`26`	`+ return PhpResolveResult.createResults(ServiceUtil.getServiceClassTargets(getElement().getProject(), this.parameterName));`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@NotNull`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public ResolveResult[] multiResolve(boolean b) {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`- return PhpResolveResult.create(psiElements);`
	`42`	`+ return PhpResolveResult.createResults(psiElements);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@NotNull`