Merge branch '5.1.0-develop' into 1205-override-module-email-templates-in-the-custom-theme

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

@@ -12,11 +12,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

.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

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ## 5.1.0
 
+### Fixed
+
+- Fixed the parsing of plugin sort order value[#1235](https://github.com/magento/magento2-phpstorm-plugin/pull/1235)
+- Fixed compatibility with 2023.1 [#1214](https://github.com/magento/magento2-phpstorm-plugin/pull/1214)
+
 ## 5.0.1
 
 ### Fixed

README.md

@@ -21,8 +21,8 @@
 
 ## Works with
 
-* PhpStorm >= 2021.2.1
-* JRE >= 11
+* PhpStorm >= 2023.1
+* JRE >= 17
 
 ## Features
 

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'
@@ -23,9 +23,9 @@ 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

@@ -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>

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