Merge branch '2.0.0-develop' of github.com:magento/magento2-phpstorm-plugin into 89-UI-component-form-generation

� Conflicts:
�	resources/META-INF/plugin.xml

Author: Vitaliy Boyko

.github/workflows/gradle.yml

@@ -5,7 +5,7 @@ name: Run automated tests
 
 on:
   pull_request:
-    branches: [ master, 1.0.0-develop, 1.0.1-develop ]
+    branches: [ master, 1.0.2-develop,  2.0.0-develop ]
 
 jobs:
   build-linux:
@@ -74,7 +74,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - id: file_changes
-        uses: trilom/file-changes-action@v1.2.3
+        uses: trilom/file-changes-action@v1.2.4
       - name: Run Code Style Check
         run: ./gradlew checkstyleCI -i --no-daemon
         env:

CHANGELOG.md

@@ -1,3 +1,20 @@
+1.0.1
+============= 
+* Features:
+    * Create a CLI command action
+    * Create a CRON group action
+    * Create a CRON job action
+    * Create a Controller action
+    * Code Inspection: Module declaration inspections in the scope of `module.xml` and `registration.php`
+    * Code Inspection: GraphQL resolver in the scope of a schema file
+* Improvements:
+    * Fixed the positioning of all dialog popups
+    * Adjusted Magento root validation for consider `magento/framework` as a requirement
+    * Adjusted Magento version validation RegExp to support patch versions
+* Fixed bugs:
+    * The `create a plugin action` is accessible from the wrong context
+    * Null pointer exception on the new module group
+
 1.0.0
 ============= 
 * Features:
@@ -108,4 +125,4 @@
 0.0.5
 =============
 * Features:
-    * Added reference support for classes/interfaces in DI configuration
+    * Added reference support for classes/interfaces in DI configuration

README.md

@@ -15,7 +15,7 @@ This is a plugin for Magento 2 development in the PhpStorm IDE. It is available
 6. Check `Enable` and `OK` button.
 
 ## Works with
-* PhpStorm >= 2019.3.3
+* PhpStorm >= 2020.1.1
 * JRE >= 1.8
 
 ## Features

build.gradle

@@ -4,7 +4,7 @@
  */
 
 plugins {
-    id 'org.jetbrains.intellij' version '0.4.15'
+    id 'org.jetbrains.intellij' version '0.4.22'
     id 'checkstyle'
     id 'pmd'
 }
@@ -14,14 +14,14 @@ repositories {
 }
 
 group 'com.magento.idea'
-version '1.0.1'
+version '2.0.0'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
 apply plugin: 'groovy'
 
-def phpPluginVersion = System.getProperty("phpPluginVersion", "193.6494.35")
-def ideaVersion = System.getProperty("ideaVersion", "2019.3.3")
+def phpPluginVersion = System.getProperty("phpPluginVersion", "201.7223.91")
+def ideaVersion = System.getProperty("ideaVersion", "2020.1.1")
 def javaVersion = 1.8
 
 sourceCompatibility = javaVersion
