Merge branch '1.0.1-develop' into issue-57-controller-generation

Author: Sergiy Zhovnir

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!---
+    Thank you for contributing to Magento.
+    To help us process this issue we recommend that you add the following information:
+     - Summary of the issue,
+     - Information on your environment,
+     - Steps to reproduce,
+     - Expected and actual results,
+    Fields marked with (*) are required. Please don't remove the template.
+-->
+
+**Describe the bug** (*) 
+
+A clear and concise description of what the bug is.
+
+**To Reproduce** (*) 
+
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior** (*) 
+
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+
+If applicable, add screenshots to help explain your problem.
+
+**Please complete the following information:** (*) 
+
+ - OS: [e.g. iOS]
+ - PhpStorm/Intellij version [e.g. 2019.3.3]
+ - Version [e.g. 1.0.0]
+
+**Additional context**
+
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!---
+    Thank you for contributing to Magento.
+    To help us process this issue we recommend that you add the following information:
+     - Summary of the issue,
+     - Expected and actual results,
+    Fields marked with (*) are required. Please don't remove the template.
+-->
+
+**Is your feature request related to a problem? Please describe.**
+
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like** (*)
+
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -9,26 +9,27 @@
 
 <!--- Please provide a general summary of the Pull Request in the Title above -->
 
-### Description (*)
+**Description** (*)
 <!---
     Please provide a description of the changes proposed in the pull request.
     Letting us know what has changed and why it needed changing will help us validate this pull request.
 -->
 
-### Fixed Issues (if relevant)
+**Fixed Issues (if relevant)**
 <!---
     If relevant, please provide a list of fixed issues in the format magento/magento2-phpstorm-plugin#<issue_number>.
     There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
 -->
 1. magento/magento2-phpstorm-plugin#<issue_number>: Issue title
 
-### Questions or comments
+**Questions or comments**
 <!---
 	If relevant, here you can ask questions or provide comments on your pull request for the reviewer
 	For example if you need assistance with writing tests or would like some feedback on one of your development ideas
 -->
 
-### Contribution checklist (*)
+**Contribution checklist** (*)
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
-
+ - [ ] All new or changed code is covered with integration/functional tests (if applicable)
+ - [ ] All automated tests passed successfully (all builds are green)

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,28 @@
+# This workflow will build a package using Gradle and then publish it to JetBrains repository when a release is created
+
+name: Publish Plugin
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Gradle wrapper
+        run: gradle wrapper
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Run publish plugin
+        run: ./gradlew publishPlugin -i
+        env:
+          MAGENTO_PHPSTORM_intellijPublishToken: ${{ secrets.JET_BRAINS_TOKEN }}
+          MAGENTO_PHPSTORM_isAlpha: false

.github/workflows/gradlepublish.yml

@@ -0,0 +1,29 @@
+# This workflow will build a package using Gradle and then publish it to JetBrains alpha repository when a PR is merged to the develop branch
+
+name: Publish Plugin alpha version
+
+on:
+  push:
+    branches:
+      - 1.0.1-develop
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Gradle wrapper
+        run: gradle wrapper
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Run publish plugin
+        run: ./gradlew publishPlugin -i
+        env:
+          MAGENTO_PHPSTORM_intellijPublishToken: ${{ secrets.JET_BRAINS_TOKEN }}
+          MAGENTO_PHPSTORM_isAlpha: true

.github/workflows/gradlepublishalpha.yml

@@ -1,24 +1,27 @@
 1.0.0
 ============= 
 * Features:
-    * "Go to GraphQL schema" line marker in the scope of class/interface and method
-    * "Go to GraphQL resolver class" line marker in the scope of GraphQL schema type arguments
     * RequireJS mapping support (reference navigation, completion)
-    * Plugin class methods generation
-    * Plugin declaration inspection in the scope of a Plugin Class
     * MFTF support MVP (reference navigation, completion)
-    * Fixed support of 2020.* versions of IDE's
+    * Line markers for navigation from a plugin class to a target class
+    * Line markers for navigation from a GraphQl resolver to schema and vice versa
+    * Create a plugin for a class public method
     * Create a New Magento 2 Module action
-    * Code Inspection: Duplicated Observer Usage in events XML
-    * Create a Plugin class for a class public method action
-    * Code Inspection: Warning regarding Cacheable false attribute in default XML
-    * Create a Preference for a class action
     * Create a Block action
-    * Line markers for navigation from a plugin class to a target class
-    * Magento 2 Module Project template on the start up
+    * Create a View Model action
+    * Create a new Magento 2 module as a separate project
     * Create an observer for an event action
-    * Plugin - Target line markers 
-    * GraphQL resolver inspection in the scope of a PHP Class
+    * Create a GraphQL resolver action
+    * Override class by reference action
+    * Plugin class methods generation
+    * Code Inspection: Duplicated plugin Usage in di.xml
+    * Code Inspection: Plugin declaration in the scope of a Plugin Class
+    * Code Inspection: Warning regarding Cacheable false attribute in default XML
+    * Code Inspection: GraphQL resolver in the scope of a PHP Class
+    * Code Inspection: Duplicated Observer Usage in events XML
+    * Moved plugin configuration from `Settings > Preferences > Languages & Frameworks > PHP > Magento` to
+        `Settings > Preferences > Languages & Frameworks > PHP > Frameworks > Magento`
+    * Fixed support of 2020.* versions of IDE's
 
 0.3.0
 ============= 

CHANGELOG.md

@@ -42,3 +42,17 @@ sourceSets {
         resources.srcDir 'testData'
     }
 }
+
+publishPlugin {
+    token = System.getenv("MAGENTO_PHPSTORM_intellijPublishToken")
+    if (Boolean.valueOf(System.getenv("MAGENTO_PHPSTORM_isAlpha"))) {
+        channels 'alpha'
+        version = version + "-alpha-" + getDate()
+    }
+}
+
+static def getDate() {
+    def date = new Date()
+    def formattedDate = date.format('yyyy-MM-dd-HH-mm')
+    return formattedDate
+}

build.gradle

@@ -1,3 +1,10 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.graphql.GraphQlResolverIndex" />
@@ -9,5 +16,11 @@
                          enabledByDefault="true"
                          level="ERROR"
                          implementationClass="com.magento.idea.magento2plugin.inspections.php.GraphQlResolverInspection"/>
+        <localInspection language="GraphQL" groupPath="GraphQL"
+                         shortName="SchemaResolverInspection" displayName="Schema Resolver must implements ResolverInterface"
+                         groupName="Magento 2"
+                         enabledByDefault="true"
+                         level="ERROR"
+                         implementationClass="com.magento.idea.magento2plugin.inspections.graphqls.SchemaResolverInspection"/>
     </extensions>
 </idea-plugin>

resources/META-INF/withJsGraphQl.xml

@@ -42,7 +42,7 @@
             <tr>
                 <td valign="top"><nobr><font face="verdana" size="-2"><b>${CRONJOB_SCHEDULE}</b></font></nobr></td>
                 <td width="10">&nbsp;</td>
-                <td width="100%" valign="top"><font face="verdana" size="-1">The valid fixed cron schedule expression which defines when cronjob is planed to execute</font></td>
+                <td width="100%" valign="top"><font face="verdana" size="-1">The valid fixed cron schedule expression which defines when cronjob is planned to execute</font></td>
             </tr>
             <tr>
                 <td valign="top"><nobr><font face="verdana" size="-2"><b>${CRONJOB_SCHEDULE_CONFIG_PATH}</b></font></nobr></td>