Merge branch '2.1.0-develop' into add_template_desc_to_regular_class

Author: coderimus

CHANGELOG.md

@@ -4,6 +4,36 @@ 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.1.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)
+- Code completion and reference navigation for Magento module names in `module.xml` in [#367](https://github.com/magento/magento2-phpstorm-plugin/pull/367)
+- 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

testData/inspections/php/PluginInspection/withWrongCallableType/Plugin.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Plugin\Block;
+
+class Topmenu
+{
+    public function aroundSomeMethod(\Magento\Theme\Block\Html\Topmenu $subject, \Magento\Theme\Block\Html\Topmenu $proceed)
+    {
+    }
+}

testData/inspections/php/PluginInspection/withWrongParameterType/Plugin.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Plugin\Block;
+
+class Topmenu
+{
+    public function aroundSomeMethod(\Magento\Catalog\Block\Navigation $subject, callable $proceed)
+    {
+    }
+}

tests/com/magento/idea/magento2plugin/inspections/php/PluginInspectionTest.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.inspections.php;
+
+import com.jetbrains.php.PhpBundle;
+
+public class PluginInspectionTest extends InspectionPhpFixtureTestCase {
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        myFixture.enableInspections(PluginInspection.class);
+    }
+
+    @Override
+    protected boolean isWriteActionRequired() {
+        return false;
+    }
+
+    /**
+     * Inspection highlights error in parameter type.
+     */
+    public void testWithWrongParameterType() {
+        myFixture.configureByFile(getFixturePath("Plugin.php"));
+
+        final String wrongParameterError =  PhpBundle.message(
+                "inspection.wrong_param_type",
+                "\\Magento\\Catalog\\Block\\Navigation",
+                "\\Magento\\Theme\\Block\\Html\\Topmenu"
+        );
+
+        assertHasHighlighting(wrongParameterError);
+    }
+
+    /**
+     * Inspection highlights error in callable parameter type.
+     */
+    public void testWithWrongCallableType() {
+        myFixture.configureByFile(getFixturePath("Plugin.php"));
+
+        final String wrongParameterError =  PhpBundle.message(
+                "inspection.wrong_param_type",
+                "\\Magento\\Theme\\Block\\Html\\Topmenu",
+                "callable"
+        );
+
+        assertHasHighlighting(wrongParameterError);
+    }
+}