Merge branch '3.2.0-develop' of github.com:magento/magento2-phpstorm-plugin into feature/issue-179

# Conflicts:
#	resources/magento2/common.properties

Author: Serhiy Zhovnir

.github/workflows/gradle.yml

@@ -5,18 +5,18 @@ name: Run automated tests
 
 on:
   pull_request:
-    branches: [ master, 2.0.1-develop, 2.1.0-develop ]
+    branches: [ master, 3.2.0-develop ]
 
 jobs:
   build-linux:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - uses: actions/cache@v2
         with:
           path: |
@@ -37,10 +37,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - uses: actions/cache@v2
         with:
           path: |
@@ -61,10 +61,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - uses: actions/cache@v2
         with:
           path: |
@@ -85,10 +85,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - uses: actions/cache@v2
         with:
           path: |

.github/workflows/gradlepublish.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew

.github/workflows/gradlepublishalpha.yml

@@ -14,10 +14,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew

CHANGELOG.md

@@ -2,7 +2,99 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0). 
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
+
+## 3.2.0
+
+## 3.1.0
+
+### Added
+
+- Extended `.phpstorm.meta.php` for more convenient autocomplete [#467](https://github.com/magento/magento2-phpstorm-plugin/pull/467)
+- Code generation for message queue in [#411](https://github.com/magento/magento2-phpstorm-plugin/pull/411)
+- Code generation for declarative schema [#453](https://github.com/magento/magento2-phpstorm-plugin/pull/453)
+- Inspection warning for disabled observer [#432](https://github.com/magento/magento2-phpstorm-plugin/pull/432)
+- The action item to the context menu to copy file path in the Magento format [#451](https://github.com/magento/magento2-phpstorm-plugin/pull/451)
+
+### Fixed
+
+- The null pointer exception on the Create Module Dialog
+
+## 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
+
+- Fixed model generation with same names
+- Fixed NPTR exception in theme directory view model action
+- Fixed observer name validator
+- Fixed plugin name validator
+
+## 3.0.2
+
+### Fixed
+
+- Fixed the Inject a View Model dialog
+
+## 3.0.1
+
+### Fixed
+
+- Skipped IDEA include tag causing error
+- Fixed StringIndexOutOfBoundsException on PluginInspection
+
+## 3.0.0
+
+### Added
+
+- Description for "Magento Routes XML" code template in [#349](https://github.com/magento/magento2-phpstorm-plugin/pull/349)
+- Code completion and reference navigation for table names and column names in `db_schema.xml` file in [#351](https://github.com/magento/magento2-phpstorm-plugin/pull/351)
+- Code completion and reference navigation for UI Component names in layout XMLs in [#354](https://github.com/magento/magento2-phpstorm-plugin/pull/354)
+- Description for "Magento Layout XML" code template in [#365](https://github.com/magento/magento2-phpstorm-plugin/pull/365)
+- Reference navigation for disabled plugins in `di.xml` in [#373](https://github.com/magento/magento2-phpstorm-plugin/pull/373)
+- Code completion and reference navigation for Magento module names in `config.php` in [#374](https://github.com/magento/magento2-phpstorm-plugin/pull/374)
+- Inspection warning when disabling a nonexistent plugin in `di.xml` in [#382](https://github.com/magento/magento2-phpstorm-plugin/pull/382)
+- Description for "Magento Form Button Block Class" code template in [#383](https://github.com/magento/magento2-phpstorm-plugin/pull/383)
+- Code generation for database models (model, resource model, and collection) in [#392](https://github.com/magento/magento2-phpstorm-plugin/pull/392)
+- Code generation for data models (data interface and its implementation) in [#399](https://github.com/magento/magento2-phpstorm-plugin/pull/399)
+- QuickFix for a missing GraphQL resolver defined in the the `schema.graphqls` file in [#399](https://github.com/magento/magento2-phpstorm-plugin/pull/399)
+
+### Fixed
+
+- Inability to save PhpStorm plugin settings after disabling the plugin with invalid field content in [#317](https://github.com/magento/magento2-phpstorm-plugin/pull/317)
+- Field statuses in PhpStorm plugin settings not disabling if plugin is disabled in [#320](https://github.com/magento/magento2-phpstorm-plugin/pull/320)
+- Missing linemarker for plugins to interface methods in [#328](https://github.com/magento/magento2-phpstorm-plugin/pull/328)
+- Incorrect code completion for MFTF tags (stories, title, and description) in [#364](https://github.com/magento/magento2-phpstorm-plugin/pull/364)
+- Argument name for types in `di.xml` not allowing underscores in [#370](https://github.com/magento/magento2-phpstorm-plugin/pull/370)
+- Incorrect sort order validation in 'Create a New Plugin' code generation dialog in [#389](https://github.com/magento/magento2-phpstorm-plugin/pull/389)
+
+### Changed
+
+- Code generation dialog titles in [#363](https://github.com/magento/magento2-phpstorm-plugin/pull/363)
+
+## 2.0.2
+
+### Added
+
+- PWA pure function Live Template 
+
+### Fixed
+
+- Library root for object manager autocomplete
+- Line marker for interface plugin target
+- Allowed theme override of non-magento composer themes
+- Issue with `Magento Module Ui Grid Collection Data Provider Php`
 
 ## 2.0.1
 

README.md

@@ -1,22 +1,29 @@
+<p align="center">
+    <a href="https://magento.com">
+        <img src="https://static.magento.com/sites/all/themes/magento/logo.svg" width="300px" alt="Magento Commerce" />
+    </a>
+</p>
+
 # PhpStorm Magento 2 Plugin
 
 [![Version](http://phpstorm.espend.de/badge/8024/version)](https://plugins.jetbrains.com/plugin/8024)
 [![Downloads](http://phpstorm.espend.de/badge/8024/downloads)](https://plugins.jetbrains.com/plugin/8024)
-[![Downloads last month](http://phpstorm.espend.de/badge/8024/last-month)](https://plugins.jetbrains.com/plugin/8024)
+![merge-chance-badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fmerge-chance.info%2Fbadge%3Frepo%3Dmagento/magento2-phpstorm-plugin)
+[![Made With Love](https://img.shields.io/badge/Made%20With-Love-orange.svg)](https://magento.com)
 
-This is a plugin for Magento 2 development in the PhpStorm IDE. It is available via the [JetBrains Plugin Repository](https://plugins.jetbrains.com/plugin/8024)
 ## Installation
 
 1. Go to `Settings > Preferences` in the PhpStorm IDE
 2. Navigate to `Plugins`
 3. Click the `Browse repositories...` button and search for "Magento PhpStorm"
 4. Install the plugin and restart PhpStorm
 5. Go to `Settings > Preferences > Languages & Frameworks > PHP > Frameworks > Magento` in the PhpStorm IDE
-6. Check `Enable` and `OK` button.
+6. Check `Enable` and click the `OK` button
 
 ## Works with
-* PhpStorm >= 2020.1.1
-* JRE >= 1.8
+
+* PhpStorm >= 2020.3
+* JRE >= 11
 
 ## Features
 
@@ -37,8 +44,8 @@ This is a plugin for Magento 2 development in the PhpStorm IDE. It is available
 1. Check out this repository
 1. Open a folder with the project in the IntelliJ Ultimate using the `open` action button.
 1. Make sure that you on the latest develop branch (e.g `1.0.0-develop`)
-1. Right-click on the `build.gradle` file, choose "Import Gradle project"
-1. When the Gradle sections appeared in the right bar, navigate there and right-click `magento-2-php-storm-plguin > Tasks -> Intellij -> runIde`
+1. Right-click on the `build.gradle` file, choose "Import Gradle project" (you need to have Gradle plugin installed)
+1. When the Gradle sections appeared in the right bar, navigate there and right-click `magento-2-php-storm-plugin > Tasks -> Intellij -> runIde`
 1. Click `Run "magento-2-php-storm-plugin"` to run the plugin. You should see a new instance of IntelliJ launched with the plugin installed. Make sure the plugin is enabled in IntelliJ settings and indexing is finished. Plugin features should be accessible at this point.
 
 ## How to contribute
@@ -48,11 +55,12 @@ This is a plugin for Magento 2 development in the PhpStorm IDE. It is available
    - **Enhancement** - Know how to improve existing functionality? Open an issue describe how to enhance the plugin.
    - **New feature proposal** - Know how to make a killer feature? Do not hesitate to submit your proposal.
 3) The issue will appear in the `Ready for Grooming` column of the [Community Backlog](https://github.com/magento/magento2-phpstorm-plugin/projects/2). Once it will be discussed and approved the issue will be ready for development.
+4) Refer to the [Contributing Guide](https://github.com/magento/magento2-phpstorm-plugin/blob/2.1.0-develop/.github/CONTRIBUTING.md) for more information on how to contribute.
 
-### <img src="https://upload.wikimedia.org/wikipedia/commons/7/76/Slack_Icon.png" width="20"> Join [#phpstorm-plugin](https://magentocommeng.slack.com/archives/C010C2LUCEA) Slack channel for more details.
-
+### <img src="https://upload.wikimedia.org/wikipedia/commons/7/76/Slack_Icon.png" width="20"> Join the [#phpstorm-plugin](https://magentocommeng.slack.com/archives/C010C2LUCEA) Slack channel to get more involved
 
 ## License
+
 Each Magento source file included in this distribution is licensed under OSL-3.0 license.
 
-Please see [LICENSE.txt](https://github.com/magento/magento2-phpstorm-plugin/blob/master/LICENSE.txt) for the full text of the [Open Software License v. 3.0 (OSL-3.0)](http://opensource.org/licenses/osl-3.0.php).
+Please read the [LICENSE.txt](https://github.com/magento/magento2-phpstorm-plugin/blob/master/LICENSE.txt) for the full text of the [Open Software License v. 3.0 (OSL-3.0)](http://opensource.org/licenses/osl-3.0.php).

build.gradle

@@ -4,7 +4,7 @@
  */
 
 plugins {
-    id 'org.jetbrains.intellij' version '0.4.22'
+    id 'org.jetbrains.intellij' version '0.6.5'
     id 'checkstyle'
     id 'pmd'
     id 'org.jetbrains.changelog' version '0.6.2'
@@ -15,16 +15,17 @@ repositories {
 }
 
 group 'com.magento.idea'
-version '2.1.0'
+version '3.2.0'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
+apply plugin: 'idea'
 apply plugin: 'groovy'
 apply plugin: 'org.jetbrains.changelog'
 
-def phpPluginVersion = System.getProperty("phpPluginVersion", "201.7223.91")
-def ideaVersion = System.getProperty("ideaVersion", "2020.1.1")
-def javaVersion = 1.8
+def phpPluginVersion = System.getProperty("phpPluginVersion", "203.5981.175")
+def ideaVersion = System.getProperty("ideaVersion", "2020.3")
+def javaVersion = 11
 
 sourceCompatibility = javaVersion
 targetCompatibility = javaVersion
@@ -40,7 +41,7 @@ intellij {
             'properties',
             'CSS',
             'JavaScriptLanguage',
-            'com.intellij.lang.jsgraphql:2.3.0',
+            'com.intellij.lang.jsgraphql:2.7.0',
             'platform-images',
             'copyright'
     ]
@@ -91,3 +92,24 @@ changelog {
     unreleasedTerm = "[Unreleased]"
     groups = ["Added", "Changed", "Deprecated", "Removed", "Fixed", "Security"]
 }
+
+idea {
+    project {
+        jdkName         = javaVersion
+        languageLevel   = javaVersion
+    }
+
+    module {
+        generatedSourceDirs += file('gen')
+    }
+}
+
+dependencies {
+    testImplementation 'junit:junit:4.13'
+}
+
+test {
+    useJUnit()
+
+    maxHeapSize = '1G'
+}

gradle-tasks/pmd/ruleset.xml

@@ -37,7 +37,9 @@
     </rule>
     <exclude-pattern>.*/resources/.*</exclude-pattern>
     <exclude-pattern>.*/testData/.*</exclude-pattern>
-    <rule ref="category/java/multithreading.xml"/>
+    <rule ref="category/java/multithreading.xml">
+        <exclude name="UseConcurrentHashMap" />
+    </rule>
     <rule ref="category/java/performance.xml"/>
     <rule ref="category/java/security.xml" />
 </ruleset>