Add PHPStan rule level 10

Added new rule level. Removed special rendering of max rule level because "max" is individual option. Reference: - https://phpstan.org/user-guide/rule-levels
dbalek · Dec 3, 2024 · 2e32e97 · 2e32e97
1 parent 6b34b88
commit 2e32e97
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 48 deletions.
diff --git a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/options/AnalysisOptions.java b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/options/AnalysisOptions.java
@@ -58,7 +58,7 @@ public final class AnalysisOptions {
     private static final String PHPSTAN_CONFIGURATION = "phpstan.configuration"; // NOI18N
     private static final String PHPSTAN_MEMORY_LIMIT = "phpstan.memory.limit"; // NOI18N
     public static final int PHPSTAN_MIN_LEVEL = Integer.getInteger("nb.phpstan.min.level", 0); // NOI18N
-    public static final int PHPSTAN_MAX_LEVEL = Integer.getInteger("nb.phpstan.max.level", 9); // NOI18N
+    public static final int PHPSTAN_MAX_LEVEL = Integer.getInteger("nb.phpstan.max.level", 10); // NOI18N
     // Psalm - PHP Static Analysis Tool
     private static final String PSALM_PATH = "psalm.path"; // NOI18N
     private static final String PSALM_LEVEL = "psalm.level"; // NOI18N

diff --git a/....code.analysis/src/org/netbeans/modules/php/analysis/ui/PHPStanLevelListCellRenderer.java b/....code.analysis/src/org/netbeans/modules/php/analysis/ui/PHPStanLevelListCellRenderer.java
diff --git a/...de.analysis/src/org/netbeans/modules/php/analysis/ui/analyzer/PHPStanCustomizerPanel.java b/...de.analysis/src/org/netbeans/modules/php/analysis/ui/analyzer/PHPStanCustomizerPanel.java
@@ -37,7 +37,6 @@
 import org.netbeans.modules.analysis.spi.Analyzer;
 import org.netbeans.modules.php.analysis.commands.PHPStan;
 import org.netbeans.modules.php.analysis.options.AnalysisOptions;
-import org.netbeans.modules.php.analysis.ui.PHPStanLevelListCellRenderer;
 import org.netbeans.modules.php.analysis.options.AnalysisOptionsValidator;
 import org.netbeans.modules.php.analysis.options.ValidatorPHPStanParameter;
 import org.netbeans.modules.php.analysis.ui.AnalysisDefaultDocumentListener;
@@ -121,7 +120,6 @@ private void initLevelComboBox() {
             phpStanLevelComboBox.addItem(String.valueOf(i));
         }
         phpStanLevelComboBox.addItem(PHPStan.MAX_LEVEL);
-        phpStanLevelComboBox.setRenderer(new PHPStanLevelListCellRenderer(phpStanLevelComboBox.getRenderer()));
         phpStanLevelComboBox.setSelectedItem(getValidLevel());
         phpStanLevelComboBox.addItemListener(e -> setLevel());
     }

diff --git a/...p.code.analysis/src/org/netbeans/modules/php/analysis/ui/options/PHPStanOptionsPanel.java b/...p.code.analysis/src/org/netbeans/modules/php/analysis/ui/options/PHPStanOptionsPanel.java
@@ -39,7 +39,6 @@
 import org.netbeans.modules.php.analysis.options.AnalysisOptions;
 import org.netbeans.modules.php.analysis.options.AnalysisOptionsValidator;
 import org.netbeans.modules.php.analysis.ui.AnalysisDefaultDocumentListener;
-import org.netbeans.modules.php.analysis.ui.PHPStanLevelListCellRenderer;
 import org.netbeans.modules.php.analysis.options.ValidatorPHPStanParameter;
 import org.netbeans.modules.php.analysis.util.AnalysisUiUtils;
 import org.netbeans.modules.php.api.validation.ValidationResult;
@@ -78,7 +77,6 @@ private void init() {
             phpStanLevelComboBox.addItem(String.valueOf(i));
         }
         phpStanLevelComboBox.addItem(PHPStan.MAX_LEVEL);
-        phpStanLevelComboBox.setRenderer(new PHPStanLevelListCellRenderer(phpStanLevelComboBox.getRenderer()));
         // add listener
         DocumentListener defaultDocumentListener = new AnalysisDefaultDocumentListener(() -> fireChange());
         phpStanTextField.getDocument().addDocumentListener(defaultDocumentListener);