fix deprecated and warnings in build

Haehnchen · Haehnchen · commit 4336bc96c3ca · 2025-12-07T12:11:31.000+01:00
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/SettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/SettingsForm.java
@@ -178,10 +178,6 @@ public void reset() {
         updateUIFromSettings();
     }
 
-    @Override
-    public void disposeUIResources() {
-    }
-
     private Settings getSettings() {
         return Settings.getInstance(project);
     }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/PhpBundleCompilerPassGenerateAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/PhpBundleCompilerPassGenerateAction.java
@@ -40,10 +40,6 @@ public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull Ps
             }
         }
 
-        @Override
-        public boolean startInWriteAction() {
-            return true;
-        }
     }
 
 }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.java
@@ -598,7 +598,7 @@ public boolean isCellEditable(MethodParameter.MethodModelParameter modelParamete
         public TableCellEditor getEditor(MethodParameter.MethodModelParameter modelParameter) {
 
             Set<String> sorted = modelParameter.getPossibleServices();
-            ComboBox<String> comboBox = new ComboBox<>(sorted.toArray(new String[sorted.size()]), 200);
+            ComboBox<String> comboBox = new ComboBox<>(sorted.toArray(new String[0]), 200);
             comboBox.setEditable(true);
 
             return new DefaultCellEditor(comboBox);
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/DecoratedServiceCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/DecoratedServiceCompletionProvider.java
@@ -49,12 +49,6 @@ public void getLookupElements(@NotNull GotoCompletionProviderLookupArguments arg
         );
     }
 
-    @NotNull
-    @Override
-    public Collection<LookupElement> getLookupElements() {
-        return Collections.emptyList();
-    }
-
     @NotNull
     @Override
     public Collection<PsiElement> getPsiTargets(PsiElement element) {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/xml/XmlGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/xml/XmlGotoCompletionRegistrar.java
@@ -36,7 +36,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
@@ -128,12 +127,6 @@ private static class ImportResourceGotoCompletionProvider extends GotoCompletion
             super(element);
         }
 
-        @NotNull
-        @Override
-        public Collection<LookupElement> getLookupElements() {
-            return Collections.emptyList();
-        }
-
         @NotNull
         @Override
         public Collection<PsiElement> getPsiTargets(PsiElement element) {
@@ -255,11 +248,6 @@ public Collection<LookupElement> getLookupElements() {
             return lookupElements;
         }
 
-        @NotNull
-        @Override
-        public Collection<PsiElement> getPsiTargets(PsiElement element) {
-            return Collections.emptyList();
-        }
     }
 
     private static class MyDecoratedServiceCompletionProvider extends DecoratedServiceCompletionProvider {
@@ -298,11 +286,6 @@ private static class MyGlobalStringTemplateGotoCompletionContributor implements
         @Override
         public GotoCompletionProvider getProvider(@NotNull PsiElement psiElement) {
             return new GotoCompletionProvider(psiElement) {
-                @NotNull
-                @Override
-                public Collection<LookupElement> getLookupElements() {
-                    return Collections.emptyList();
-                }
 
                 @NotNull
                 @Override
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java
@@ -19,7 +19,6 @@
 import org.jetbrains.yaml.YAMLUtil;
 import org.jetbrains.yaml.psi.*;
 
-import java.io.IOException;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlGotoCompletionRegistrar.java
@@ -38,12 +38,6 @@ private ClassGotoCompletionProvider(PsiElement element) {
             super(element);
         }
 
-        @NotNull
-        @Override
-        public Collection<LookupElement> getLookupElements() {
-            return Collections.emptyList();
-        }
-
         @NotNull
         @Override
         public Collection<PsiElement> getPsiTargets(PsiElement element) {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrar.java
@@ -23,7 +23,6 @@
 
 import java.util.*;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dbal/DoctrineDbalQbGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dbal/DoctrineDbalQbGotoCompletionRegistrar.java
@@ -164,11 +164,6 @@ public Collection<LookupElement> getLookupElements() {
             return lookupElements;
         }
 
-        @NotNull
-        @Override
-        public Collection<PsiElement> getPsiTargets(PsiElement element) {
-            return Collections.emptyList();
-        }
     }
 
     private boolean isTableNameRegistrar(PsiElement context) {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormUnderscoreMethodReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormUnderscoreMethodReference.java
@@ -12,7 +12,6 @@
 
 import java.util.*;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/action/generator/FormTypeConstantMigrationAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/action/generator/FormTypeConstantMigrationAction.java
@@ -72,11 +72,6 @@ public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull Ps
 
         }
 
-        @Override
-        public boolean startInWriteAction() {
-            return true;
-        }
-
         private static class FormTypeStringElementVisitor extends PsiRecursiveElementVisitor {
             @NotNull
             private final Collection<StringLiteralExpression> formTypes;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TwigGotoRelatedProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TwigGotoRelatedProvider.java
@@ -29,7 +29,6 @@
 
 import java.util.*;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.java
@@ -108,11 +108,6 @@ private void updateDefaultRadio() {
         }
     }
 
-    @Override
-    public void disposeUIResources() {
-
-    }
-
     private TextBrowseFolderListener createBrowseFolderListener(final JTextField textField, final FileChooserDescriptor fileChooserDescriptor) {
         return new TextBrowseFolderListener(fileChooserDescriptor) {
             @Override
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java
@@ -4,18 +4,15 @@
 import com.intellij.openapi.util.Key;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.*;
 import com.jetbrains.php.PhpIcons;
 import com.jetbrains.php.PhpIndex;
-import com.jetbrains.php.lang.PhpFileType;
 import com.jetbrains.php.lang.parser.PhpElementTypes;
 import com.jetbrains.php.lang.psi.PhpPsiUtil;
 import com.jetbrains.php.lang.psi.elements.*;
 import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.PhpAttributeIndexUtil;
 import fr.adrienbrault.idea.symfony2plugin.templating.dict.TwigExtension;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
-import fr.adrienbrault.idea.symfony2plugin.util.PhpPsiAttributesUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java
@@ -161,10 +161,6 @@ private static Map<String, String> getVariableAliasMap(@NotNull String jsonLike)
     }
 
 
-    @Override
-    public void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {
-    }
-
     private Collection<VirtualFile> getImplements(TwigFile twigFile) {
         final Set<VirtualFile> targets = new HashSet<>();
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/dict/DomainFileMap.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/dict/DomainFileMap.java
@@ -4,7 +4,6 @@
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiManager;
 import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.java
@@ -11,7 +11,6 @@
 import com.intellij.util.ui.ElementProducer;
 import com.intellij.util.ui.ListTableModel;
 import fr.adrienbrault.idea.symfony2plugin.Settings;
-import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.assistant.reference.AssistantReferenceUtil;
 import fr.adrienbrault.idea.symfony2plugin.assistant.reference.MethodParameterSetting;
 import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
@@ -145,11 +144,6 @@ public void reset() {
         this.changed = false;
     }
 
-    @Override
-    public void disposeUIResources() {
-
-    }
-
     {
 // GUI initializer generated by IntelliJ IDEA GUI Designer
 // >>> IMPORTANT!! <<<
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.java
@@ -11,7 +11,6 @@
 import com.intellij.util.ui.ElementProducer;
 import com.intellij.util.ui.ListTableModel;
 import fr.adrienbrault.idea.symfony2plugin.Settings;
-import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.assistant.signature.MethodSignatureSetting;
 import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
 import org.jetbrains.annotations.Nls;
@@ -159,11 +158,6 @@ public void reset() {
         this.changed = false;
     }
 
-    @Override
-    public void disposeUIResources() {
-
-    }
-
     {
 // GUI initializer generated by IntelliJ IDEA GUI Designer
 // >>> IMPORTANT!! <<<
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/SymfonyStatusbarWidgetFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/SymfonyStatusbarWidgetFactory.java
@@ -37,13 +37,4 @@ public boolean isAvailable(@NotNull Project project) {
         return new SymfonyProfilerWidget(project);
     }
 
-    @Override
-    public void disposeWidget(@NotNull StatusBarWidget statusBarWidget) {
-        Disposer.dispose(statusBarWidget);
-    }
-
-    @Override
-    public boolean canBeEnabledOn(@NotNull StatusBar statusBar) {
-        return true;
-    }
 }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyCommandUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyCommandUtil.java
@@ -6,14 +6,12 @@
 import com.intellij.psi.util.CachedValueProvider;
 import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.psi.util.PsiModificationTracker;
-import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import fr.adrienbrault.idea.symfony2plugin.dic.command.SymfonyCommandTestRunLineMarkerProvider;
 import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.PhpAttributeIndexUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.SymfonyCommand;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/resources/META-INF/annotation.xml b/src/main/resources/META-INF/annotation.xml
@@ -1,4 +1,4 @@
-<idea-plugin url="https://www.jetbrains.com/idea">
+<idea-plugin>
     <extensions defaultExtensionNs="de.espend.idea.php.annotation">
         <PhpAnnotationReferenceProvider implementation="fr.adrienbrault.idea.symfony2plugin.twig.annotation.TemplateAnnotationReferences"/>
         <PhpAnnotationReferenceProvider implementation="fr.adrienbrault.idea.symfony2plugin.doctrine.DoctrineAnnotationTargetEntityReferences"/>
diff --git a/src/main/resources/META-INF/deployment-aware.xml b/src/main/resources/META-INF/deployment-aware.xml
@@ -1,4 +1,4 @@
-<idea-plugin url="https://www.jetbrains.com/idea">
+<idea-plugin>
     <actions>
 
         <action id="SymfonyWebDeploymentDownload"
diff --git a/src/main/resources/META-INF/dql.xml b/src/main/resources/META-INF/dql.xml
@@ -1,2 +1,2 @@
-<idea-plugin url="https://www.jetbrains.com/idea">
+<idea-plugin>
 </idea-plugin>
diff --git a/src/main/resources/META-INF/pay.xml b/src/main/resources/META-INF/pay.xml
@@ -1,5 +1,5 @@
 <!-- All feature that are only available via valid plugin license (paid) -->
-<idea-plugin url="https://www.jetbrains.com/idea">
+<idea-plugin>
 
     <extensionPoints>
         <extensionPoint dynamic="true" name="extension.PluginConfigurationExtension" interface="fr.adrienbrault.idea.symfony2plugin.extension.PluginConfigurationExtension"/>
diff --git a/src/main/resources/META-INF/toolbox.xml b/src/main/resources/META-INF/toolbox.xml
@@ -1,4 +1,4 @@
-<idea-plugin url="https://www.jetbrains.com/idea">
+<idea-plugin>
     <extensions defaultExtensionNs="de.espend.idea.php.toolbox.extension">
         <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.ServiceToolboxProvider"/>
         <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.RoutesToolboxProvider"/>
diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java
@@ -26,7 +26,6 @@
 import com.intellij.patterns.ElementPattern;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -802,8 +801,7 @@ protected void completionFinished(final CompletionProgressIndicator indicator, b
                     }
                 };
 
-                Editor editor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(getEditor(), getFile());
-                handler.invokeCompletion(getProject(), editor);
+                handler.invokeCompletion(getProject(), getEditor());
                 PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
             }, null, null);
         }
diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/navigation/TwigBlockSymbolContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/navigation/TwigBlockSymbolContributorTest.java
@@ -1,9 +1,13 @@
 package fr.adrienbrault.idea.symfony2plugin.tests.navigation;
 
+import com.intellij.navigation.NavigationItem;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.util.indexing.FindSymbolParameters;
 import fr.adrienbrault.idea.symfony2plugin.navigation.TwigBlockSymbolContributor;
 import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
 
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
@@ -25,8 +29,11 @@ protected String getTestDataPath() {
     public void testThatBlockNamesAreProvidedForSearch() {
         TwigBlockSymbolContributor contributor = new TwigBlockSymbolContributor();
 
+        List<String> names = new ArrayList<>();
+        contributor.processNames(names::add, GlobalSearchScope.allScope(getProject()), null);
+
         assertContainsElements(
-            Arrays.asList(contributor.getNames(getProject(), false)),
+            names,
             "my_support_block_name",
             "my_support_block_name_2"
         );
@@ -35,12 +42,22 @@ public void testThatBlockNamesAreProvidedForSearch() {
     public void testThatBlockNavigationIsProvidedForSearch() {
         TwigBlockSymbolContributor contributor = new TwigBlockSymbolContributor();
 
-        assertTrue(Arrays.stream(contributor.getItemsByName("my_support_block_name", "?", getProject(), false))
-            .anyMatch(navigationItem -> "my_support_block_name".equals(navigationItem.getName())));
-
-        assertTrue(Arrays.stream(contributor.getItemsByName("my_support_block_name_2", "?", getProject(), false))
-            .anyMatch(navigationItem -> "my_support_block_name_2".equals(navigationItem.getName())));
-
-        assertSize(0, contributor.getItemsByName("UNKNOWN_BLOCK", "?", getProject(), false));
+        // Test for "my_support_block_name"
+        List<NavigationItem> items1 = new ArrayList<>();
+        FindSymbolParameters params1 = FindSymbolParameters.simple(getProject(), false);
+        contributor.processElementsWithName("my_support_block_name", items1::add, params1);
+        assertTrue(items1.stream().anyMatch(item -> "my_support_block_name".equals(item.getName())));
+
+        // Test for "my_support_block_name_2"
+        List<NavigationItem> items2 = new ArrayList<>();
+        FindSymbolParameters params2 = FindSymbolParameters.simple(getProject(), false);
+        contributor.processElementsWithName("my_support_block_name_2", items2::add, params2);
+        assertTrue(items2.stream().anyMatch(item -> "my_support_block_name_2".equals(item.getName())));
+
+        // Test for unknown block
+        List<NavigationItem> items3 = new ArrayList<>();
+        FindSymbolParameters params3 = FindSymbolParameters.simple(getProject(), false);
+        contributor.processElementsWithName("UNKNOWN_BLOCK", items3::add, params3);
+        assertSize(0, items3);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -178,10 +178,6 @@ public void reset() {`
`178`	`178`	`updateUIFromSettings();`
`179`	`179`	`}`
`180`	`180`
`181`		`- @Override`
`182`		`- public void disposeUIResources() {`
`183`		`- }`
`184`		`-`
`185`	`181`	`private Settings getSettings() {`
`186`	`182`	`return Settings.getInstance(project);`
`187`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,6 @@ public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull Ps`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- @Override`
`44`		`- public boolean startInWriteAction() {`
`45`		`- return true;`
`46`		`- }`
`47`	`43`	`}`
`48`	`44`
`49`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,11 +164,6 @@ public Collection<LookupElement> getLookupElements() {`
`164`	`164`	`return lookupElements;`
`165`	`165`	`}`
`166`	`166`
`167`		`- @NotNull`
`168`		`- @Override`
`169`		`- public Collection<PsiElement> getPsiTargets(PsiElement element) {`
`170`		`- return Collections.emptyList();`
`171`		`- }`
`172`	`167`	`}`
`173`	`168`
`174`	`169`	`private boolean isTableNameRegistrar(PsiElement context) {`