Merge branch '5.2.0-develop' into 5.1.0-develop

Author: VitaliyBoyko

.github/workflows/gradle.yml

@@ -12,12 +12,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
-      - uses: actions/cache@v2
+          java-version: 17
+          distribution: 'temurin'
+          cache: gradle
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -36,12 +38,14 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
-      - uses: actions/cache@v2
+          java-version: 17
+          distribution: 'temurin'
+          cache: gradle
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -60,12 +64,14 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
-      - uses: actions/cache@v2
+          java-version: 17
+          distribution: 'temurin'
+          cache: gradle
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -84,12 +90,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
-      - uses: actions/cache@v2
+          java-version: 17
+          distribution: 'temurin'
+          cache: gradle
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches

.github/workflows/gradlepublish.yml

@@ -13,10 +13,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'temurin'
+          cache: gradle
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew

.github/workflows/gradlepublishalpha.yml

@@ -13,11 +13,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'temurin'
+          cache: gradle
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew

CHANGELOG.md

@@ -4,6 +4,8 @@ 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).
 
+## 5.2.0
+
 ## 5.1.0
 
 ### Fixed

README.md

@@ -21,8 +21,8 @@
 
 ## Works with
 
-* PhpStorm >= 2021.2.1
-* JRE >= 11
+* PhpStorm >= 2023.1
+* JRE >= 17
 
 ## Features
 
@@ -42,7 +42,7 @@
 
 1. Check out this repository
 1. Open a folder with the project in the IntelliJ Ultimate using the `open` action button.
-1. Make sure that you on the latest develop branch (e.g `5.1.0-develop`)
+1. Make sure that you on the latest develop branch (e.g `5.2.0-develop`)
 1. Right-click on the `build.gradle` file, choose "Import Gradle project" (if this is not exist look for "Build module '<root folder name>'") (you need to have Gradle plugin installed)
 1. Check if the right SDK version is used for the project.
    - Current Java version for the project is **java 11**, so you should additionally download **SDK 11** and choose it in the module settings: `Right click by the project root > Open Module Settings > Project Settings > Project > Project SDK`

build.gradle

