Skip to content

Commit 432e334

Browse files
author
Vitaliy Boyko
committed
Merge branch '4.3.0-develop' of github.com:magento/magento2-phpstorm-plugin into mainline-eav-attr-code-genearators
� Conflicts: � src/com/magento/idea/magento2plugin/reference/js/JsReferenceContributor.java
2 parents b0172d3 + cb76518 commit 432e334

File tree

40 files changed

+1231
-94
lines changed

40 files changed

+1231
-94
lines changed

‎resources/META-INF/plugin.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,50 @@
552552
enabledByDefault="false"
553553
level="WARNING"
554554
implementationClass="com.magento.idea.magento2uct.inspections.php.api.CalledNonInterfaceMethod"/>
555+
556+
<localInspection language="XML" groupPath="UCT"
557+
shortName="UsedDeprecatedTypeInConfig"
558+
bundle="uct.bundle.inspection" key="inspection.displayName.UsedDeprecatedTypeInConfig"
559+
groupBundle="uct.bundle.inspection" groupKey="inspection.deprecation.group.name"
560+
enabledByDefault="false"
561+
level="WARNING"
562+
implementationClass="com.magento.idea.magento2uct.inspections.xml.UsedDeprecatedTypeInConfig"/>
563+
<localInspection language="XML" groupPath="UCT"
564+
shortName="UsedDeprecatedConstantInConfig"
565+
bundle="uct.bundle.inspection" key="inspection.displayName.UsedDeprecatedConstantInConfig"
566+
groupBundle="uct.bundle.inspection" groupKey="inspection.deprecation.group.name"
567+
enabledByDefault="false"
568+
level="WARNING"
569+
implementationClass="com.magento.idea.magento2uct.inspections.xml.UsedDeprecatedConstantInConfig"/>
570+
<localInspection language="XML" groupPath="UCT"
571+
shortName="UsedDeprecatedMethodInConfig"
572+
bundle="uct.bundle.inspection" key="inspection.displayName.UsedDeprecatedMethodInConfig"
573+
groupBundle="uct.bundle.inspection" groupKey="inspection.deprecation.group.name"
574+
enabledByDefault="false"
575+
level="WARNING"
576+
implementationClass="com.magento.idea.magento2uct.inspections.xml.UsedDeprecatedMethodInConfig"/>
577+
578+
<localInspection language="XML" groupPath="UCT"
579+
shortName="UsedNonExistentTypeInConfig"
580+
bundle="uct.bundle.inspection" key="inspection.displayName.UsedNonExistentTypeInConfig"
581+
groupBundle="uct.bundle.inspection" groupKey="inspection.existence.group.name"
582+
enabledByDefault="false"
583+
level="ERROR"
584+
implementationClass="com.magento.idea.magento2uct.inspections.xml.UsedNonExistentTypeInConfig"/>
585+
<localInspection language="XML" groupPath="UCT"
586+
shortName="UsedNonExistentConstantInConfig"
587+
bundle="uct.bundle.inspection" key="inspection.displayName.UsedNonExistentConstantInConfig"
588+
groupBundle="uct.bundle.inspection" groupKey="inspection.existence.group.name"
589+
enabledByDefault="false"
590+
level="ERROR"
591+
implementationClass="com.magento.idea.magento2uct.inspections.xml.UsedNonExistentConstantInConfig"/>
592+
<localInspection language="XML" groupPath="UCT"
593+
shortName="UsedNonExistentMethodInConfig"
594+
bundle="uct.bundle.inspection" key="inspection.displayName.UsedNonExistentMethodInConfig"
595+
groupBundle="uct.bundle.inspection" groupKey="inspection.existence.group.name"
596+
enabledByDefault="false"
597+
level="ERROR"
598+
implementationClass="com.magento.idea.magento2uct.inspections.xml.UsedNonExistentMethodInConfig"/>
555599
<!-- \UCT inspection -->
556600

557601
<internalFileTemplate name="Magento Composer JSON"/>

‎resources/META-INF/pluginIcon.svg

Lines changed: 2 additions & 0 deletions
Loading

‎resources/fileTemplates/internal/Require Config JS File.js.ft

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
var config = {
2+
}

‎resources/fileTemplates/internal/Require Config JS File.js.html

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!--
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
-->
7+
<html lang="en">
8+
<body>
9+
<font face="verdana" size="-1">
10+
<p>
11+
All configuration is done in the requirejs-config.js file. It has a single root object config which contains
12+
the configuration options described below. All the configuration settings are optional and are used only when required.
13+
</p>
14+
<p>
15+
Read more about requirejs-config.js in the
16+
<a href="https://devdocs.magento.com/guides/v2.4/javascript-dev-guide/javascript/requirejs.html">DevDocs</a>.
17+
</p>
18+
</font>
19+
</body>
20+
</html>

‎resources/inspectionDescriptions/UsedDeprecatedConstantInConfig.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<html>
2+
<body>
3+
<p>[1234] Using Magento 2 @deprecated constant: consider using Magento Open Source|Adobe Commerce constant marked as @api instead.</p>
4+
<!-- tooltip end -->
5+
</body>
6+
</html>

‎resources/inspectionDescriptions/UsedDeprecatedMethodInConfig.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<html>
2+
<body>
3+
<p>[1439] Using Magento 2 @deprecated method: this method will be removed in upcoming versions. Consider relying on methods declared in API interfaces instead.</p>
4+
<!-- tooltip end -->
5+
</body>
6+
</html>

‎resources/inspectionDescriptions/UsedDeprecatedTypeInConfig.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<html>
2+
<body>
3+
<p>[1134] Using Magento 2 @deprecated type: consider using Magento Open Source|Adobe Commerce type marked as @api instead.</p>
4+
<!-- tooltip end -->
5+
</body>
6+
</html>

‎resources/inspectionDescriptions/UsedNonExistentConstantInConfig.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<html>
2+
<body>
3+
<p>[1214] The used constant is no longer present in the codebase.</p>
4+
<!-- tooltip end -->
5+
</body>
6+
</html>

‎resources/inspectionDescriptions/UsedNonExistentMethodInConfig.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<html>
2+
<body>
3+
<p>[1410] The used method is no longer present in the codebase.</p>
4+
<!-- tooltip end -->
5+
</body>
6+
</html>

‎resources/inspectionDescriptions/UsedNonExistentTypeInConfig.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<html>
2+
<body>
3+
<p>[1110] The used type is no longer present in the codebase.</p>
4+
<!-- tooltip end -->
5+
</body>
6+
</html>

0 commit comments

Comments
 (0)