Merge branch '3.0.4-develop' of github.com:magento/magento2-phpstorm-plugin into 3.0.4->3.10-forwardport

� Conflicts:
�	.github/workflows/gradle.yml
�	CHANGELOG.md
�	build.gradle
�	resources/META-INF/plugin.xml

Author: Vitaliy Boyko

Diff for: CHANGELOG.md

@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ## 3.1.0
 
+## 3.0.4
+
+### Fixed
+
+- Overriding the interface that generates invalid php code
+- Overriding a template from the base area
+- Disabled the ability to create a plugin for a class that implements `\Magento\Framework\ObjectManager\NoninterceptableInterface`
+
+### Added
+
+- `NoninterceptableInterface` case warning to the plugin inspection
+
 ## 3.0.3
 
 ### Fixed

Diff for: resources/fileTemplates/internal/Magento Preference Class.php.ft

@@ -9,6 +9,6 @@ namespace ${NAMESPACE};
 use ${USE};
 #end
 
-class ${NAME} #if (${EXTENDS})extends ${EXTENDS}#end {
+#if (${INTERFACE})interface#else class#end ${NAME} #if (${EXTENDS})extends ${EXTENDS}#end {
 
 }

Diff for: resources/magento2/inspection.properties

@@ -8,6 +8,7 @@ inspection.graphql.resolver.fix.title=Select one of the following interface
 inspection.graphql.schema.resolver.fix.family=Create GraphQL Resolver
 inspection.plugin.error.nonPublicMethod=You can't declare a plugin for a not public method.
 inspection.plugin.error.finalClass=You can't declare a plugin for a final class.
+inspection.plugin.error.noninterceptableInterface=You can't declare a plugin for a class that implements Magento\\Framework\\ObjectManager\\NoninterceptableInterface.
 inspection.plugin.error.finalMethod=You can't declare a plugin for a final method.
 inspection.plugin.error.staticMethod=You can't declare a plugin for a static method.
 inspection.plugin.error.constructMethod=You can't declare a plugin for a __construct method.

Diff for: src/com/magento/idea/magento2plugin/actions/generation/CreateAPluginAction.java

@@ -18,15 +18,15 @@
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.actions.generation.dialog.CreateAPluginDialog;
+import com.magento.idea.magento2plugin.inspections.php.util.PhpClassImplementsNoninterceptableInterfaceUtil;
 import com.magento.idea.magento2plugin.project.Settings;
 import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
-import com.magento.idea.magento2plugin.util.magento.plugin.IsPluginAllowedForMethod;
+import com.magento.idea.magento2plugin.util.magento.plugin.IsPluginAllowedForMethodUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class CreateAPluginAction extends DumbAwareAction {
     public static final String ACTION_NAME = "Create a new Plugin for this method";
     public static final String ACTION_DESCRIPTION = "Create a new Magento 2 Plugin";
-    private final IsPluginAllowedForMethod isPluginAllowed;// NOPMD
     private final GetFirstClassOfFile getFirstClassOfFile;
     private Method targetMethod;
     private PhpClass targetClass;
@@ -36,7 +36,6 @@ public class CreateAPluginAction extends DumbAwareAction {
      */
     public CreateAPluginAction() {
         super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
-        this.isPluginAllowed = IsPluginAllowedForMethod.getInstance();
         this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
     }
 
@@ -55,6 +54,7 @@ public void update(final AnActionEvent event) {
             if (phpClass == null
                     || !(psiFile instanceof PhpFile)
                     || phpClass.isFinal()
+                    || PhpClassImplementsNoninterceptableInterfaceUtil.execute(phpClass)
                     || this.targetMethod == null
             ) {
                 this.setStatus(event, false);
@@ -110,13 +110,13 @@ private void fetchTargetMethod(
             return;
         }
         if (element instanceof Method && element.getParent()
-                == phpClass && isPluginAllowed.check((Method) element)) {
+                == phpClass && IsPluginAllowedForMethodUtil.check((Method) element)) {
             this.targetMethod = (Method) element;
             return;
         }
         final PsiElement parent = element.getParent();
         if (parent instanceof Method && parent.getParent()
-                == phpClass && isPluginAllowed.check((Method) parent)) {
+                == phpClass && IsPluginAllowedForMethodUtil.check((Method) parent)) {
             this.targetMethod = (Method) parent;
         }
     }

Diff for: src/com/magento/idea/magento2plugin/actions/generation/OverrideClassByAPreferenceAction.java

@@ -22,6 +22,7 @@
 public class OverrideClassByAPreferenceAction extends DumbAwareAction {
     public static final String ACTION_NAME = "Override this class by a new Preference";
     public static final String ACTION_DESCRIPTION = "Create a new Magento 2 Preference";
+    public static final String INTERFACE_ACTION = "Override this interface by a new Preference";
     private final GetFirstClassOfFile getFirstClassOfFile;
     private PhpClass targetClass;
 
@@ -44,6 +45,9 @@ public void update(final AnActionEvent event) {
             targetClass = phpClass;
             if (psiFile instanceof PhpFile && phpClass != null) {
                 this.setStatus(event, true);
+                if (phpClass.isInterface()) {
+                    event.getPresentation().setText(INTERFACE_ACTION);
+                }
             } else  {
                 this.setStatus(event, false);
             }