Skip to content

Commit b9b2aac

Browse files
authored
Merge branch '3.1.0-develop' into 3.0.0-develop
2 parents f78ae1e + 2aa1baf commit b9b2aac

File tree

49 files changed

+1824
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1824
-8
lines changed

.github/workflows/gradlepublish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: Set up JDK 1.8
16+
- name: Set up JDK 11
1717
uses: actions/setup-java@v1
1818
with:
19-
java-version: 1.8
19+
java-version: 11
2020
- name: Gradle wrapper
2121
run: gradle wrapper
2222
- name: Grant execute permission for gradlew

.github/workflows/gradlepublishalpha.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v2
17-
- name: Set up JDK 1.8
17+
- name: Set up JDK 11
1818
uses: actions/setup-java@v1
1919
with:
20-
java-version: 1.8
20+
java-version: 11
2121
- name: Gradle wrapper
2222
run: gradle wrapper
2323
- name: Grant execute permission for gradlew

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
66

77
## 3.1.0
88

9+
## 3.0.1
10+
11+
### Fixed
12+
13+
- Skipped IDEA include tag causing error
14+
- Fixed StringIndexOutOfBoundsException on PluginInspection
15+
916
## 3.0.0
1017

1118
### Added

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ This is a PhpStorm IDE plugin for a better Magento 2 development workflow. It is
1717

1818
## Works with
1919

20-
* PhpStorm >= 2020.1.1
21-
* JRE >= 1.8
20+
* PhpStorm >= 2020.3
21+
* JRE >= 11
2222

2323
## Features
2424

resources/META-INF/plugin.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
1212

1313
<description><![CDATA[
14-
Magento PhpStorm plugin, created to improve life-work balance while working with Magento 2
14+
This is a PhpStorm IDE plugin for a better Magento 2 development workflow.
1515
]]></description>
1616

1717
<change-notes><![CDATA[
@@ -69,6 +69,7 @@
6969
<action id="MagentoCreateUiComponentForm" class="com.magento.idea.magento2plugin.actions.generation.NewUiComponentFormAction" />
7070
<action id="NewModelsAction" class="com.magento.idea.magento2plugin.actions.generation.NewModelsAction" />
7171
<action id="MagentoCreateADataModel" class="com.magento.idea.magento2plugin.actions.generation.NewDataModelAction" />
72+
<action id="MagentoMessageQueue" class="com.magento.idea.magento2plugin.actions.generation.NewMessageQueueAction" />
7273
<add-to-group group-id="NewGroup" anchor="last"/>
7374
</group>
7475

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0"?>
2+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
4+
</config>

resources/fileTemplates/internal/Magento Queue Communication XML.xml.html

Whitespace-only changes.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0"?>
2+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
4+
</config>

resources/fileTemplates/internal/Magento Queue Consumer XML.xml.html

Whitespace-only changes.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0"?>
2+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
4+
</config>

0 commit comments

Comments
 (0)