Skip to content

Commit 7a42ee4

Browse files
author
Andrii Chornyi
committed
Merge branch '2.1.0-develop-local' into feature/issue-288-add-description-for-template
2 parents c92546b + 305bfcd commit 7a42ee4

File tree

75 files changed

+394
-147
lines changed

Some content is hidden

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

75 files changed

+394
-147
lines changed

resources/META-INF/plugin.xml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -188,28 +188,28 @@
188188
enabledByDefault="true" level="ERROR"
189189
implementationClass="com.magento.idea.magento2plugin.inspections.xml.AclResourceXmlInspection"/>
190190

191-
<internalFileTemplate name="Magento Module Composer"/>
192-
<internalFileTemplate name="Magento Module Registration Php"/>
193-
<internalFileTemplate name="Magento Module Xml"/>
194-
<internalFileTemplate name="Magento Module DI Xml"/>
195-
<internalFileTemplate name="Magento Php Preference Class"/>
196-
<internalFileTemplate name="Magento Module Common Php Class"/>
191+
<internalFileTemplate name="Magento Composer JSON"/>
192+
<internalFileTemplate name="Magento Registration PHP"/>
193+
<internalFileTemplate name="Magento Module XML"/>
194+
<internalFileTemplate name="Magento DI XML"/>
195+
<internalFileTemplate name="Magento Preference Class"/>
196+
<internalFileTemplate name="Magento Regular Class"/>
197197
<internalFileTemplate name="Magento Observer Class"/>
198-
<internalFileTemplate name="Magento Module Events Xml"/>
198+
<internalFileTemplate name="Magento Events XML"/>
199199
<internalFileTemplate name="Magento GraphQL Resolver Class"/>
200-
<internalFileTemplate name="Magento Cronjob Class"/>
201-
<internalFileTemplate name="Magento Crontab Xml"/>
200+
<internalFileTemplate name="Magento Cron Job Class"/>
201+
<internalFileTemplate name="Magento Cron Tab XML"/>
202202
<internalFileTemplate name="Magento CLI Command Class"/>
203-
<internalFileTemplate name="Magento Module Controller Backend Class"/>
204-
<internalFileTemplate name="Magento Module Controller Frontend Class"/>
205-
<internalFileTemplate name="Magento Module Cron Groups Xml"/>
206-
<internalFileTemplate name="Magento Module UI Component Grid Xml"/>
207-
<internalFileTemplate name="Magento Module Ui Custom Data Provider Php"/>
208-
<internalFileTemplate name="Magento Module UI Component Form Xml"/>
209-
<internalFileTemplate name="Magento Php Form Button Block Class"/>
210-
<internalFileTemplate name="Magento Routes Xml"/>
211-
<internalFileTemplate name="Magento Module Layout Xml"/>
212-
<internalFileTemplate name="Magento Module ACL XML"/>
203+
<internalFileTemplate name="Magento Backend Controller Class"/>
204+
<internalFileTemplate name="Magento Frontend Controller Class"/>
205+
<internalFileTemplate name="Magento Cron Groups XML"/>
206+
<internalFileTemplate name="Magento UI Component Grid XML"/>
207+
<internalFileTemplate name="Magento UI Component Custom Data Provider Class"/>
208+
<internalFileTemplate name="Magento UI Component Form XML"/>
209+
<internalFileTemplate name="Magento Form Button Block Class"/>
210+
<internalFileTemplate name="Magento Routes XML"/>
211+
<internalFileTemplate name="Magento Layout XML"/>
212+
<internalFileTemplate name="Magento ACL XML"/>
213213

214214
<defaultLiveTemplates file="/liveTemplates/MagentoPWA.xml"/>
215215

0 commit comments

Comments
 (0)