From 5dad074a98203bbc4e7ad9bbde07b0cc7582751f Mon Sep 17 00:00:00 2001 From: vitaliy Date: Thu, 6 Apr 2023 21:02:53 +0300 Subject: [PATCH 1/3] 5.1.0 - additional compatibility fixes --- .github/workflows/gradle.yml | 8 ++++---- .github/workflows/gradlepublish.yml | 2 +- .github/workflows/gradlepublishalpha.yml | 2 +- README.md | 4 ++-- build.gradle | 14 +++++++------- resources/META-INF/plugin.xml | 3 ++- .../actions/groups/NewEavAttributeGroup.java | 12 +++--------- .../actions/groups/NewModuleFileGroup.java | 14 ++++---------- .../magento2plugin/init/ConfigurationManager.java | 2 +- 9 files changed, 25 insertions(+), 36 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index c69d904b4..d98ea4c19 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -16,7 +16,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'temurin' cache: gradle - uses: actions/cache@v3 @@ -42,7 +42,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'temurin' cache: gradle - uses: actions/cache@v3 @@ -68,7 +68,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'temurin' cache: gradle - uses: actions/cache@v3 @@ -94,7 +94,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'temurin' cache: gradle - uses: actions/cache@v3 diff --git a/.github/workflows/gradlepublish.yml b/.github/workflows/gradlepublish.yml index dd3d8b681..7679e5d1e 100644 --- a/.github/workflows/gradlepublish.yml +++ b/.github/workflows/gradlepublish.yml @@ -16,7 +16,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'temurin' cache: gradle - name: Gradle wrapper diff --git a/.github/workflows/gradlepublishalpha.yml b/.github/workflows/gradlepublishalpha.yml index 94a7e37fa..317042e69 100644 --- a/.github/workflows/gradlepublishalpha.yml +++ b/.github/workflows/gradlepublishalpha.yml @@ -17,7 +17,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'temurin' cache: gradle - name: Gradle wrapper diff --git a/README.md b/README.md index 54a7e43a1..2bdb04ce6 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ ## Works with -* PhpStorm >= 2021.2.1 -* JRE >= 11 +* PhpStorm >= 2023.1 +* JRE >= 17 ## Features diff --git a/build.gradle b/build.gradle index 9169cf2d1..c5cd80251 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ */ plugins { - id 'org.jetbrains.intellij' version '1.13.2' + 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' ] diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml index bd6507d20..064234179 100644 --- a/resources/META-INF/plugin.xml +++ b/resources/META-INF/plugin.xml @@ -24,7 +24,7 @@ - + @@ -33,6 +33,7 @@ --> com.jetbrains.php JavaScript + com.intellij.css com.intellij.modules.platform com.intellij.platform.images com.intellij.copyright diff --git a/src/com/magento/idea/magento2plugin/actions/groups/NewEavAttributeGroup.java b/src/com/magento/idea/magento2plugin/actions/groups/NewEavAttributeGroup.java index c057e6c22..c356d1cd3 100644 --- a/src/com/magento/idea/magento2plugin/actions/groups/NewEavAttributeGroup.java +++ b/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) + ); } } diff --git a/src/com/magento/idea/magento2plugin/actions/groups/NewModuleFileGroup.java b/src/com/magento/idea/magento2plugin/actions/groups/NewModuleFileGroup.java index e96f568d0..ac7ab20b8 100644 --- a/src/com/magento/idea/magento2plugin/actions/groups/NewModuleFileGroup.java +++ b/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 diff --git a/src/com/magento/idea/magento2plugin/init/ConfigurationManager.java b/src/com/magento/idea/magento2plugin/init/ConfigurationManager.java index 7f5548015..f28d834a9 100644 --- a/src/com/magento/idea/magento2plugin/init/ConfigurationManager.java +++ b/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 includePaths = PhpIncludePathManager.getInstance(project).getRoots(); + List includePaths = PhpIncludePathManager.getInstance(project).getAllIncludedRoots(); Iterator iterator = includePaths.iterator(); VirtualFile file; From 5450801d9cc84fba7daba2faac5197aa3da36b01 Mon Sep 17 00:00:00 2001 From: vitaliy Date: Thu, 6 Apr 2023 21:05:19 +0300 Subject: [PATCH 2/3] Static fix --- .github/workflows/gradle.yml | 8 ++++---- .github/workflows/gradlepublish.yml | 2 +- .github/workflows/gradlepublishalpha.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d98ea4c19..bf210056a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: java-version: 17 @@ -39,7 +39,7 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: java-version: 17 @@ -65,7 +65,7 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: java-version: 17 @@ -91,7 +91,7 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: java-version: 17 diff --git a/.github/workflows/gradlepublish.yml b/.github/workflows/gradlepublish.yml index 7679e5d1e..9e43f3172 100644 --- a/.github/workflows/gradlepublish.yml +++ b/.github/workflows/gradlepublish.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: java-version: 17 diff --git a/.github/workflows/gradlepublishalpha.yml b/.github/workflows/gradlepublishalpha.yml index 317042e69..3da070f9e 100644 --- a/.github/workflows/gradlepublishalpha.yml +++ b/.github/workflows/gradlepublishalpha.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: java-version: 17 From 24b5f43e9e77ff7c986ad54842984ab38c49555e Mon Sep 17 00:00:00 2001 From: vitaliy Date: Thu, 6 Apr 2023 21:41:09 +0300 Subject: [PATCH 3/3] Fixed tests --- .../magento2plugin/linemarker/LinemarkerFixtureTestCase.java | 1 - .../graphqls/GraphQlResolverClassLinemarkerRegistrarTest.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/com/magento/idea/magento2plugin/linemarker/LinemarkerFixtureTestCase.java b/tests/com/magento/idea/magento2plugin/linemarker/LinemarkerFixtureTestCase.java index 8d292c667..e47e486fc 100644 --- a/tests/com/magento/idea/magento2plugin/linemarker/LinemarkerFixtureTestCase.java +++ b/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> lineMarkers = getDocumentLineMarkers(); - assertNotEmpty(lineMarkers); for (final LineMarkerInfo lineMarkerInfo: lineMarkers) { final String lineMarkerTooltip = lineMarkerInfo.getLineMarkerTooltip(); final Icon lineMarkerIcon = lineMarkerInfo.getIcon(); diff --git a/tests/com/magento/idea/magento2plugin/linemarker/graphqls/GraphQlResolverClassLinemarkerRegistrarTest.java b/tests/com/magento/idea/magento2plugin/linemarker/graphqls/GraphQlResolverClassLinemarkerRegistrarTest.java index 8709da579..ba0bb9048 100644 --- a/tests/com/magento/idea/magento2plugin/linemarker/graphqls/GraphQlResolverClassLinemarkerRegistrarTest.java +++ b/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"); } }