Skip to content

Commit 498fb19

Browse files
Additional changes to both the built-in UCT and UCT Run Configuration
1 parent 4a8b93f commit 498fb19

15 files changed

+4
-19
lines changed

resources/inspectionDescriptions/CallingDeprecatedMethod.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<body>
33
<p>[1439] Call Adobe Commerce @deprecated method: The deprecated method will be removed in upcoming versions. Consider relying on methods declared in API interfaces instead.</p>
44
<!-- tooltip end -->
5-
<p>Text after this comment will only be shown in the settings of the inspection.</p>
65
</body>
76
</html>

resources/inspectionDescriptions/ExtendingDeprecatedClass.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<body>
33
<p>[1131] Extending from Adobe Commerce @deprecated class: The extended class will be removed in upcoming versions. Inheritance is not recommended way of extending Adobe Commerce functionality. Update code to use a class marked as @api.</p>
44
<!-- tooltip end -->
5-
<p>Text after this comment will only be shown in the settings of the inspection.</p>
65
</body>
76
</html>

resources/inspectionDescriptions/ImplementedDeprecatedInterface.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<body>
33
<p>[1338] Implemented Adobe Commerce @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider removing the interface inheritance, using an interface marked as @api or an interface introduced within your implementation instead.</p>
44
<!-- tooltip end -->
5-
<p>Text after this comment will only be shown in the settings of the inspection.</p>
65
</body>
76
</html>

resources/inspectionDescriptions/ImportingDeprecatedClass.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<body>
33
<p>[1132] Importing Adobe Commerce @deprecated class: The extended class will be removed in upcoming versions. Consider using Adobe Commerce class marked as @api instead.</p>
44
<!-- tooltip end -->
5-
<p>Text after this comment will only be shown in the settings of the inspection.</p>
65
</body>
76
</html>

resources/inspectionDescriptions/ImportingDeprecatedInterface.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<body>
33
<p>[1332] Imported Adobe Commerce @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider using an interface or class marked as @api instead.</p>
44
<!-- tooltip end -->
5-
<p>Text after this comment will only be shown in the settings of the inspection.</p>
65
</body>
76
</html>

resources/inspectionDescriptions/InheritedDeprecatedInterface.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<body>
33
<p>[1337] Inherited from Adobe Commerce @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider removing the interface inheritance, using an interface marked as @api or an interface introduced within your implementation instead.</p>
44
<!-- tooltip end -->
5-
<p>Text after this comment will only be shown in the settings of the inspection.</p>
65
</body>
76
</html>

resources/inspectionDescriptions/OverridingDeprecatedConstant.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<body>
33
<p>[1235] Overriding Adobe Commerce @deprecated constant: The deprecated constant will be removed in upcoming versions. Consider using a constant marked as @api or a private constant within your implementation instead.</p>
44
<!-- tooltip end -->
5-
<p>Text after this comment will only be shown in the settings of the inspection.</p>
65
</body>
76
</html>

resources/inspectionDescriptions/OverridingDeprecatedProperty.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<body>
33
<p>[1535] Overriding Adobe Commerce @deprecated property: The deprecated property will be removed in upcoming versions. Consider relying on methods declared in API interfaces or using a private property within your implementation instead.</p>
44
<!-- tooltip end -->
5-
<p>Text after this comment will only be shown in the settings of the inspection.</p>
65
</body>
76
</html>

resources/inspectionDescriptions/UsingDeprecatedClass.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<body>
33
<p>[1134] Using Adobe Commerce @deprecated class: The extended class will be removed in upcoming versions. Consider using Adobe Commerce class marked as @api instead.</p>
44
<!-- tooltip end -->
5-
<p>Text after this comment will only be shown in the settings of the inspection.</p>
65
</body>
76
</html>

resources/inspectionDescriptions/UsingDeprecatedConstant.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<body>
33
<p>[1234] Using Adobe Commerce @deprecated constant: The deprecated constant will be removed in upcoming versions. Consider using a constant marked as @api or a private constant within your implementation instead.</p>
44
<!-- tooltip end -->
5-
<p>Text after this comment will only be shown in the settings of the inspection.</p>
65
</body>
76
</html>

resources/inspectionDescriptions/UsingDeprecatedInterface.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<body>
33
<p>[1334] Used Adobe Commerce @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider using an interface or class marked as @api instead.</p>
44
<!-- tooltip end -->
5-
<p>Text after this comment will only be shown in the settings of the inspection.</p>
65
</body>
76
</html>

resources/inspectionDescriptions/UsingDeprecatedProperty.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<body>
33
<p>[1534] Using Adobe Commerce @deprecated property: The deprecated method will be removed in upcoming versions. Consider relying on methods declared in API interfaces instead.</p>
44
<!-- tooltip end -->
5-
<p>Text after this comment will only be shown in the settings of the inspection.</p>
65
</body>
76
</html>

src/com/magento/idea/magento2uct/execution/configurations/UctRunConfiguration.java

+1
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ public boolean isNewlyCreated() {
280280
if (hasIgnoreCurrentVersionIssues()) {
281281
commandLine.addParameter("--ignore-current-version-compatibility-issues");
282282
}
283+
commandLine.addParameter("--context=phpstorm");
283284
commandLine.addParameter("--ansi");
284285

285286
final OSProcessHandler processHandler = ProcessHandlerFactory

src/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.form

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<text value="Minimum issue level to show in report. Default is [WARNING]."/>
8585
</properties>
8686
</component>
87-
<component id="18a6c" class="javax.swing.JRadioButton" binding="ignoreCurrentVersionIssues">
87+
<component id="18a6c" class="javax.swing.JCheckBox" binding="ignoreCurrentVersionIssues">
8888
<constraints>
8989
<grid row="10" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
9090
</constraints>

src/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
import java.awt.Container;
3030
import java.net.URI;
3131
import java.net.URISyntaxException;
32+
import javax.swing.JCheckBox;
3233
import javax.swing.JComboBox;
3334
import javax.swing.JComponent;
3435
import javax.swing.JLabel;
3536
import javax.swing.JOptionPane;
3637
import javax.swing.JPanel;
37-
import javax.swing.JRadioButton;
3838
import javax.swing.event.DocumentEvent;
3939
import org.jdesktop.swingx.JXHyperlink;
4040
import org.jetbrains.annotations.NotNull;
@@ -55,7 +55,7 @@ public class UctSettingsEditor extends SettingsEditor<UctRunConfiguration> {
5555
private LabeledComponent<TextFieldWithBrowseButton> modulePath;
5656
private JComboBox<ComboBoxItemData> comingVersion;
5757
private JComboBox<ComboBoxItemData> minIssueLevel;
58-
private JRadioButton ignoreCurrentVersionIssues;
58+
private JCheckBox ignoreCurrentVersionIssues;
5959
private JPanel warningPanel;
6060
private JLabel myScriptNameLabel;//NOPMD
6161
private JLabel comingVersionLabel;//NOPMD
@@ -298,10 +298,6 @@ private void initializeComboboxSources() {
298298
comingVersion.addItem(new ComboBoxItemData(version, version));
299299
}
300300

301-
minIssueLevel.addItem(
302-
new ComboBoxItemData("", "Choose a minimum issue level to show in report")
303-
);
304-
305301
for (final IssueSeverityLevel level : IssueSeverityLevel.getSeverityLabels()) {
306302
minIssueLevel.addItem(
307303
new ComboBoxItemData(String.valueOf(level.getLevel()), level.getLabel())

0 commit comments

Comments
 (0)