Merge branch '3.0.0-develop' into add_template_desc_to_regular_class

Author: coderimus

.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

testData/inspections/xml/ObserverDeclarationInspection/observerNameUsedInDifferentFile/events.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config>
+    <event name="test_event_in_test_class">
+        <observer name="test_observer" instance="Magento\Catalog\Observer\TestObserver" />
+    </event>
+</config>

testData/inspections/xml/ObserverDeclarationInspection/observerNameUsedInSameFile/events.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config>
+    <event name="some_random_event">
+        <observer name="observer_one" instance="Vendor\Module\Observer\Class" />
+        <observer name="observer_two" instance="Vendor\Module\Observer\Class" />
+    </event>
+</config>

tests/com/magento/idea/magento2plugin/inspections/xml/ObserverDeclarationInspectionTest.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.inspections.xml;
+
+import com.magento.idea.magento2plugin.magento.files.ModuleEventsXml;
+
+@SuppressWarnings({"PMD.JUnitTestsShouldIncludeAssert"})
+public class ObserverDeclarationInspectionTest extends InspectionXmlFixtureTestCase {
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        myFixture.enableInspections(ObserverDeclarationInspection.class);
+    }
+
+    /**
+     * Tests for duplicate observer name inspection warning in the same events.xml
+     */
+    public void testObserverNameUsedInSameFile() {
+        myFixture.configureByFile(getFixturePath(ModuleEventsXml.FILE_NAME));
+        myFixture.testHighlighting(true, false, false);
+    }
+
+    /**
+     * Tests for duplicate observer name inspection warning in a different events.xml
+     */
+    public void testObserverNameUsedInDifferentFile() {
+        myFixture.configureByFile(getFixturePath(ModuleEventsXml.FILE_NAME));
+        myFixture.testHighlighting(true, false, false);
+    }
+}