Skip to content

Commit e7814a0

Browse files
author
Vitaliy Boyko
committed
Merge branch '2.1.0-develop' of github.com:magento/magento2-phpstorm-plugin into 2.0.2->2.1.0-forwardport
� Conflicts: � .github/workflows/gradle.yml � build.gradle � resources/META-INF/plugin.xml � src/com/magento/idea/magento2plugin/linemarker/php/PluginTargetLineMarkerProvider.java
2 parents 8befae3 + 553e14e commit e7814a0

File tree

127 files changed

+3131
-2754
lines changed

Some content is hidden

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

127 files changed

+3131
-2754
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ If applicable, add screenshots to help explain your problem.
3939

4040
**Please complete the following information:** (*)
4141

42-
- OS: [e.g. iOS]
43-
- PhpStorm/Intellij version [e.g. 2019.3.3]
44-
- Version [e.g. 1.0.0]
42+
- OS: [e.g. MacOS or Ubuntu Linux 20.04]
43+
- PhpStorm/Intellij version: [e.g. 2019.3.3]
44+
- Plugin Version: [e.g. 1.0.0]
4545

4646
**Additional context**
4747

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
If relevant, please provide a list of fixed issues in the format magento/magento2-phpstorm-plugin#<issue_number>.
2121
There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
2222
-->
23-
1. magento/magento2-phpstorm-plugin#<issue_number>: Issue title
23+
1. Fixes magento/magento2-phpstorm-plugin#<issue_number>
2424

2525
**Questions or comments**
2626
<!---

‎.github/workflows/gradle.yml‎

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ name: Run automated tests
55

66
on:
77
pull_request:
8-
branches: [ master, 2.0.0-develop, 2.0.2-develop ]
8+
branches: [ master, 2.1.0-develop ]
99

1010
jobs:
1111
build-linux:
12-
1312
runs-on: ubuntu-latest
1413

1514
steps:
@@ -18,6 +17,14 @@ jobs:
1817
uses: actions/setup-java@v1
1918
with:
2019
java-version: 1.8
20+
- uses: actions/cache@v2
21+
with:
22+
path: |
23+
~/.gradle/caches
24+
~/.gradle/wrapper
25+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
26+
restore-keys: |
27+
${{ runner.os }}-gradle-
2128
- name: Gradle wrapper
2229
run: gradle wrapper
2330
- name: Grant execute permission for gradlew
@@ -26,7 +33,6 @@ jobs:
2633
run: ./gradlew test -i --no-daemon
2734

2835
build-windows:
29-
3036
runs-on: windows-latest
3137

3238
steps:
@@ -35,6 +41,14 @@ jobs:
3541
uses: actions/setup-java@v1
3642
with:
3743
java-version: 1.8
44+
- uses: actions/cache@v2
45+
with:
46+
path: |
47+
~/.gradle/caches
48+
~/.gradle/wrapper
49+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
50+
restore-keys: |
51+
${{ runner.os }}-gradle-
3852
- name: Gradle wrapper
3953
run: gradle wrapper
4054
- name: Grant execute permission for gradlew
@@ -43,7 +57,6 @@ jobs:
4357
run: ./gradlew test -i --no-daemon
4458

4559
build-macos:
46-
4760
runs-on: macos-latest
4861

4962
steps:
@@ -52,6 +65,14 @@ jobs:
5265
uses: actions/setup-java@v1
5366
with:
5467
java-version: 1.8
68+
- uses: actions/cache@v2
69+
with:
70+
path: |
71+
~/.gradle/caches
72+
~/.gradle/wrapper
73+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
74+
restore-keys: |
75+
${{ runner.os }}-gradle-
5576
- name: Gradle wrapper
5677
run: gradle wrapper
5778
- name: Grant execute permission for gradlew
@@ -60,7 +81,6 @@ jobs:
6081
run: ./gradlew test -i --no-daemon
6182

6283
static-tests:
63-
6484
runs-on: ubuntu-latest
6585

