Merge pull request #1182 from bohdan-harniuk/1179-fix-compatibility-issues

Fixed new intellij version compatibility issues

Author: VitaliyBoyko

build.gradle

@@ -4,7 +4,7 @@
  */
 
 plugins {
-    id 'org.jetbrains.intellij' version '1.1.4'
+    id 'org.jetbrains.intellij' version '1.5.3'
     id 'checkstyle'
     id 'pmd'
     id 'org.jetbrains.changelog' version '1.2.1'
@@ -23,8 +23,8 @@ apply plugin: 'idea'
 apply plugin: 'groovy'
 apply plugin: 'org.jetbrains.changelog'
 
-def phpPluginVersion = System.getProperty("phpPluginVersion", "212.5080.55")
-def ideaVersion = System.getProperty("ideaVersion", "2021.2.1")
+def phpPluginVersion = System.getProperty("phpPluginVersion", "222.3739.54")
+def ideaVersion = System.getProperty("ideaVersion", "2022.2.1")
 def javaVersion = 11
 
 sourceCompatibility = javaVersion
@@ -41,7 +41,7 @@ intellij {
             'properties',
             'CSS',
             'JavaScriptLanguage',
-            'com.intellij.lang.jsgraphql:3.1.2',
+            'com.intellij.lang.jsgraphql:3.2.1',
             'platform-images',
             'copyright'
     ]

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="212.5080.55"/>
+    <idea-version since-build="222.3345.118"/>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->

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

@@ -2,32 +2,35 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.generation.php;
 
 import com.intellij.ide.util.projectWizard.WizardContext;
 import com.intellij.platform.ProjectTemplate;
 import com.intellij.platform.ProjectTemplatesFactory;
-import com.jetbrains.php.config.generation.PhpEmptyTemplatesFactory;
+import com.jetbrains.php.config.generation.PhpEmptyProjectGenerator;
 import icons.PhpIcons;
+import javax.swing.Icon;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import javax.swing.Icon;
 
 public class MagentoTemplatesFactory extends ProjectTemplatesFactory {
-    public MagentoTemplatesFactory() {
-    }
 
-    @NotNull
-    public String[] getGroups() {
-        return new String[]{PhpEmptyTemplatesFactory.PHP_PROJECT_TEMPLATE_GROUP};
+    @Override
+    public @NotNull String[] getGroups() {
+        return new String[]{PhpEmptyProjectGenerator.PHP_PROJECT_TEMPLATE_GROUP};
     }
 
-    public Icon getGroupIcon(String group) {
+    @Override
+    public Icon getGroupIcon(final String group) {
         return PhpIcons.Php_icon;
     }
 
-    @NotNull
-    public ProjectTemplate[] createTemplates(@Nullable String group, WizardContext context) {
+    @Override
+    public @NotNull ProjectTemplate[] createTemplates(
+            final @Nullable String group,
+            final @NotNull WizardContext context
+    ) {
         return new ProjectTemplate[]{new MagentoModuleGenerator()};
     }
 }