update travis build with final version strings and fix API changes

Haehnchen · Haehnchen · commit 9cc7f9183929 · 2020-08-04T18:42:41.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ before_install:
 - "export ORG_GRADLE_PROJECT_annotationPluginVersion=${ANNOTATION_PLUGIN_VERSION}"
 
 env:
-  - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-202.5792.28-EAP-SNAPSHOT" PHP_PLUGIN_VERSION="202.5792.59" TWIG_PLUGIN_VERSION="202.5792.17" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3" DQL_PLUGIN_VERSION="202.5792.28"
+  - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2020.2" PHP_PLUGIN_VERSION="202.6397.115" TWIG_PLUGIN_VERSION="202.6397.21" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3" DQL_PLUGIN_VERSION="202.6397.59"
 
 script:
 - "./gradlew check verifyPlugin buildPlugin"
diff --git a/build.gradle b/build.gradle
@@ -45,7 +45,7 @@ intellij {
 }
 
 patchPluginXml {
-    sinceBuild '201'
+    sinceBuild '202'
     changeNotes = htmlFixer('src/main/resources/META-INF/change-notes.html')
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
-ideaVersion = IU-202.5792.28-EAP-SNAPSHOT
-phpPluginVersion = 202.5792.59
-twigPluginVersion = 202.5792.17
-dqlPluginVersion = 202.5792.28
+ideaVersion = IU-2020.2
+phpPluginVersion = 202.6397.115
+twigPluginVersion = 202.6397.21
+dqlPluginVersion = 202.6397.59
 toolboxPluginVersion = 0.4.6
 annotationPluginVersion = 5.3
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java
@@ -381,7 +381,7 @@ private void autowireConstructorMarker(PsiElement psiElement, Collection<? super
         results.add(builder.createLineMarkerInfo(psiElement));
     }
 
-    private void constraintMessagePropertyMarker(@NotNull PsiElement psiElement, @NotNull Collection<LineMarkerInfo> results) {
+    private void constraintMessagePropertyMarker(@NotNull PsiElement psiElement, @NotNull Collection<? super LineMarkerInfo<?>> results) {
         PsiElement parent = psiElement.getParent();
         if (parent instanceof StringLiteralExpression && TranslationUtil.isConstraintPropertyField((StringLiteralExpression) parent)) {
             String contents = ((StringLiteralExpression) parent).getContents();
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/YamlLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/YamlLineMarkerProvider.java
@@ -63,7 +63,7 @@ public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> psiElemen
         }
     }
 
-    private void visitServiceIdForResources(PsiElement leafTarget, YAMLKeyValue yamlKeyValue, @NotNull Collection<LineMarkerInfo> result) {
+    private void visitServiceIdForResources(PsiElement leafTarget, YAMLKeyValue yamlKeyValue, @NotNull Collection<? super LineMarkerInfo<?>> result) {
         String resource = YamlHelper.getYamlKeyValueAsString(yamlKeyValue, "resource");
         if (resource == null) {
             return;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java
@@ -106,7 +106,7 @@ public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> psiElemen
                     results.add(lineOverwrites);
                 }
             } else if(TwigPattern.getFunctionPattern("form_start", "form").accepts(psiElement)) {
-                LineMarkerInfo lineOverwrites = attachFormType(psiElement);
+                LineMarkerInfo<?> lineOverwrites = attachFormType(psiElement);
                 if(lineOverwrites != null) {
                     results.add(lineOverwrites);
                 }
@@ -306,7 +306,7 @@ private LineMarkerInfo<?> attachBlockOverwrites(@NotNull PsiElement psiElement,
     }
 
     @Nullable
-    private LineMarkerInfo attachFormType(@NotNull PsiElement psiElement) {
+    private LineMarkerInfo<?> attachFormType(@NotNull PsiElement psiElement) {
         PsiElement firstChild = psiElement.getFirstChild();
         if (firstChild == null) {
             return null;
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -97,7 +97,7 @@
       ]]></description>
 
     <!-- please see http://confluence.jetbrains.net/display/IDEADEV/Build+Number+Ranges for description -->
-    <idea-version since-build="201.0"/>
+    <idea-version since-build="202.0"/>
 
     <extensions defaultExtensionNs="com.jetbrains.php">
         <typeProvider4 implementation="fr.adrienbrault.idea.symfony2plugin.dic.SymfonyContainerTypeProvider"/>

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ intellij {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`patchPluginXml {`
`48`		`- sinceBuild '201'`
	`48`	`+ sinceBuild '202'`
`49`	`49`	`changeNotes = htmlFixer('src/main/resources/META-INF/change-notes.html')`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ private void autowireConstructorMarker(PsiElement psiElement, Collection<? super`
`381`	`381`	`results.add(builder.createLineMarkerInfo(psiElement));`
`382`	`382`	`}`
`383`	`383`
`384`		`- private void constraintMessagePropertyMarker(@NotNull PsiElement psiElement, @NotNull Collection<LineMarkerInfo> results) {`
	`384`	`+ private void constraintMessagePropertyMarker(@NotNull PsiElement psiElement, @NotNull Collection<? super LineMarkerInfo<?>> results) {`
`385`	`385`	`PsiElement parent = psiElement.getParent();`
`386`	`386`	`if (parent instanceof StringLiteralExpression && TranslationUtil.isConstraintPropertyField((StringLiteralExpression) parent)) {`
`387`	`387`	`String contents = ((StringLiteralExpression) parent).getContents();`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> psiElemen`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`- private void visitServiceIdForResources(PsiElement leafTarget, YAMLKeyValue yamlKeyValue, @NotNull Collection<LineMarkerInfo> result) {`
	`66`	`+ private void visitServiceIdForResources(PsiElement leafTarget, YAMLKeyValue yamlKeyValue, @NotNull Collection<? super LineMarkerInfo<?>> result) {`
`67`	`67`	`String resource = YamlHelper.getYamlKeyValueAsString(yamlKeyValue, "resource");`
`68`	`68`	`if (resource == null) {`
`69`	`69`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> psiElemen`
`106`	`106`	`results.add(lineOverwrites);`
`107`	`107`	`}`
`108`	`108`	`} else if(TwigPattern.getFunctionPattern("form_start", "form").accepts(psiElement)) {`
`109`		`- LineMarkerInfo lineOverwrites = attachFormType(psiElement);`
	`109`	`+ LineMarkerInfo<?> lineOverwrites = attachFormType(psiElement);`
`110`	`110`	`if(lineOverwrites != null) {`
`111`	`111`	`results.add(lineOverwrites);`
`112`	`112`	`}`
`@@ -306,7 +306,7 @@ private LineMarkerInfo<?> attachBlockOverwrites(@NotNull PsiElement psiElement,`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`@Nullable`
`309`		`- private LineMarkerInfo attachFormType(@NotNull PsiElement psiElement) {`
	`309`	`+ private LineMarkerInfo<?> attachFormType(@NotNull PsiElement psiElement) {`
`310`	`310`	`PsiElement firstChild = psiElement.getFirstChild();`
`311`	`311`	`if (firstChild == null) {`
`312`	`312`	`return null;`