Skip to content

Commit 5b3cc7c

Browse files
author
Vitaliy Boyko
committed
Merge branch '2.1.0-develop' of github.com:magento/magento2-phpstorm-plugin into models-generation
� Conflicts: � resources/META-INF/plugin.xml � src/com/magento/idea/magento2plugin/magento/files/FormButtonBlockPhp.java
2 parents 0b2f495 + 383aa48 commit 5b3cc7c

File tree

99 files changed

+962
-323
lines changed

Some content is hidden

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

99 files changed

+962
-323
lines changed

‎.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Run automated tests
55

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

1010
jobs:
1111
build-linux:

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions

‎README.md

Lines changed: 8 additions & 5 deletions

‎resources/META-INF/plugin.xml

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
<projectService serviceImplementation="com.magento.idea.magento2plugin.project.Settings"/>
102102

103103
<completion.contributor language="XML" implementationClass="com.magento.idea.magento2plugin.completion.xml.XmlCompletionContributor" id="xml" />
104+
<completion.contributor language="PHP" implementationClass="com.magento.idea.magento2plugin.completion.php.PhpCompletionContributor" id="php" />
104105

105106
<psi.referenceContributor language="XML" implementation="com.magento.idea.magento2plugin.reference.xml.XmlReferenceContributor"/>
106107
<psi.referenceContributor language="PHP" implementation="com.magento.idea.magento2plugin.reference.php.PhpReferenceContributor"/>
@@ -188,41 +189,41 @@
188189
enabledByDefault="true" level="ERROR"
189190
implementationClass="com.magento.idea.magento2plugin.inspections.xml.AclResourceXmlInspection"/>
190191

191-
<libraryRoot id=".phpstorm.meta.php" path=".phpstorm.meta.php/" runtime="false"/>
192-
193-
<internalFileTemplate name="Magento Module Composer"/>
194-
<internalFileTemplate name="Magento Module Registration Php"/>
195-
<internalFileTemplate name="Magento Module Xml"/>
196-
<internalFileTemplate name="Magento Module DI Xml"/>
197-
<internalFileTemplate name="Magento Php Preference Class"/>
198-
<internalFileTemplate name="Magento Module Common Php Class"/>
192+
<internalFileTemplate name="Magento Composer JSON"/>
193+
<internalFileTemplate name="Magento Registration PHP"/>
194+
<internalFileTemplate name="Magento Module XML"/>
195+
<internalFileTemplate name="Magento DI XML"/>
196+
<internalFileTemplate name="Magento Preference Class"/>
197+
<internalFileTemplate name="Magento Regular Class"/>
199198
<internalFileTemplate name="Magento Observer Class"/>
200-
<internalFileTemplate name="Magento Module Events Xml"/>
199+
<internalFileTemplate name="Magento Events XML"/>
201200
<internalFileTemplate name="Magento GraphQL Resolver Class"/>
202-
<internalFileTemplate name="Magento Cronjob Class"/>
203-
<internalFileTemplate name="Magento Crontab Xml"/>
201+
<internalFileTemplate name="Magento Cron Job Class"/>
202+
<internalFileTemplate name="Magento Cron Tab XML"/>
204203
<internalFileTemplate name="Magento CLI Command Class"/>
205-
<internalFileTemplate name="Magento Module Controller Backend Class"/>
206-
<internalFileTemplate name="Magento Module Controller Frontend Class"/>
207-
<internalFileTemplate name="Magento Module Cron Groups Xml"/>
208-
<internalFileTemplate name="Magento Module UI Component Grid Xml"/>
209-
<internalFileTemplate name="Magento Module Ui Grid Collection Data Provider Php"/>
210-
<internalFileTemplate name="Magento Module Ui Custom Data Provider Php"/>
211-
<internalFileTemplate name="Magento Module UI Component Form Xml"/>
212-
<internalFileTemplate name="Magento Php Form Button Block Class"/>
213-
<internalFileTemplate name="Magento Routes Xml"/>
214-
<internalFileTemplate name="Magento Module Layout Xml"/>
215-
<internalFileTemplate name="Magento Module ACL XML"/>
204+
<internalFileTemplate name="Magento Backend Controller Class"/>
205+
<internalFileTemplate name="Magento Frontend Controller Class"/>
206+
<internalFileTemplate name="Magento Cron Groups XML"/>
207+
<internalFileTemplate name="Magento UI Component Grid XML"/>
208+
<internalFileTemplate name="Magento UI Component Custom Data Provider Class"/>
209+
<internalFileTemplate name="Magento UI Component Form XML"/>
210+
<internalFileTemplate name="Magento Form Button Block Class"/>
211+
<internalFileTemplate name="Magento Routes XML"/>
212+
<internalFileTemplate name="Magento Layout XML"/>
213+
<internalFileTemplate name="Magento ACL XML"/>
216214
<internalFileTemplate name="Magento Module Collection Class"/>
217215
<internalFileTemplate name="Magento Module Model Class"/>
218216
<internalFileTemplate name="Magento Module Resource Model Class"/>
219217

