fix upcoming deprecations

Haehnchen · Haehnchen · commit 00390d901d34 · 2025-12-07T16:58:42.000+01:00
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/command/CommandInvokableReturnValueInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/command/CommandInvokableReturnValueInspection.java
@@ -7,10 +7,8 @@
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.jetbrains.php.PhpIndex;
-import com.jetbrains.php.lang.psi.elements.Method;
-import com.jetbrains.php.lang.psi.elements.PhpClass;
-import com.jetbrains.php.lang.psi.elements.PhpReturn;
-import com.jetbrains.php.lang.psi.elements.PhpTypedElement;
+import com.jetbrains.php.lang.psi.PhpPsiUtil;
+import com.jetbrains.php.lang.psi.elements.*;
 import com.jetbrains.php.lang.psi.resolve.types.PhpType;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import org.jetbrains.annotations.NotNull;
@@ -82,8 +80,13 @@ private void visitPhpReturn(@NotNull PhpReturn phpReturn, @NotNull ProblemsHolde
     }
 
     private boolean hasIntReturnType(@NotNull Method method) {
-        PhpType returnType = method.getReturnType() != null ? method.getReturnType().getType() : null;
-        if (returnType == null || returnType.isEmpty()) {
+        PhpReturnType childByCondition = PhpPsiUtil.getChildByCondition(method, PhpReturnType.INSTANCEOF);
+        if (childByCondition == null) {
+            return false;
+        }
+
+        PhpType returnType =  childByCondition.getType();
+        if (returnType.isEmpty()) {
             return false;
         }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/intention/PhpPropertyArgumentIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/intention/PhpPropertyArgumentIntention.java
@@ -15,7 +15,6 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.SlowOperations;
 import com.intellij.util.ThrowableRunnable;
 import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.findUsages.PhpGotoTargetRendererProvider;
@@ -145,16 +144,14 @@ public Component getListCellRendererComponent(JList<? extends String> jList, Str
 
     private static void buildProperty(@NotNull Project project, @NotNull FieldReference fieldReference, @NotNull String classFqn) {
         try {
-            SlowOperations.allowSlowOperations(() -> {
-                PhpClass phpClassScope = PsiTreeUtil.getParentOfType(fieldReference, PhpClass.class);
-                if (phpClassScope == null || !ServiceUtil.isPhpClassAService(phpClassScope)) {
-                    return;
-                }
+            PhpClass phpClassScope = PsiTreeUtil.getParentOfType(fieldReference, PhpClass.class);
+            if (phpClassScope == null || !ServiceUtil.isPhpClassAService(phpClassScope)) {
+                return;
+            }
 
-                WriteCommandAction.writeCommandAction(project)
-                    .withName("Symfony: Add Property Service")
-                    .run((ThrowableRunnable<Throwable>) () -> ServicePropertyInsertUtil.appendPropertyInjection(phpClassScope, fieldReference.getName(), classFqn));
-            });
+            WriteCommandAction.writeCommandAction(project)
+                .withName("Symfony: Add Property Service")
+                .run((ThrowableRunnable<Throwable>) () -> ServicePropertyInsertUtil.appendPropertyInjection(phpClassScope, fieldReference.getName(), classFqn));
         } catch (Throwable ignored) {
         }
     }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java
@@ -21,6 +21,7 @@
 
 import java.io.*;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
@@ -296,8 +297,8 @@ private static String stripHtmlTags(@NotNull String text)
     public static String getProfilerUrlContent(@NotNull String url) {
         URLConnection conn;
         try {
-            conn = new URL(url).openConnection();
-        } catch (IOException e) {
+            conn = URI.create(url).toURL().openConnection();
+        } catch (IOException | IllegalArgumentException e) {
             e.printStackTrace();
             return null;
         }
@@ -426,11 +427,11 @@ public static List<ProfilerRequestInterface> getProfilerRequestCollectorDecorate
     public static String getBaseProfilerUrlFromRequest(@NotNull ProfilerRequestInterface request) {
         URL url = null;
         try {
-            url = new URL(request.getProfilerUrl());
-        } catch (MalformedURLException e) {
+            url = URI.create(request.getProfilerUrl()).toURL();
+        } catch (MalformedURLException | IllegalArgumentException e) {
             try {
-                url = new URL(request.getUrl());
-            } catch (MalformedURLException ignored) {
+                url = URI.create(request.getUrl()).toURL();
+            } catch (MalformedURLException | IllegalArgumentException ignored) {
             }
         }
 
@@ -461,15 +462,15 @@ public static String formatProfilerRow(@NotNull ProfilerRequestInterface profile
         String path = profilerRequest.getUrl();
 
         try {
-            URL url = new URL(profilerRequest.getUrl());
+            URL url = URI.create(profilerRequest.getUrl()).toURL();
             path = url.getPath();
 
             Matcher matcher = Pattern.compile(".*(/app_[\\w]{2,6}.php)/").matcher(path);
             if(matcher.find()){
                 path = "/" + path.substring(matcher.end());
             }
 
-        } catch (MalformedURLException ignored) {
+        } catch (MalformedURLException | IllegalArgumentException ignored) {
         }
 
         return String.format("(%s) %s", statusCode == 0 ? "n/a" : statusCode, StringUtils.abbreviate(path, 35));
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/widget/action/SymfonyProfilerWidgetActions.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/widget/action/SymfonyProfilerWidgetActions.java
@@ -21,7 +21,7 @@
 
 import javax.swing.*;
 import java.awt.*;
-import java.net.URL;
+import java.net.URI;
 import java.util.Collection;
 
 /**
@@ -164,7 +164,7 @@ public void actionPerformed(AnActionEvent event) {
             }
 
             try {
-                desktop.browse(new URL(urlForRequest).toURI());
+                desktop.browse(URI.create(urlForRequest));
             } catch (Exception ignored) {
             }
         }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/webDeployment/RoutingRemoteFileStorage.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/webDeployment/RoutingRemoteFileStorage.java
@@ -13,6 +13,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -38,7 +39,8 @@ public void build(@NotNull Project project, @NotNull Collection<FileObject> file
 
             String content;
             try {
-                content = StreamUtil.readText(file.getContent().getInputStream(), "UTF-8");
+                byte[] bytes = StreamUtil.readBytes(file.getContent().getInputStream());
+                content = new String(bytes, StandardCharsets.UTF_8);
             } catch (IOException e) {
                 continue;
             }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/util/IndexUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/util/IndexUtil.java
@@ -35,8 +35,7 @@ public static void forceReindex() {
         };
 
         for(ID<?,?> id: indexIds) {
-            FileBasedIndex.getInstance().requestRebuild(id);
-            FileBasedIndex.getInstance().scheduleRebuild(id, new Throwable());
+            FileBasedIndex.getInstance().requestRebuild(id, new Throwable());
         }
     }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/webpack/SymfonyWebpackUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/webpack/SymfonyWebpackUtil.java
@@ -25,6 +25,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.function.Consumer;
 
@@ -76,14 +77,15 @@ private static void visitEntryPointJson(@NotNull VirtualFile virtualFile, @NotNu
         String s;
 
         try {
-            s = StreamUtil.readText(virtualFile.getInputStream(), "UTF-8");
+            byte[] bytes = StreamUtil.readBytes(virtualFile.getInputStream());
+            s = new String(bytes, StandardCharsets.UTF_8);
         } catch (IOException e) {
             return;
         }
 
         JsonObject jsonObject;
         try {
-            jsonObject = new JsonParser().parse(s).getAsJsonObject();
+            jsonObject = JsonParser.parseString(s).getAsJsonObject();
         } catch (JsonSyntaxException e) {
             return;
         }
@@ -159,7 +161,8 @@ public void visitElement(@NotNull PsiElement element) {
     private static void visitManifestJson(@NotNull VirtualFile virtualFile, @NotNull Consumer<Pair<String, String>> consumer) {
         JsonElement jsonElement;
         try {
-            String s = StreamUtil.readText(virtualFile.getInputStream(), "UTF-8");
+            byte[] bytes = StreamUtil.readBytes(virtualFile.getInputStream());
+            String s = new String(bytes, StandardCharsets.UTF_8);
             jsonElement = JsonParser.parseString(s);
         } catch (JsonSyntaxException | IOException e) {
             return;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringMap.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringMap.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -90,7 +91,9 @@ private void parse(@NotNull Project project, @NotNull File file) {
     public void parse(@NotNull Project project, @NotNull VirtualFile virtualFile) {
         PsiFile psiFile;
         try {
-            psiFile = PhpPsiElementFactory.createPsiFileFromText(project, StreamUtil.readText(virtualFile.getInputStream(), "UTF-8"));
+            byte[] bytes = StreamUtil.readBytes(virtualFile.getInputStream());
+            String content = new String(bytes, StandardCharsets.UTF_8);
+            psiFile = PhpPsiElementFactory.createPsiFileFromText(project, content);
         } catch (IOException e) {
             return;
         }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/ClassCompletionPanelWrapper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/ClassCompletionPanelWrapper.java
@@ -1,8 +1,8 @@
 package fr.adrienbrault.idea.symfony2plugin.ui.utils;
 
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.editor.event.DocumentAdapter;
 import com.intellij.openapi.editor.event.DocumentEvent;
+import com.intellij.openapi.editor.event.DocumentListener;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.EditorTextField;
@@ -54,17 +54,17 @@ private void init() {
 
         PhpCompletionUtil.installClassCompletion(this.field, null, getDisposable(), null);
 
-        this.field.getDocument().addDocumentListener(new DocumentAdapter() {
+        this.field.getDocument().addDocumentListener(new DocumentListener() {
             @Override
-            public void documentChanged(DocumentEvent e) {
+            public void documentChanged(@NotNull DocumentEvent e) {
                 String text = field.getText();
                 if (StringUtil.isEmpty(text) || StringUtil.endsWith(text, "\\")) {
                     return;
                 }
 
                 addUpdateRequest(250, () -> consumer.consume(field.getText()));
             }
-        });
+        }, getDisposable());
 
         GridBagConstraints gbConstraints = new GridBagConstraints();
         gbConstraints.fill = 1;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java
@@ -1,6 +1,5 @@
 package fr.adrienbrault.idea.symfony2plugin.util.yaml;
 
-import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
@@ -866,19 +865,11 @@ public static PsiElement insertKeyIntoFile(final @NotNull YAMLFile yamlFile, @No
             return null;
         }
 
-        // finally wirte changes
+        // finally write changes
         final YAMLMapping finalChildOfType = childOfType;
-        new WriteCommandAction(yamlFile.getProject()) {
-            @Override
-            protected void run(@NotNull Result result) throws Throwable {
-                finalChildOfType.putKeyValue(next);
-            }
-
-            @Override
-            public String getGroupID() {
-                return "Key insertion";
-            }
-        }.execute();
+        WriteCommandAction.writeCommandAction(yamlFile.getProject())
+            .withName("Key insertion")
+            .run(() -> finalChildOfType.putKeyValue(next));
 
         return childOfType;
     }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`import javax.swing.*;`
`23`	`23`	`import java.awt.*;`
`24`		`-import java.net.URL;`
	`24`	`+import java.net.URI;`
`25`	`25`	`import java.util.Collection;`
`26`	`26`
`27`	`27`	`/**`
`@@ -164,7 +164,7 @@ public void actionPerformed(AnActionEvent event) {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`try {`
`167`		`- desktop.browse(new URL(urlForRequest).toURI());`
	`167`	`+ desktop.browse(URI.create(urlForRequest));`
`168`	`168`	`} catch (Exception ignored) {`
`169`	`169`	`}`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@ public static void forceReindex() {`
`35`	`35`	`};`
`36`	`36`
`37`	`37`	`for(ID<?,?> id: indexIds) {`
`38`		`- FileBasedIndex.getInstance().requestRebuild(id);`
`39`		`- FileBasedIndex.getInstance().scheduleRebuild(id, new Throwable());`
	`38`	`+ FileBasedIndex.getInstance().requestRebuild(id, new Throwable());`
`40`	`39`	`}`
`41`	`40`	`}`
`42`	`41`