Merge pull request #380 from magento/2.0.2->2.1.0-forwardport

2.0.2 >2.1.0 forwardport

Author: coderimus

.github/workflows/gradle.yml

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

CHANGELOG.md

@@ -4,6 +4,19 @@ 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). 
 
+## 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
 
 ### Fixed

resources/META-INF/plugin.xml

@@ -187,8 +187,6 @@
                          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"/>
         <internalFileTemplate name="Magento Module Registration Php"/>
         <internalFileTemplate name="Magento Module Xml"/>
@@ -205,20 +203,22 @@
         <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 Custom Data Provider Php"/>
         <internalFileTemplate name="Magento Module UI Component Form Xml"/>
         <internalFileTemplate name="Magento Php Form Button Block Class"/>
         <internalFileTemplate name="Magento Routes Xml"/>
         <internalFileTemplate name="Magento Module Layout Xml"/>
         <internalFileTemplate name="Magento Module ACL XML"/>
 
+        <defaultLiveTemplates file="/liveTemplates/MagentoPWA.xml"/>
+
         <postStartupActivity implementation="com.magento.idea.magento2plugin.project.startup.CheckIfMagentoPathIsValidActivity"/>
     </extensions>
 
     <extensions defaultExtensionNs="com.jetbrains.php">
         <frameworkProjectConfigurableProvider implementation="com.magento.idea.magento2plugin.project.ConfigurableProvider"/>
         <frameworkUsageProvider implementation="com.magento.idea.magento2plugin.project.UsagesProvider"/>
+        <libraryRoot id="phpstorm.meta.php" path="/phpstorm.meta.php/" runtime="false"/>
     </extensions>
 
 </idea-plugin>

resources/liveTemplates/MagentoPWA.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templateSet group="MagentoPWA">
+    <template name="pwac" value="import React from 'react';&#10;import {mergeClasses} from '@magento/venia-ui/lib/classify';&#10;import { shape, string } from 'prop-types';&#10;&#10;import defaultClasses from './$CSS_FILENAME_BASE$.css';&#10;&#10;const $TM_FILENAME_BASE$ = props =&gt; {&#10;    const classes = mergeClasses(defaultClasses, props.classes);&#10;    return (&lt;div className={classes.root}&gt;$END$&lt;/div&gt;);&#10;}&#10;&#10;$TM_FILENAME_BASE$.propTypes = {&#10;  classes: shape({root: string})&#10;};&#10;$TM_FILENAME_BASE$.defaultProps = {};&#10;export default $TM_FILENAME_BASE$;" description="Creates a PWA Studio pure function component" toReformat="true" toShortenFQNames="true">
+        <variable name="CSS_FILENAME_BASE" expression="decapitalize(camelCase(fileNameWithoutExtension()))" defaultValue="" alwaysStopAt="true" />
+        <variable name="TM_FILENAME_BASE" expression="capitalize(camelCase(fileNameWithoutExtension()))" defaultValue="" alwaysStopAt="true" />
+        <context>
+            <option name="JAVA_SCRIPT" value="true" />
+            <option name="TypeScript" value="true" />
+        </context>
+    </template>
+</templateSet>

resources/phpstorm.meta.php/di-autocomplete.php

@@ -0,0 +1,6 @@
+<?php
+
+namespace PHPSTORM_META {
+    override(\Magento\Framework\ObjectManagerInterface::get(0), map(['' => '@']));
+    override(\Magento\Framework\ObjectManagerInterface::create(0), map(['' => '@']));
+}