Additional changes to both the built-in UCT and UCT Run Configuration

bohdan-harniuk · bohdan-harniuk · commit 498fb1983de4 · 2021-09-14T22:30:46.000+03:00
diff --git a/resources/inspectionDescriptions/CallingDeprecatedMethod.html b/resources/inspectionDescriptions/CallingDeprecatedMethod.html
@@ -2,6 +2,5 @@
 <body>
 <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>
 <!-- tooltip end -->
-<p>Text after this comment will only be shown in the settings of the inspection.</p>
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/ExtendingDeprecatedClass.html b/resources/inspectionDescriptions/ExtendingDeprecatedClass.html
@@ -2,6 +2,5 @@
 <body>
 <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>
 <!-- tooltip end -->
-<p>Text after this comment will only be shown in the settings of the inspection.</p>
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/ImplementedDeprecatedInterface.html b/resources/inspectionDescriptions/ImplementedDeprecatedInterface.html
@@ -2,6 +2,5 @@
 <body>
 <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>
 <!-- tooltip end -->
-<p>Text after this comment will only be shown in the settings of the inspection.</p>
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/ImportingDeprecatedClass.html b/resources/inspectionDescriptions/ImportingDeprecatedClass.html
@@ -2,6 +2,5 @@
 <body>
 <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>
 <!-- tooltip end -->
-<p>Text after this comment will only be shown in the settings of the inspection.</p>
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/ImportingDeprecatedInterface.html b/resources/inspectionDescriptions/ImportingDeprecatedInterface.html
@@ -2,6 +2,5 @@
 <body>
 <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>
 <!-- tooltip end -->
-<p>Text after this comment will only be shown in the settings of the inspection.</p>
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/InheritedDeprecatedInterface.html b/resources/inspectionDescriptions/InheritedDeprecatedInterface.html
@@ -2,6 +2,5 @@
 <body>
 <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>
 <!-- tooltip end -->
-<p>Text after this comment will only be shown in the settings of the inspection.</p>
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/OverridingDeprecatedConstant.html b/resources/inspectionDescriptions/OverridingDeprecatedConstant.html
@@ -2,6 +2,5 @@
 <body>
 <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>
 <!-- tooltip end -->
-<p>Text after this comment will only be shown in the settings of the inspection.</p>
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/OverridingDeprecatedProperty.html b/resources/inspectionDescriptions/OverridingDeprecatedProperty.html
@@ -2,6 +2,5 @@
 <body>
 <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>
 <!-- tooltip end -->
-<p>Text after this comment will only be shown in the settings of the inspection.</p>
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/UsingDeprecatedClass.html b/resources/inspectionDescriptions/UsingDeprecatedClass.html
@@ -2,6 +2,5 @@
 <body>
 <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>
 <!-- tooltip end -->
-<p>Text after this comment will only be shown in the settings of the inspection.</p>
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/UsingDeprecatedConstant.html b/resources/inspectionDescriptions/UsingDeprecatedConstant.html
@@ -2,6 +2,5 @@
 <body>
 <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>
 <!-- tooltip end -->
-<p>Text after this comment will only be shown in the settings of the inspection.</p>
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/UsingDeprecatedInterface.html b/resources/inspectionDescriptions/UsingDeprecatedInterface.html
@@ -2,6 +2,5 @@
 <body>
 <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>
 <!-- tooltip end -->
-<p>Text after this comment will only be shown in the settings of the inspection.</p>
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/UsingDeprecatedProperty.html b/resources/inspectionDescriptions/UsingDeprecatedProperty.html
@@ -2,6 +2,5 @@
 <body>
 <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>
 <!-- tooltip end -->
-<p>Text after this comment will only be shown in the settings of the inspection.</p>
 </body>
 </html>
diff --git a/src/com/magento/idea/magento2uct/execution/configurations/UctRunConfiguration.java b/src/com/magento/idea/magento2uct/execution/configurations/UctRunConfiguration.java
@@ -280,6 +280,7 @@ public boolean isNewlyCreated() {
                 if (hasIgnoreCurrentVersionIssues()) {
                     commandLine.addParameter("--ignore-current-version-compatibility-issues");
                 }
+                commandLine.addParameter("--context=phpstorm");
                 commandLine.addParameter("--ansi");
 
                 final OSProcessHandler processHandler = ProcessHandlerFactory
diff --git a/src/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.form b/src/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.form
@@ -84,7 +84,7 @@
           <text value="Minimum issue level to show in report. Default is [WARNING]."/>
         </properties>
       </component>
-      <component id="18a6c" class="javax.swing.JRadioButton" binding="ignoreCurrentVersionIssues">
+      <component id="18a6c" class="javax.swing.JCheckBox" binding="ignoreCurrentVersionIssues">
         <constraints>
           <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"/>
         </constraints>
diff --git a/src/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java b/src/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
@@ -29,12 +29,12 @@
 import java.awt.Container;
 import java.net.URI;
 import java.net.URISyntaxException;
+import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JRadioButton;
 import javax.swing.event.DocumentEvent;
 import org.jdesktop.swingx.JXHyperlink;
 import org.jetbrains.annotations.NotNull;
@@ -55,7 +55,7 @@ public class UctSettingsEditor extends SettingsEditor<UctRunConfiguration> {
     private LabeledComponent<TextFieldWithBrowseButton> modulePath;
     private JComboBox<ComboBoxItemData> comingVersion;
     private JComboBox<ComboBoxItemData> minIssueLevel;
-    private JRadioButton ignoreCurrentVersionIssues;
+    private JCheckBox ignoreCurrentVersionIssues;
     private JPanel warningPanel;
     private JLabel myScriptNameLabel;//NOPMD
     private JLabel comingVersionLabel;//NOPMD
@@ -298,10 +298,6 @@ private void initializeComboboxSources() {
             comingVersion.addItem(new ComboBoxItemData(version, version));
         }
 
-        minIssueLevel.addItem(
-                new ComboBoxItemData("", "Choose a minimum issue level to show in report")
-        );
-
         for (final IssueSeverityLevel level : IssueSeverityLevel.getSeverityLabels()) {
             minIssueLevel.addItem(
                     new ComboBoxItemData(String.valueOf(level.getLevel()), level.getLabel())