218+
<defaultLiveTemplates file="/liveTemplates/MagentoPWA.xml"/>
219+
220220
<postStartupActivity implementation="com.magento.idea.magento2plugin.project.startup.CheckIfMagentoPathIsValidActivity"/>
221221
</extensions>
222222

223223
<extensions defaultExtensionNs="com.jetbrains.php">
224224
<frameworkProjectConfigurableProvider implementation="com.magento.idea.magento2plugin.project.ConfigurableProvider"/>
225225
<frameworkUsageProvider implementation="com.magento.idea.magento2plugin.project.UsagesProvider"/>
226+
<libraryRoot id="phpstorm.meta.php" path="/phpstorm.meta.php/" runtime="false"/>
226227
</extensions>
227228

228229
</idea-plugin>

‎resources/fileTemplates/code/Magento Module UI Component Form Field Xml.xml.html

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,53 @@
77
<html lang="en">
88
<body>
99
<p face="verdana" size="-1">
10-
The <a href="https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-listing-grid.html">Form component</a> configuration.
10+
The <a href="https://devdocs.magento.com/guides/v2.4/ui_comp_guide/components/ui-form.html">Form component</a> configuration.
1111
</p>
1212

1313
<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
1414
<tr>
15-
<td colspan="3"><font face="verdana" size="-1">Template's predefined variables:</font></td>
15+
<td colspan="3"><font face="verdana" size="-1">Predefined variables will take the following values:</font></td>
16+
</tr>
17+
<tr>
18+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${NAME}</b></font></nobr></td>
19+
<td width="10">&nbsp;</td>
20+
<td width="100%" valign="top"><font face="verdana" size="-1">Name for the UI Component Form. The name will be used for configuration file.</font></td>
21+
</tr>
22+
<tr>
23+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${LABEL}</b></font></nobr></td>
24+
<td width="10">&nbsp;</td>
25+
<td width="100%" valign="top"><font face="verdana" size="-1">Label for form elements (fieldset, button, input, etc..)</font></td>
26+
</tr>
27+
<tr>
28+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${BUTTONS}</b></font></nobr></td>
29+
<td width="10">&nbsp;</td>
30+
<td width="100%" valign="top"><font face="verdana" size="-1">Buttons that should be added to form.</font></td>
31+
</tr>
32+
<tr>
33+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${ROUTE}</b></font></nobr></td>
34+
<td width="10">&nbsp;</td>
35+
<td width="100%" valign="top"><font face="verdana" size="-1">Route name</font></td>
36+
</tr>
37+
<tr>
38+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${SUBMIT_CONTROLLER}</b></font></nobr></td>
39+
<td width="10">&nbsp;</td>
40+
<td width="100%" valign="top"><font face="verdana" size="-1">Class name for the controller.</font></td>
41+
</tr>
42+
<tr>
43+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${SUBMIT_ACTION}</b></font></nobr></td>
44+
<td width="10">&nbsp;</td>
45+
<td width="100%" valign="top"><font face="verdana" size="-1">Specifies the action class name.</font></td>
46+
</tr>
47+
<tr>
48+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${DATA_PROVIDER}</b></font></nobr></td>
49+
<td width="10">&nbsp;</td>
50+
<td width="100%" valign="top"><font face="verdana" size="-1">Class name for the data provider class.</font></td>
51+
</tr>
52+
<tr>
53+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${PRIMARY_FIELD}</b></font></nobr></td>
54+
<td width="10">&nbsp;</td>
55+
<td width="100%" valign="top"><font face="verdana" size="-1">Resource model primary field name.</font></td>
1656
</tr>
1757
</table>
1858
</body>
19-
</html>
59+
</html>

‎resources/fileTemplates/internal/Magento Module ACL XML.xml.ft renamed to ‎resources/fileTemplates/internal/Magento ACL XML.xml.ft

File renamed without changes.

‎resources/fileTemplates/internal/Magento Module ACL XML.xml.html renamed to ‎resources/fileTemplates/internal/Magento ACL XML.xml.html

File renamed without changes.

‎resources/fileTemplates/internal/Magento Module Controller Backend Class.php.ft renamed to ‎resources/fileTemplates/internal/Magento Backend Controller Class.php.ft

File renamed without changes.

‎resources/fileTemplates/internal/Magento Module Controller Backend Class.php.html renamed to ‎resources/fileTemplates/internal/Magento Backend Controller Class.php.html

File renamed without changes.

‎resources/fileTemplates/internal/Magento Module Composer.json.ft renamed to ‎resources/fileTemplates/internal/Magento Composer JSON.json.ft

File renamed without changes.

0 commit comments

Comments
 (0)