add PhpStorm 2020.1 build gradle support

Author: Haehnchen

.travis.yml

@@ -24,6 +24,7 @@ before_install:
 
 env:
   - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2019.2" PHP_PLUGIN_VERSION="192.5728.108" TWIG_PLUGIN_VERSION="192.5728.26" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3" DQL_PLUGIN_VERSION="192.5728.12"
+  - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2020.1" PHP_PLUGIN_VERSION="201.6668.153" TWIG_PLUGIN_VERSION="201.6668.153" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3" DQL_PLUGIN_VERSION="201.6668.60"
 
 script:
 - "./gradlew check verifyPlugin buildPlugin"

gradle.properties

@@ -1,6 +1,6 @@
-ideaVersion = IU-2019.2
-phpPluginVersion = 192.5728.108
-twigPluginVersion = 192.5728.26
-dqlPluginVersion = 192.5728.12
+ideaVersion = IU-2020.1
+phpPluginVersion = 201.6668.153
+twigPluginVersion = 201.6668.153
+dqlPluginVersion = 201.6668.60
 toolboxPluginVersion = 0.4.6
 annotationPluginVersion = 5.3

src/main/java/fr/adrienbrault/idea/symfony2plugin/action/SymfonySymbolSearchAction.java

@@ -132,7 +132,7 @@ private Map<String, LookupElement> getModelLookupElements() {
         }
 
         @Override
-        public void processNames(@NotNull Processor<String> processor, @NotNull GlobalSearchScope scope, @Nullable IdFilter filter) {
+        public void processNames(@NotNull Processor<? super String> processor, @NotNull GlobalSearchScope scope, @Nullable IdFilter filter) {
             for(String name: getServiceCollector().getServices().keySet()) {
                 processor.process(name);
             }
@@ -174,7 +174,7 @@ public void processNames(@NotNull Processor<String> processor, @NotNull GlobalSe
         }
 
         @Override
-        public void processElementsWithName(@NotNull String name, @NotNull Processor<NavigationItem> processor, @NotNull FindSymbolParameters parameters) {
+        public void processElementsWithName(@NotNull String name, @NotNull Processor<? super NavigationItem> processor, @NotNull FindSymbolParameters parameters) {
 
             for(ContainerService containerService: getServiceCollector().collect()) {
                 if(containerService.getName().equals(name)) {

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java

@@ -562,7 +562,7 @@ public void assertLineMarker(@NotNull PsiElement psiElement, @NotNull LineMarker
 
         final List<PsiElement> elements = collectPsiElementsRecursive(psiElement);
 
-        for (LineMarkerProvider lineMarkerProvider : LineMarkerProviders.INSTANCE.allForLanguage(psiElement.getLanguage())) {
+        for (LineMarkerProvider lineMarkerProvider : LineMarkerProviders.getInstance().allForLanguage(psiElement.getLanguage())) {
             Collection<LineMarkerInfo> lineMarkerInfos = new ArrayList<LineMarkerInfo>();
             lineMarkerProvider.collectSlowLineMarkers(elements, lineMarkerInfos);
 
@@ -584,7 +584,7 @@ public void assertLineMarkerIsEmpty(@NotNull PsiElement psiElement) {
 
         final List<PsiElement> elements = collectPsiElementsRecursive(psiElement);
 
-        for (LineMarkerProvider lineMarkerProvider : LineMarkerProviders.INSTANCE.allForLanguage(psiElement.getLanguage())) {
+        for (LineMarkerProvider lineMarkerProvider : LineMarkerProviders.getInstance().allForLanguage(psiElement.getLanguage())) {
             Collection<LineMarkerInfo> lineMarkerInfos = new ArrayList<LineMarkerInfo>();
             lineMarkerProvider.collectSlowLineMarkers(elements, lineMarkerInfos);