@@ -4,7 +4,7 @@
  */
 
 plugins {
-    id 'org.jetbrains.intellij' version '1.11.0'
+    id 'org.jetbrains.intellij' version '1.13.3'
     id 'checkstyle'
     id 'pmd'
     id 'org.jetbrains.changelog' version '2.0.0'
@@ -15,17 +15,17 @@ repositories {
 }
 
 group 'com.magento.idea'
-version '5.1.0'
+version '5.2.0'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'groovy'
 apply plugin: 'org.jetbrains.changelog'
 
-def phpPluginVersion = System.getProperty("phpPluginVersion", "222.3739.45")
-def ideaVersion = System.getProperty("ideaVersion", "2022.2.1")
-def javaVersion = 11
+def phpPluginVersion = System.getProperty("phpPluginVersion", "231.8109.199")
+def ideaVersion = System.getProperty("ideaVersion", "2023.1")
+def javaVersion = 17
 
 sourceCompatibility = javaVersion
 targetCompatibility = javaVersion
@@ -39,9 +39,9 @@ intellij {
             'yaml',
             'java-i18n',
             'properties',
-            'CSS',
-            'JavaScriptLanguage',
-            'com.intellij.lang.jsgraphql:3.2.1',
+            'com.intellij.css',
+            'JavaScript',
+            'com.intellij.lang.jsgraphql:3.4.0',
             'platform-images',
             'copyright'
     ]

gradle-tasks/staticChecks.gradle

@@ -13,26 +13,20 @@ checkstyle {
     toolVersion = "8.31"
     ignoreFailures = false
     maxWarnings = 0
-    configFile rootProject.file("gradle-tasks/checkstyle/checkstyle.xml")
+    configFile rootProject.file("${rootDir}/gradle-tasks/checkstyle/checkstyle.xml")
 }
 
 pmd {
     toolVersion = "6.21.0"
     consoleOutput = true
-    ruleSets = [
-            rootProject.file("gradle-tasks/pmd/ruleset.xml")
-    ]
+    ruleSetFiles = files("${rootDir}/gradle-tasks/pmd/ruleset.xml")
+    ruleSets = []
 }
 
 tasks.withType(Checkstyle) {
     // Specify all files that should be checked
     classpath = files()
     source "${project.rootDir}"
-
-    reports {
-        xml.enabled false
-        html.enabled true
-    }
 }
 
 // Execute Checkstyle on all files
@@ -49,11 +43,6 @@ tasks.withType(Pmd) {
     // Specify all files that should be checked
     classpath = files()
     source "${project.rootDir}"
-
-    reports {
-        xml.enabled false
-        html.enabled true
-    }
 }
 
 // Execute Checkstyle on all files

resources/META-INF/plugin.xml

@@ -7,7 +7,7 @@
 <idea-plugin require-restart="true">
     <id>com.magento.idea.magento2plugin</id>
     <name>Magento PhpStorm</name>
-    <version>5.1.0</version>
+    <version>5.2.0</version>
     <vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
 
     <description><![CDATA[
@@ -24,7 +24,7 @@
     </change-notes>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-    <idea-version since-build="222.3739.54"/>
+    <idea-version since-build="231.8109.175"/>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->
@@ -33,6 +33,7 @@
     -->
     <depends>com.jetbrains.php</depends>
     <depends>JavaScript</depends>
+    <depends>com.intellij.css</depends>
     <depends>com.intellij.modules.platform</depends>
     <depends>com.intellij.platform.images</depends>
     <depends>com.intellij.copyright</depends>

resources/fileTemplates/internal/Magento CLI Command Class.php.html

@@ -12,7 +12,7 @@
             <font face="verdana" size="-1">
                 Magento enables your component to add commands to our Symfony-like command-line interface (CLI).
                 <a href="https://devdocs.magento.com/guides/v2.3/extension-dev-guide/cli-cmds/cli-howto.html">
-                    Read more</a> about Magneto CLI commands.
+                    Read more</a> about Magento CLI commands.
             </font>
         </td>
     </tr>

src/com/magento/idea/magento2plugin/actions/groups/NewEavAttributeGroup.java

@@ -8,8 +8,6 @@
 import com.intellij.ide.actions.NonTrivialActionGroup;
 import com.intellij.openapi.util.IconLoader;
 import com.magento.idea.magento2plugin.MagentoIcons;
-import javax.swing.Icon;
-import org.jetbrains.annotations.NotNull;
 
 public class NewEavAttributeGroup extends NonTrivialActionGroup {
 
@@ -19,12 +17,8 @@ public class NewEavAttributeGroup extends NonTrivialActionGroup {
     public NewEavAttributeGroup() {
         super();
 
-        this.getTemplatePresentation().setIcon(new IconLoader.LazyIcon() {
-            @NotNull
-            @Override
-            protected Icon compute() {
-                return MagentoIcons.MODULE;
-            }
-        });
+        this.getTemplatePresentation().setIcon(
+                IconLoader.createLazy(() -> MagentoIcons.MODULE)
+        );
     }
 }

src/com/magento/idea/magento2plugin/actions/groups/NewModuleFileGroup.java

@@ -9,7 +9,7 @@
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader.LazyIcon;
+import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
 import com.magento.idea.magento2plugin.MagentoIcons;
@@ -18,8 +18,6 @@
 import com.magento.idea.magento2plugin.project.Settings;
 import com.magento.idea.magento2plugin.util.magento.GetMagentoModuleUtil;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import javax.swing.Icon;
-import org.jetbrains.annotations.NotNull;
 
 public class NewModuleFileGroup extends NonTrivialActionGroup {
 
@@ -29,13 +27,9 @@ public class NewModuleFileGroup extends NonTrivialActionGroup {
     public NewModuleFileGroup() {
         super();
 
-        this.getTemplatePresentation().setIcon(new LazyIcon() {
-            @NotNull
-            @Override
-            protected Icon compute() {
-                return MagentoIcons.MODULE;
-            }
-        });
+        this.getTemplatePresentation().setIcon(
+                IconLoader.createLazy(() -> MagentoIcons.MODULE)
+        );
     }
 
     @Override

src/com/magento/idea/magento2plugin/init/ConfigurationManager.java

@@ -184,7 +184,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
     }
 
     private static boolean isInIncludePath(@NotNull VirtualFile fileToCheck, @NotNull Project project) {
-        List<VirtualFile> includePaths = PhpIncludePathManager.getInstance(project).getRoots();
+        List<VirtualFile> includePaths = PhpIncludePathManager.getInstance(project).getAllIncludedRoots();
         Iterator iterator = includePaths.iterator();
 
         VirtualFile file;

tests/com/magento/idea/magento2plugin/linemarker/LinemarkerFixtureTestCase.java

@@ -59,7 +59,6 @@ protected void assertHasNoLinemarkerWithTooltipAndIcon(
                 = "Failed that documents not contains linemarker with the tooltip `%s`";
 
         final List<LineMarkerInfo<?>> lineMarkers = getDocumentLineMarkers();
-        assertNotEmpty(lineMarkers);
         for (final LineMarkerInfo lineMarkerInfo: lineMarkers) {
             final String lineMarkerTooltip = lineMarkerInfo.getLineMarkerTooltip();
             final Icon lineMarkerIcon = lineMarkerInfo.getIcon();

tests/com/magento/idea/magento2plugin/linemarker/graphqls/GraphQlResolverClassLinemarkerRegistrarTest.java

@@ -15,6 +15,6 @@ public class GraphQlResolverClassLinemarkerRegistrarTest extends LinemarkerFixtu
     public void testWithValidSchemaResolver() {
         myFixture.configureByFile(this.getFixturePath("schema.graphqls", "graphqls"));
 
-        assertHasLinemarkerWithTooltipAndIcon("Navigate to class", "nodes/class.svg");
+        assertHasLinemarkerWithTooltipAndIcon("Navigate to class", "Class");
     }
 }