Merge branch '2.0.0-develop' of github.com:magento/magento2-phpstorm-plugin into 262-fix-command-namespace

� Conflicts:
�	build.gradle

Author: Vitaliy Boyko

.github/workflows/gradle.yml

@@ -5,7 +5,7 @@ name: Run automated tests
 
 on:
   pull_request:
-    branches: [ master, 1.0.1-develop,  1.0.2-develop ]
+    branches: [ master, 1.0.2-develop,  2.0.0-develop ]
 
 jobs:
   build-linux:

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,16 +14,16 @@ repositories {
 }
 
 group 'com.magento.idea'
-version '1.0.2'
+version '2.0.0'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
 apply plugin: 'groovy'
 
 gradle.startParameter.showStacktrace = org.gradle.api.logging.configuration.ShowStacktrace.ALWAYS_FULL
 
-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
@@ -33,7 +33,16 @@ 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'
+    ]
     updateSinceUntilBuild false
     sameSinceUntilBuild false
     downloadSources !Boolean.valueOf(System.getenv('CI'))

resources/META-INF/plugin.xml

@@ -7,7 +7,7 @@
 <idea-plugin>
     <id>com.magento.idea.magento2plugin</id>
     <name>Magento PhpStorm</name>
-    <version>1.0.2</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,7 @@
     <depends>com.jetbrains.php</depends>
     <depends>JavaScript</depends>
     <depends>com.intellij.modules.platform</depends>
+    <depends>com.intellij.platform.images</depends>
     <depends optional="true" config-file="withJsGraphQl.xml">com.intellij.lang.jsgraphql</depends>
 
     <actions>
@@ -194,6 +195,8 @@
         <internalFileTemplate name="Magento Module Controller Backend Class"/>
         <internalFileTemplate name="Magento Module Controller Frontend Class"/>
         <internalFileTemplate name="Magento Module Cron Groups Xml"/>
+
+        <postStartupActivity implementation="com.magento.idea.magento2plugin.project.startup.CheckIfMagentoPathIsValidActivity"/>
     </extensions>
 
     <extensions defaultExtensionNs="com.jetbrains.php">

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

@@ -116,7 +116,7 @@ public MagentoProjectGeneratorSettings getSettings() {
         final Settings.State state = new Settings.State();
         state.setPluginEnabled(true);
         state.setMftfSupportEnabled(true);
-        state.setDefaultLicenseName(Settings.DEFAULT_LICENSE);
+        state.setDefaultLicenseName(Settings.defaultLicense);
         state.setMagentoPathAndUpdateLastUsed(this.magentoPath.getTextField().getText().trim());
 
         return new MagentoProjectGeneratorSettings(