Skip to content

Commit d1837a8

Browse files
Fixed new intellij version compatibility issues
1 parent 1bbc95e commit d1837a8

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
plugins {
7-
id 'org.jetbrains.intellij' version '1.1.4'
7+
id 'org.jetbrains.intellij' version '1.5.3'
88
id 'checkstyle'
99
id 'pmd'
1010
id 'org.jetbrains.changelog' version '1.2.1'
@@ -23,8 +23,8 @@ apply plugin: 'idea'
2323
apply plugin: 'groovy'
2424
apply plugin: 'org.jetbrains.changelog'
2525

26-
def phpPluginVersion = System.getProperty("phpPluginVersion", "212.5080.55")
27-
def ideaVersion = System.getProperty("ideaVersion", "2021.2.1")
26+
def phpPluginVersion = System.getProperty("phpPluginVersion", "222.3739.54")
27+
def ideaVersion = System.getProperty("ideaVersion", "2022.2.1")
2828
def javaVersion = 11
2929

3030
sourceCompatibility = javaVersion
@@ -41,7 +41,7 @@ intellij {
4141
'properties',
4242
'CSS',
4343
'JavaScriptLanguage',
44-
'com.intellij.lang.jsgraphql:3.1.2',
44+
'com.intellij.lang.jsgraphql:3.2.1',
4545
'platform-images',
4646
'copyright'
4747
]

resources/META-INF/plugin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</change-notes>
2525

2626
<!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
27-
<idea-version since-build="212.5080.55"/>
27+
<idea-version since-build="222.3345.118"/>
2828

2929
<!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
3030
on how to target different products -->

src/com/magento/idea/magento2plugin/generation/php/MagentoTemplatesFactory.java

+13-10
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,35 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.generation.php;
67

78
import com.intellij.ide.util.projectWizard.WizardContext;
89
import com.intellij.platform.ProjectTemplate;
910
import com.intellij.platform.ProjectTemplatesFactory;
10-
import com.jetbrains.php.config.generation.PhpEmptyTemplatesFactory;
11+
import com.jetbrains.php.config.generation.PhpEmptyProjectGenerator;
1112
import icons.PhpIcons;
13+
import javax.swing.Icon;
1214
import org.jetbrains.annotations.NotNull;
1315
import org.jetbrains.annotations.Nullable;
14-
import javax.swing.Icon;
1516

1617
public class MagentoTemplatesFactory extends ProjectTemplatesFactory {
17-
public MagentoTemplatesFactory() {
18-
}
1918

20-
@NotNull
21-
public String[] getGroups() {
22-
return new String[]{PhpEmptyTemplatesFactory.PHP_PROJECT_TEMPLATE_GROUP};
19+
@Override
20+
public @NotNull String[] getGroups() {
21+
return new String[]{PhpEmptyProjectGenerator.PHP_PROJECT_TEMPLATE_GROUP};
2322
}
2423

25-
public Icon getGroupIcon(String group) {
24+
@Override
25+
public Icon getGroupIcon(final String group) {
2626
return PhpIcons.Php_icon;
2727
}
2828

29-
@NotNull
30-
public ProjectTemplate[] createTemplates(@Nullable String group, WizardContext context) {
29+
@Override
30+
public @NotNull ProjectTemplate[] createTemplates(
31+
final @Nullable String group,
32+
final @NotNull WizardContext context
33+
) {
3134
return new ProjectTemplate[]{new MagentoModuleGenerator()};
3235
}
3336
}

0 commit comments

Comments
 (0)