drop annotations plugins deprecations

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/PhpTwigTemplateUsageStubIndex.java

@@ -15,6 +15,7 @@
 import com.jetbrains.php.lang.psi.elements.MethodReference;
 import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
 import com.jetbrains.php.lang.psi.stubs.indexes.PhpConstantNameIndex;
+import de.espend.idea.php.annotation.util.AnnotationUtil;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.TwigHelper;
 import fr.adrienbrault.idea.symfony2plugin.stubs.dict.TemplateUsage;
@@ -122,7 +123,7 @@ private void visitPhpDocTag(@NotNull PhpDocTag phpDocTag) {
                             return;
                         }
 
-                        String template = AnnotationBackportUtil.getPropertyValueOrDefault(phpDocTag, "template");
+                        String template = AnnotationUtil.getPropertyValueOrDefault(phpDocTag, "template");
                         if(template != null && template.endsWith(".html.twig")) {
                             Method methodScope = AnnotationBackportUtil.getMethodScope(phpDocTag);
                             if(methodScope != null) {

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/visitor/AnnotationRouteElementWalkingVisitor.java

@@ -13,6 +13,7 @@
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.jetbrains.php.lang.psi.elements.PhpPsiElement;
 import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
+import de.espend.idea.php.annotation.util.AnnotationUtil;
 import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
 import fr.adrienbrault.idea.symfony2plugin.stubs.dict.StubIndexedRoute;
 import fr.adrienbrault.idea.symfony2plugin.util.AnnotationBackportUtil;
@@ -77,7 +78,7 @@ private void visitPhpDocTag(@NotNull PhpDocTag phpDocTag) {
             return;
         }
 
-        String routeName = AnnotationBackportUtil.getPropertyValue(phpDocTag, "name");
+        String routeName = AnnotationUtil.getPropertyValue(phpDocTag, "name");
         if(routeName == null) {
             routeName = AnnotationBackportUtil.getRouteByMethod(phpDocTag);
         }
@@ -145,7 +146,7 @@ private String getRouteNamePrefix(@NotNull PhpDocTag phpDocTag) {
             }
 
             // extract "name" property
-            String annotationRouteName = AnnotationBackportUtil.getPropertyValue(docTag, "name");
+            String annotationRouteName = AnnotationUtil.getPropertyValue(docTag, "name");
             if(StringUtils.isNotBlank(annotationRouteName)) {
                 return annotationRouteName;
             }

src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java

@@ -24,6 +24,7 @@
 import com.jetbrains.twig.TwigLanguage;
 import com.jetbrains.twig.TwigTokenTypes;
 import com.jetbrains.twig.elements.*;
+import de.espend.idea.php.annotation.util.AnnotationUtil;
 import fr.adrienbrault.idea.symfony2plugin.TwigHelper;
 import fr.adrienbrault.idea.symfony2plugin.action.comparator.ValueComparator;
 import fr.adrienbrault.idea.symfony2plugin.stubs.dict.TemplateUsage;
@@ -34,7 +35,6 @@
 import fr.adrienbrault.idea.symfony2plugin.templating.path.TwigPath;
 import fr.adrienbrault.idea.symfony2plugin.templating.path.TwigPathIndex;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.dict.PsiVariable;
-import fr.adrienbrault.idea.symfony2plugin.util.AnnotationBackportUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils;
 import fr.adrienbrault.idea.symfony2plugin.util.SymfonyBundleUtil;
@@ -130,7 +130,7 @@ public static String[] getControllerMethodShortcut(@NotNull Method method) {
      */
     @Nullable
     public static Pair<String, PsiElement[]> getTemplateAnnotationFiles(@NotNull PhpDocTag phpDocTag) {
-        String template = AnnotationBackportUtil.getPropertyValueOrDefault(phpDocTag, "template");
+        String template = AnnotationUtil.getPropertyValueOrDefault(phpDocTag, "template");
         if(template == null) {
             return null;
         }

src/fr/adrienbrault/idea/symfony2plugin/util/AnnotationBackportUtil.java

@@ -234,92 +234,6 @@ public static Method getMethodScope(@NotNull PhpDocTag phpDocTag) {
         return (Method) method;
     }
 
-    /**
-     * Extract property value or fallback on default annotation pattern
-     *
-     * TODO: Migrate to AnnotationUtil until plugin when all got the new API
-     *
-     * "@Template("foobar.html.twig")"
-     * "@Template(template="foobar.html.twig")"
-     *
-     * @see de.espend.idea.php.annotation.util.AnnotationUtil#getPropertyValueOrDefault
-     */
-    @Nullable
-    @Deprecated
-    public static String getPropertyValueOrDefault(@NotNull PhpDocTag phpDocTag, @NotNull String property) {
-        PhpPsiElement attributeList = phpDocTag.getFirstPsiChild();
-        if(attributeList == null || attributeList.getNode().getElementType() != PhpDocElementTypes.phpDocAttributeList) {
-            return null;
-        }
-
-        String contents = null;
-        PsiElement lParen = attributeList.getFirstChild();
-        if(lParen == null) {
-            return null;
-        }
-
-        PsiElement defaultValue = lParen.getNextSibling();
-        if(defaultValue instanceof StringLiteralExpression) {
-            // @Template("foobar.html.twig")
-            contents = ((StringLiteralExpression) defaultValue).getContents();
-        } else {
-            // @Template(template="foobar.html.twig")
-            PsiElement psiProperty = Arrays.stream(attributeList.getChildren())
-                .filter(psiElement1 -> getPropertyIdentifierValue(property).accepts(psiElement1))
-                .findFirst()
-                .orElse(null);
-
-            if(psiProperty instanceof StringLiteralExpression) {
-                contents = ((StringLiteralExpression) psiProperty).getContents();
-            }
-        }
-
-        if(StringUtils.isNotBlank(contents)) {
-            return contents;
-        }
-
-        return contents;
-    }
-
-    /**
-     * Get the property value by given name
-     *
-     * "@Template(template="foobar.html.twig")"
-     *
-     * TODO: Migrate to AnnotationUtil until plugin when all got the new API
-     *
-     * @see de.espend.idea.php.annotation.util.AnnotationUtil#getPropertyValue
-     */
-    @Nullable
-    @Deprecated
-    public static String getPropertyValue(@NotNull PhpDocTag phpDocTag, @NotNull String property) {
-        PhpPsiElement attributeList = phpDocTag.getFirstPsiChild();
-        if(attributeList == null || attributeList.getNode().getElementType() != PhpDocElementTypes.phpDocAttributeList) {
-            return null;
-        }
-
-        PsiElement lParen = attributeList.getFirstChild();
-        if(lParen == null) {
-            return null;
-        }
-
-        PsiElement psiProperty = Arrays.stream(attributeList.getChildren())
-            .filter(psiElement1 -> getPropertyIdentifierValue(property).accepts(psiElement1))
-            .findFirst()
-            .orElse(null);
-
-        if(!(psiProperty instanceof StringLiteralExpression)) {
-            return null;
-        }
-
-        String contents = ((StringLiteralExpression) psiProperty).getContents();
-        if(StringUtils.isNotBlank(contents)) {
-            return contents;
-        }
-
-        return null;
-    }
-
     @Nullable
     public static String getClassNameReference(PhpDocTag phpDocTag, Map<String, String> useImports) {
 
@@ -355,19 +269,4 @@ public static String getClassNameReference(PhpDocTag phpDocTag, Map<String, Stri
 
         return annotationFqnName;
     }
-
-    /**
-     * matches "@Callback(propertyName="<value>")"
-     */
-    private static PsiElementPattern.Capture<StringLiteralExpression> getPropertyIdentifierValue(String propertyName) {
-        return PlatformPatterns.psiElement(StringLiteralExpression.class)
-            .afterLeafSkipping(
-                PlatformPatterns.or(
-                    PlatformPatterns.psiElement(PsiWhiteSpace.class),
-                    PlatformPatterns.psiElement(PhpDocTokenTypes.DOC_TEXT).withText("=")
-                ),
-                PlatformPatterns.psiElement(PhpDocTokenTypes.DOC_IDENTIFIER).withText(propertyName)
-            )
-            .withParent(PlatformPatterns.psiElement(PhpDocElementTypes.phpDocAttributeList));
-    }
 }

tests/fr/adrienbrault/idea/symfony2plugin/tests/util/AnnotationBackportUtilTest.java

@@ -98,8 +98,8 @@ else
 fi
 
 rm -f $travisCache/php-annotation.jar
-download "http://phpstorm.espend.de/files/proxy/plugins/php-annotation.jar"
-cp $travisCache/php-annotation.jar ./plugins
+download "http://phpstorm.espend.de/files/proxy/plugins/php-annotation-5.2.jar"
+cp $travisCache/php-annotation-5.2.jar ./plugins/php-annotation.jar
 
 rm -f $travisCache/php-toolbox.jar
 download "http://phpstorm.espend.de/files/proxy/plugins/php-toolbox.jar"