Merge pull request #2495 from vitaliyboykocontributor/2490-Remove-usages-of-scheduled-for-removal-API

2490 remove usages of scheduled for removal api

Author: VitaliyBoyko

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
+## 2025.0.1
+
+### Fixed
+
+- Fixed compatibility with PhpStorm/IntelliJ 2025.* [#2495](https://github.com/magento/magento2-phpstorm-plugin/pull/2495)
+
 ## 2025.0.0
 
 ### Added

README.md

@@ -7,11 +7,18 @@
 <!-- Plugin description -->
 # PhpStorm Magento 2 Plugin
 
-This is a PhpStorm IDE plugin for a better Magento 2 development workflow.
-
-## Version 2025.0.0 - Contributors
-
 <table align="center">
+<caption>
+This is a PhpStorm IDE plugin for a better Magento 2 development workflow.
+  </caption>
+  <thead>
+    <tr>
+      <td colspan="3" align="center">
+            Version 2025.0.0 - Contributors
+      </td>
+    </tr>
+  </thead>
+<tbody>
   <tr>
     <td align="center">
       <a href="https://github.com/YevhenZvieriev">
@@ -35,13 +42,36 @@ This is a PhpStorm IDE plugin for a better Magento 2 development workflow.
       </a>
     </td>
   </tr>
+</tbody>
+  <tfoot>
+    <tr>
+      <td colspan="3" align="center">
+        <h3>Support the Project</h3>
+        <p>If you find this plugin helpful and want to support its development, consider buying the contributors a coffee:</p>
+        <a href="https://buymeacoffee.com/vitalii_b">
+          <img src="https://img.shields.io/badge/Buy%20Me%20a%20Coffee-Donate-orange.svg" alt="Buy Me a Coffee">
+        </a>
+         <p>Thank you to our sponsors—your support means everything:</p>
+         <p>Lucas van Staden</p>
+         <p>Ivan Chepurnyi</p>
+      </td>
+    </tr>
+  </tfoot>
 </table>
 
-### Support the Project
-
-If you find this plugin helpful and want to support its development, consider buying the contributors a coffee:
+## Features
 
-[![Buy Me a Coffee](https://img.shields.io/badge/Buy%20Me%20a%20Coffee-Donate-orange.svg)](https://buymeacoffee.com/vitalii_b)
+* Configuration smart completion and references for XML/JavaScript files
+* `Navigate to configuration` reference in scope of class/interface
+* `Go to plugin` reference in scope of class/interface and method
+* `Navigate to Web API configuration` reference in scope of class/interface and method
+* Plugin class methods generation
+* Plugin declaration inspection
+* RequireJS reference navigation and completion
+* MFTF reference navigation and completion
+* GraphQL navigation line markers
+* Code generation
+* Inspections for XML configuration
 
 <!-- Plugin description end -->
 
@@ -63,20 +93,6 @@ If you find this plugin helpful and want to support its development, consider bu
 * PhpStorm >= 2023.1
 * JRE >= 17
 
-## Features
-
-* Configuration smart completion and references for XML/JavaScript files
-* `Navigate to configuration` reference in scope of class/interface
-* `Go to plugin` reference in scope of class/interface and method
-* `Navigate to Web API configuration` reference in scope of class/interface and method
-* Plugin class methods generation
-* Plugin declaration inspection
-* RequireJS reference navigation and completion
-* MFTF reference navigation and completion
-* GraphQL navigation line markers
-* Code generation
-* Inspections for XML configuration
-
 ## Setting up development environment
 
 1. Check out this repository

gradle.properties

@@ -1,9 +1,9 @@
 pluginGroup = com.magento.idea.magento2plugin
 pluginName = Magento PhpStorm
 pluginRepositoryUrl = https://github.com/magento/magento2-phpstorm-plugin
-pluginVersion = 2025.0.0
+pluginVersion = 2025.0.1
 pluginSinceBuild = 233
-pluginUntilBuild = 248.*
+pluginUntilBuild = 258.*
 platformType = PS
 platformVersion = 2024.3
 platformPlugins =

src/main/java/com/magento/idea/magento2plugin/actions/generation/CreateAnObserverAction.java

@@ -17,7 +17,6 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.tree.IElementType;
-import com.intellij.util.SlowOperations;
 import com.jetbrains.php.lang.lexer.PhpTokenTypes;
 import com.jetbrains.php.lang.psi.PhpFile;
 import com.jetbrains.php.lang.psi.elements.Method;
@@ -133,7 +132,7 @@ private boolean checkIsEventDispatchMethod(final MethodReference element) {
         if (elementReference == null) {
             return false;
         }
-        final PsiElement method = SlowOperations.allowSlowOperations(elementReference::resolve);
+        final PsiElement method = elementReference.resolve();
         if (!(method instanceof Method)) {
             return false;
         }

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/AbstractDialog.java

@@ -5,6 +5,7 @@
 
 package com.magento.idea.magento2plugin.actions.generation.dialog;
 
+import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.util.Pair;
 import com.magento.idea.magento2plugin.actions.generation.data.ui.ComboBoxItemData;
 import com.magento.idea.magento2plugin.actions.generation.dialog.prompt.PlaceholderInitializerUtil;
@@ -35,10 +36,13 @@
 /**
  * All code generate dialog should extend this class.
  */
+@SuppressWarnings({
+        "PMD.TooManyMethods"
+})
 public abstract class AbstractDialog extends JDialog {
 
-    protected CommonBundle bundle;
-    protected final ValidatorBundle validatorBundle = new ValidatorBundle();
+    protected transient CommonBundle bundle;
+    protected final transient ValidatorBundle validatorBundle = new ValidatorBundle();
     protected final List<FieldValidationData> fieldsValidationsList;
     private final String errorTitle;
     private JTabbedPane tabbedPane;
@@ -75,12 +79,37 @@ protected void exit() {
         dispose();
     }
 
+    /**
+     * Executes onOK within a WriteAction context.
+     */
+    protected final void executeOnOk() {
+        WriteAction.run(this::onWriteActionOK);
+    }
+
+    /**
+     * This method should contain the core logic for onOk.
+     * Subclasses can override to provide their implementation.
+     * Must be invoked via executeOnOk().
+     */
+    protected abstract void onWriteActionOK();
+
+    /**
+     * Hook executed when the OK button is pressed.
+     */
+    protected final void onOK() {
+        executeOnOk();
+    }
+
     /**
      * Validate all form fields.
      *
      * @return boolean
      */
-    @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.AvoidDeeplyNestedIfStmts"})
+    @SuppressWarnings({
+            "PMD.CyclomaticComplexity",
+            "PMD.AvoidDeeplyNestedIfStmts",
+            "PMD.CognitiveComplexity"
+    })
     protected boolean validateFormFields() {
         boolean dialogHasErrors;
         isValidationErrorShown = dialogHasErrors = false;

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAPluginDialog.java

@@ -170,7 +170,8 @@ private void fillTargetAreaOptions() {
         }
     }
 
-    protected void onOK() {
+    protected void onWriteActionOK() {
+
         if (targetMethod == null) {
             targetMethod = getSelectedTargetMethod();
         }

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java

@@ -149,7 +149,7 @@ private void fillTargetAreaOptions() {
     /**
      * Perform code generation using input data.
      */
-    private void onOK() {
+    protected void onWriteActionOK() {
         if (validateFormFields()) {
             new ObserverClassGenerator(new ObserverFileData(
                     getObserverDirectory(),

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/GatherArrayValuesDialog.java

@@ -114,7 +114,8 @@ public static void open(
     /**
      * Fire process if all fields are valid.
      */
-    private void onOK() {
+    protected void onWriteActionOK() {
+
         if (itemsTable.isEditing()) {
             itemsTable.getCellEditor().stopCellEditing();
         }

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/InjectAViewModelDialog.java

@@ -136,7 +136,8 @@ protected void updateArgumentText() {
         );
     }
 
-    protected void onOK() {
+    protected void onWriteActionOK() {
+
         if (!validateFormFields()) {
             exit();
             return;

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewArgumentInjectionDialog.java

@@ -363,7 +363,8 @@ public static void open(
     /**
      * Fire generation process if all fields are valid.
      */
-    private void onOK() {
+    protected void onWriteActionOK() {
+
         if (validateFormFields()) {
             final DiArgumentData data = getDialogDataObject();