Skip to content

Commit b586c89

Browse files
author
Vitaliy
authored
Merge branch '4.0.0-develop' into static-fixes-for-validation-namespace
2 parents b612e3b + 3692f2e commit b586c89

34 files changed

+1330
-24
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
plugins {
7-
id 'org.jetbrains.intellij' version '0.6.5'
7+
id 'org.jetbrains.intellij' version '0.7.2'
88
id 'checkstyle'
99
id 'pmd'
1010
id 'org.jetbrains.changelog' version '0.6.2'

gradle-tasks/checkstyle/checkstyle.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,4 +330,8 @@
330330
</module>
331331
</module>
332332
<module name="SuppressWarningsFilter"/>
333+
<module name="RegexpHeader">
334+
<property name="header" value="^\/\*\n \* Copyright © Magento, Inc."/>
335+
<property name="fileExtensions" value="java"/>
336+
</module>
333337
</module>

resources/META-INF/plugin.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@
9696
<action id="OverrideInTheme.Menu" class="com.magento.idea.magento2plugin.actions.generation.OverrideInThemeAction">
9797
<add-to-group group-id="ProjectViewPopupMenu"/>
9898
</action>
99+
<action id="MagentoCreateAWebApiDeclaration.Menu" class="com.magento.idea.magento2plugin.actions.generation.NewWebApiDeclarationAction">
100+
<add-to-group group-id="EditorPopupMenu"/>
101+
</action>
99102

100103
<action id="CopyMagentoPath"
101104
class="com.magento.idea.magento2plugin.actions.CopyMagentoPath"
@@ -246,6 +249,8 @@
246249
<defaultLiveTemplates file="/liveTemplates/MagentoPWA.xml"/>
247250

248251
<postStartupActivity implementation="com.magento.idea.magento2plugin.project.startup.CheckIfMagentoPathIsValidActivity"/>
252+
253+
<errorHandler implementation="com.magento.idea.magento2plugin.project.diagnostic.DefaultErrorReportSubmitter"/>
249254
</extensions>
250255

251256
<extensions defaultExtensionNs="com.jetbrains.php">
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
**Describe the bug** (*)
2+
3+
${BUG_DESCRIPTION}
4+
5+
```
6+
${STACK_TRACE}
7+
```
8+
9+
**To Reproduce** (*)
10+
11+
Steps to reproduce the behavior:
12+
1. Go to '...'
13+
2. Click on '....'
14+
3. Scroll down to '....'
15+
4. See error
16+
17+
**Expected behavior** (*)
18+
19+
A clear and concise description of what you expected to happen.
20+
21+
**Screenshots**
22+
23+
If applicable, add screenshots to help explain your problem.
24+
25+
**Please complete the following information:** (*)
26+
27+
- OS: [e.g. MacOS or Ubuntu Linux 20.04]
28+
- PhpStorm/Intellij version: [e.g. 2019.3.3]
29+
- Plugin Version: [e.g. 1.0.0]
30+
31+
**Additional context**
32+
33+
Add any other context about the problem here.

resources/fileTemplates/code/GitHub New Bug Issue Body Template.txt.html

Whitespace-only changes.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<route url="/V1/${ROUTE}" method="${METHOD}">
2+
<service class="${SERVICE}" method="${SERVICE_METHOD}"/>
3+
<resources>
4+
<resource ref="${RESOURCE}"/>
5+
</resources>
6+
</route>

resources/fileTemplates/code/Magento Web Api Declaration.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+
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Webapi:etc/webapi.xsd">
4+
</routes>

resources/fileTemplates/internal/Magento Web Api XML.xml.html

Whitespace-only changes.

resources/magento2/common.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,7 @@ common.template.id=Template ID
6868
common.template.label=Template Label
6969
common.template.filename=Template File Name
7070
common.template.subject=Email Subject
71-
common.template.type=Email Type
71+
common.template.type=Email Type
72+
common.diagnostic.reportButtonText=Report Me
73+
common.diagnostic.reportSubmittedTitle=The report is successfully submitted!
74+
common.diagnostic.reportSubmittedMessage=Thank you for submitting your report! We will check it as soon as possible.

0 commit comments

Comments
 (0)