@@ -31,7 +31,17 @@ intellij {
     version ideaVersion
     type 'IU'
     pluginName 'com.magento.idea.magento2plugin'
-    plugins = ["com.jetbrains.php:$phpPluginVersion", 'yaml', 'java-i18n', 'properties', 'CSS', 'JavaScriptLanguage', 'com.intellij.lang.jsgraphql:2.3.0']
+    plugins = [
+            "com.jetbrains.php:$phpPluginVersion",
+            'yaml',
+            'java-i18n',
+            'properties',
+            'CSS',
+            'JavaScriptLanguage',
+            'com.intellij.lang.jsgraphql:2.3.0',
+            'platform-images',
+            'copyright'
+    ]
     updateSinceUntilBuild false
     sameSinceUntilBuild false
     downloadSources !Boolean.valueOf(System.getenv('CI'))

gradle-tasks/checkstyle/checkstyle.xml

@@ -322,5 +322,12 @@
                       default="checkstyle-xpath-suppressions.xml" />
             <property name="optional" value="true"/>
         </module>
+        <module name="SuppressWarningsHolder"/>
+        <module name="SuppressWithNearbyCommentFilter">
+            <property name="commentFormat" value="CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES"/>
+            <property name="checkFormat" value="$1"/>
+            <property name="influenceFormat" value="$2"/>
+        </module>
     </module>
-</module>
+    <module name="SuppressWarningsFilter"/>
+</module>

gradle-tasks/pmd/ruleset.xml

@@ -32,6 +32,7 @@
     <rule ref="category/java/errorprone.xml">
         <exclude name="BeanMembersShouldSerialize"/>
         <exclude name="DataflowAnomalyAnalysis"/>
+        <exclude name="MissingSerialVersionUID"/>
     </rule>
     <exclude-pattern>.*/resources/.*</exclude-pattern>
     <exclude-pattern>.*/testData/.*</exclude-pattern>

resources/META-INF/plugin.xml

@@ -7,7 +7,7 @@
 <idea-plugin>
     <id>com.magento.idea.magento2plugin</id>
     <name>Magento PhpStorm</name>
-    <version>1.0.1</version>
+    <version>2.0.0</version>
     <vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
 
     <description><![CDATA[
@@ -24,7 +24,7 @@
     </change-notes>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-    <idea-version since-build="193.6494.35"/>
+    <idea-version since-build="201.7223.91"/>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->
@@ -34,6 +34,8 @@
     <depends>com.jetbrains.php</depends>
     <depends>JavaScript</depends>
     <depends>com.intellij.modules.platform</depends>
+    <depends>com.intellij.platform.images</depends>
+    <depends>com.intellij.copyright</depends>
     <depends optional="true" config-file="withJsGraphQl.xml">com.intellij.lang.jsgraphql</depends>
 
     <actions>
@@ -59,10 +61,11 @@
             <action id="MagentoCreateABlock" class="com.magento.idea.magento2plugin.actions.generation.NewBlockAction" />
             <action id="MagentoCreateAController" class="com.magento.idea.magento2plugin.actions.generation.NewControllerAction" />
             <action id="MagentoCreateACronjob" class="com.magento.idea.magento2plugin.actions.generation.NewCronjobAction" />
+            <action id="MagentoCreateACronGroup" class="com.magento.idea.magento2plugin.actions.generation.NewCronGroupAction" />
             <action id="MagentoCreateAViewModel" class="com.magento.idea.magento2plugin.actions.generation.NewViewModelAction" />
             <action id="MagentoCreateAGraphQlResolver" class="com.magento.idea.magento2plugin.actions.generation.NewGraphQlResolverAction" />
             <action id="MagentoCreateCLICommand" class="com.magento.idea.magento2plugin.actions.generation.NewCLICommandAction" />
-            <action id="MagentoCreateAController" class="com.magento.idea.magento2plugin.actions.generation.NewUiFormAction" />
+            <action id="MagentoCreateUiComponentGrid" class="com.magento.idea.magento2plugin.actions.generation.NewUiComponentGridAction" />
             <add-to-group group-id="NewGroup" anchor="last"/>
         </group>
 
@@ -80,6 +83,12 @@
         <action id="OverrideClassByAPreference.Menu" class="com.magento.idea.magento2plugin.actions.generation.OverrideClassByAPreferenceAction">
             <add-to-group group-id="EditorPopupMenu"/>
         </action>
+        <action id="InjectAViewModelAction.Menu" class="com.magento.idea.magento2plugin.actions.generation.InjectAViewModelAction">
+            <add-to-group group-id="EditorPopupMenu"/>
+        </action>
+        <action id="OverrideInTheme.Menu" class="com.magento.idea.magento2plugin.actions.generation.OverrideInThemeAction">
+            <add-to-group group-id="ProjectViewPopupMenu"/>
+        </action>
 
     </actions>
 
@@ -113,6 +122,7 @@
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.mftf.TestNameIndex" />
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.js.RequireJsIndex" />
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.js.MagentoLibJsIndex" />
+        <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.AclResourceIndex" />
 
         <codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.PluginLineMarkerProvider"/>
         <codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.PluginTargetLineMarkerProvider"/>
@@ -128,6 +138,14 @@
                          level="ERROR"
                          implementationClass="com.magento.idea.magento2plugin.inspections.php.PluginInspection"/>
 
+        <localInspection language="PHP" groupPath="PHP"
+                         shortName="ModuleDeclarationInRegistrationPhpInspection"
+                         displayName="Inspection for the Module declaration in the `registration.php` file"
+                         groupName="Magento 2"
+                         enabledByDefault="true"
+                         level="ERROR"
+                         implementationClass="com.magento.idea.magento2plugin.inspections.php.ModuleDeclarationInRegistrationPhpInspection"/>
+
         <localInspection language="XML" groupPath="XML"
                          shortName="ObserverDeclarationInspection"
                          displayName="Duplicated Observer Usage in events XML"
@@ -151,6 +169,20 @@
                          enabledByDefault="true" level="WARNING"
                          implementationClass="com.magento.idea.magento2plugin.inspections.xml.CacheableFalseInDefaultLayoutInspection"/>
 
+        <localInspection language="XML" groupPath="XML"
+                         shortName="ModuleDeclarationInModuleXmlInspection"
+                         displayName="Inspection for the Module declaration in the `etc/module.xml` file"
+                         groupName="Magento 2"
+                         enabledByDefault="true" level="ERROR"
+                         implementationClass="com.magento.idea.magento2plugin.inspections.xml.ModuleDeclarationInModuleXmlInspection"/>
+
+        <localInspection language="XML" groupPath="XML"
+                         shortName="AclResourceXmlInspection"
+                         displayName="Inspection for the Title XML required attribute in the `etc/acl.xml` file"
+                         groupName="Magento 2"
+                         enabledByDefault="true" level="ERROR"
+                         implementationClass="com.magento.idea.magento2plugin.inspections.xml.AclResourceXmlInspection"/>
+
         <libraryRoot id=".phpstorm.meta.php" path=".phpstorm.meta.php/" runtime="false"/>
 
         <internalFileTemplate name="Magento Module Composer"/>
@@ -164,9 +196,15 @@
         <internalFileTemplate name="Magento GraphQL Resolver Class"/>
         <internalFileTemplate name="Magento Cronjob Class"/>
         <internalFileTemplate name="Magento Crontab Xml"/>
-        <internalFileTemplate name="Magento CLI Command"/>
+        <internalFileTemplate name="Magento CLI Command Class"/>
         <internalFileTemplate name="Magento Module Controller Backend Class"/>
         <internalFileTemplate name="Magento Module Controller Frontend Class"/>
+        <internalFileTemplate name="Magento Module Cron Groups Xml"/>
+        <internalFileTemplate name="Magento Module UI Component Grid Xml"/>
+        <internalFileTemplate name="Magento Module Ui Grid Collection Data Provider Php"/>
+        <internalFileTemplate name="Magento Module Ui Grid Custom Data Provider Php"/>
+
+        <postStartupActivity implementation="com.magento.idea.magento2plugin.project.startup.CheckIfMagentoPathIsValidActivity"/>
     </extensions>
 
     <extensions defaultExtensionNs="com.jetbrains.php">

resources/META-INF/pluginIcon.svg

@@ -0,0 +1,17 @@
+<!--
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<html>
+<body>
+<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
+    <tr>
+        <td>
+            <font face="verdana" size="-1">Constructor arguments. The object manager injects these arguments into the class during creation. The name of the argument configured in the XML file must correspond to the name of the parameter in the constructor in the configured class.</font>
+        </td>
+    </tr>
+</table>
+</body>
+</html>