6686
steps:
@@ -69,6 +89,14 @@ jobs:
6989
uses: actions/setup-java@v1
7090
with:
7191
java-version: 1.8
92+
- uses: actions/cache@v2
93+
with:
94+
path: |
95+
~/.gradle/caches
96+
~/.gradle/wrapper
97+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
98+
restore-keys: |
99+
${{ runner.os }}-gradle-
72100
- name: Gradle wrapper
73101
run: gradle wrapper
74102
- name: Grant execute permission for gradlew

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repositories {
1515
}
1616

1717
group 'com.magento.idea'
18-
version '2.0.2'
18+
version '2.1.0'
1919

2020
apply plugin: 'org.jetbrains.intellij'
2121
apply plugin: 'java'

‎resources/META-INF/plugin.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<idea-plugin>
88
<id>com.magento.idea.magento2plugin</id>
99
<name>Magento PhpStorm</name>
10-
<version>2.0.2</version>
10+
<version>2.1.0</version>
1111
<vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
1212

1313
<description><![CDATA[
@@ -125,6 +125,8 @@
125125
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.js.MagentoLibJsIndex" />
126126
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.AclResourceIndex" />
127127
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.MenuIndex" />
128+
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.DeclarativeSchemaElementsIndex" />
129+
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.UIComponentIndex" />
128130

129131
<codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.PluginLineMarkerProvider"/>
130132
<codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.PluginTargetLineMarkerProvider"/>

‎resources/fileTemplates/internal/Magento Module Layout Xml.xml.html‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!--
2+
/*
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
-->
7+
<html>
8+
<body>
9+
<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
10+
<tr>
11+
<td><font face="verdana" size="-1">Magento layout can be used for customizing a specific page or group of pages
12+
in frontend or admin area of Magento 2. The common customization tasks include changing page layout, adding
13+
new magento blocks, removing magento blocks etc. For more information refer
14+
<a href="https://devdocs.magento.com/guides/v2.4/frontend-dev-guide/layouts/layout-overview.html">
15+
layout overview docs
16+
</a>
17+
</font><br>
18+
</td>
19+
</tr>
20+
</table>
21+
</body>
22+
</html>

‎resources/fileTemplates/internal/Magento Php Preference Class.php.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Read more About the preferences in the <a href="https://devdocs.magento.com/guides/v2.3/extension-dev-guide/build/di-xml-file.html#abstraction-implementation-mappings">DevDocs</a>.
2121
</font><br>
2222
</td>
23-
</tr
23+
</tr>
2424
</table>
2525
<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
2626
<tr>

‎resources/fileTemplates/internal/Magento Routes Xml.xml.html‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<!--
2+
/*
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
-->
7+
<html>
8+
<body>
9+
<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
10+
<tr>
11+
<td><font face="verdana" size="-1">
12+
The routes.xml file maps which module to use for a URL with a specific frontName and area.
13+
The location of the routes.xml file in a module, either etc/frontend or etc/adminhtml, specifies where those routes are active.
14+
</font><br>
15+
</td>
16+
</tr>
17+
<tr>
18+
<td><font face="verdana" size="-1">
19+
Read more About the routes.xml in the
20+
<a href="https://devdocs.magento.com/guides/v2.4/extension-dev-guide/routing.html#routesxml">
21+
DevDocs</a>.
22+
</font><br>
23+
</td>
24+
</tr>
25+
</table>
26+
<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
27+
<tr>
28+
<td colspan="3"><font face="verdana" size="-1">Predefined variables explanation:</font></td>
29+
</tr>
30+
<tr>
31+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${ROUTER_ID}</b></font></nobr></td>
32+
<td width="10">&nbsp;</td>
33+
<td width="100%" valign="top"><font face="verdana" size="-1">specifies the name of the router in Magento.
34+
See the reference tables in the
35+
<a href="https://devdocs.magento.com/guides/v2.4/extension-dev-guide/routing.html#router-class">
36+
Router class section
37+
</a>.
38+
</font>
39+
</td>
40+
</tr>
41+
</table>
42+
</body>
43+
</html>

‎resources/magento2/common.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ common.httpMethod=HTTP Method
88
common.controller.name=Controller Name
99
common.controller.inheritAction=Inherit Action Class
1010
common.controller.backend.acl=Admin Resource ACL
11-
common.controller.action=Controller Action
11+
common.controller.action=Action Name
1212
common.ok=OK
1313
common.yes=Yes
1414
common.no=No
@@ -23,6 +23,7 @@ common.theme.target=Target Theme
2323
common.area.target=Target Area
2424
common.name=Name
2525
common.className=Class Name
26+
common.pluginName=Plugin Name
2627
common.directoryPath=Directory Path
2728
common.methodType=Method Type
2829
common.sortOrder=Sort Order
@@ -41,7 +42,6 @@ common.license.proprietary=Proprietary
4142
common.description=Description
4243
common.parentDirectory=Parent Directory
4344
common.cliCommandName=Command Name
44-
common.cli.create.new.cli.command.title=Create a new Magento 2 CLI Command
4545
common.cli.generate.error=New CLI Command Generation Error
4646
common.cli.class.title=CLI Command Class
4747
common.validationErrorTitle=Validation Error

‎resources/magento2/validation.properties‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
validator.notEmpty=The {0} field must not be empty
2+
validator.box.notEmpty=The {0} field must contain a valid selection from the dropdown
23
validator.package.validPath=Please specify a valid Magento 2 installation path
3-
validator.alphaNumericCharacters={0} must contain letters and numbers only
4+
validator.alphaNumericCharacters=The {0} field must contain letters and numbers only
45
validator.alphaNumericAndUnderscoreCharacters={0} must contain letters, numbers and underscores only
5-
validator.alreadyDeclared={0} is already declared in the {1} module.
6-
validator.startWithNumberOrCapitalLetter={0} must start from a number or a capital letter
7-
validator.onlyNumbers={0} must contain numbers only
6+
validator.alreadyDeclared={0} is already declared in the {1} module
7+
validator.startWithNumberOrCapitalLetter=The {0} field must start with a number or a capital letter
8+
validator.onlyNumbers=The {0} field must contain numbers only
89
validator.mustNotBeNegative={0} must not be negative
9-
validator.identifier={0} must contain letters, numbers, dashes, and underscores only
10-
validator.class.isNotValid={0} is not valid class name
10+
validator.identifier=The {0} field must contain letters, numbers, dashes, and underscores only
11+
validator.class.isNotValid=The {0} field does not contain a valid class name
1112
validator.class.shouldBeUnique=Duplicated class {0}
12-
validator.namespace.isNotValid={0} is not valid namespace name
13-
validator.directory.isNotValid={0} is not valid
13+
validator.namespace.isNotValid=The {0} field does not contain a valid namespace
14+
validator.directory.isNotValid=The {0} field does not contain a valid directory
15+
validator.directory.php.isNotValid=The {0} field does not contain a valid PHP directory
16+
validator.command.isNotValid=The {0} field does not contain a valid Magento 2 CLI command
1417
validator.module.noSuchModule=No such module {0}
1518
validator.file.alreadyExists={0} already exists
1619
validator.file.cantBeCreated={0} can't be created
@@ -19,8 +22,8 @@ validator.file.noDocumentAssociations={0} file is binary or has no document asso
1922
validator.class.alreadyDeclared={0} already declared in the target module
2023
validator.magentoVersionInvalid=Please specify valid Magento version or use 'any' keyword as default
2124
validator.class.targetClassNotFound=Target class is not found. Check the di.xml file
22-
validator.cronSchedule.invalidExpression={0} has invalid cron schedule expression (e.g. * * * * *)
23-
validator.configPath.invalidFormat={0} has invalid config path format (e.g. section/group/field)
25+
validator.cronSchedule.invalidExpression=The {0} field has does not contain a valid cron schedule expression (e.g. * * * * *)
26+
validator.configPath.invalidFormat=The {0} field has does not contain a valid config path format (e.g. section/group/field)
2427
validator.moduleNameIsTheSameAsPackage=Module name must be different from the package name
2528
validator.mustNotBeEmptyShouldContainLettersOrNumbers=Must not be empty, should contain letters or numbers
2629
validator.magentoRouteIdInvalid=The route id is invalid

0 commit comments

Comments
 (0)