Merge branch '2.1.0-develop' into cleanup-01

Author: Vitaliy

testData/linemarker/php/PluginLinemarkerRegistrar/classWithPluginShouldHaveLinemarker/PluginClass.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Theme\Block;
+
+class PluginClass
+{
+    public function someMethod()
+    {
+    }
+}

testData/linemarker/php/PluginLinemarkerRegistrar/classWithoutPluginShouldNotHaveLinemarker/RegularClass.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model;
+
+class RegularClass
+{
+    public function someMethod()
+    {
+    }
+}

testData/project/magento2/vendor/magento/module-catalog/Plugin/PluginClass.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Plugin;
+
+class PluginClass
+{
+    public function beforeSomeMethod()
+    {
+    }
+}

testData/project/magento2/vendor/magento/module-catalog/etc/di.xml

@@ -1,8 +1,17 @@
 <?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
 <config>
     <type name="Magento\Theme\Block\Html\Topmenu">
         <plugin name="catalogTopmenu" type="Magento\Catalog\Plugin\Block\Topmenu" />
     </type>
+    <type name="Magento\Theme\Block\PluginClass">
+        <plugin name="pluginClass" type="Magento\Catalog\Plugin\PluginClass" />
+    </type>
     <type name="Magento\Framework\Mview\View\StateInterface">
         <plugin name="setStatusForMview"
                 type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\MviewState"/>

tests/com/magento/idea/magento2plugin/linemarker/php/PluginLinemarkerRegistrarTest.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.linemarker.php;
+
+import com.magento.idea.magento2plugin.linemarker.LinemarkerFixtureTestCase;
+
+public class PluginLinemarkerRegistrarTest extends LinemarkerFixtureTestCase {
+
+    /**
+     * Tests linemarker in a class which has plugins.
+     */
+    public void testClassWithPluginShouldHaveLinemarker() {
+        myFixture.configureByFile(this.getFixturePath("PluginClass.php", "php"));
+
+        assertHasLinemarkerWithTooltipAndIcon("Navigate to plugins", "/nodes/plugin.svg");
+    }
+
+    /**
+     * Tests linemarker in a class which does not have plugins.
+     */
+    public void testClassWithoutPluginShouldNotHaveLinemarker() {
+        myFixture.configureByFile(this.getFixturePath("RegularClass.php", "php"));
+
+        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to plugins", "/nodes/plugin.svg");
+    }
+}