[netbeans] branch master updated: [NETBEANS-2974] PHPStan - make level optional

[tmysik]

This is an automated email from the ASF dual-hosted git repository.

tmysik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new 480d2a2  [NETBEANS-2974] PHPStan - make level optional
     new 3f28e5a  Merge pull request #1419 from junichi11/netbeans-2974
480d2a2 is described below

commit 480d2a278cfcea6d5dde63da835d371e93ceb9c8
Author: Junichi Yamamoto <junich...@apache.org>
AuthorDate: Mon Aug 12 10:43:08 2019 +0900

    [NETBEANS-2974] PHPStan - make level optional
    
    - Allow empty level option to use a level of a configuration file
---
 .../modules/php/analysis/ui/analyzer/PHPStanCustomizerPanel.java       | 3 +++
 .../netbeans/modules/php/analysis/ui/options/PHPStanOptionsPanel.java  | 3 +++
 2 files changed, 6 insertions(+)

diff --git 
a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/analyzer/PHPStanCustomizerPanel.java
 
b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/analyzer/PHPStanCustomizerPanel.java
index 9732892..7168c45 100644
--- 
a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/analyzer/PHPStanCustomizerPanel.java
+++ 
b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/analyzer/PHPStanCustomizerPanel.java
@@ -79,6 +79,9 @@ public class PHPStanCustomizerPanel extends JPanel {
     private void setLevelComboBox() {
         assert EventQueue.isDispatchThread();
         phpStanLevelComboBox.removeAllItems();
+        // NETBEANS-2974
+        // allow empty level option to use a level of a configuration file
+        phpStanLevelComboBox.addItem(""); // NOI18N
         for (int i = AnalysisOptions.PHPSTAN_MIN_LEVEL; i <= 
AnalysisOptions.PHPSTAN_MAX_LEVEL; i++) {
             phpStanLevelComboBox.addItem(String.valueOf(i));
         }
diff --git 
a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/options/PHPStanOptionsPanel.java
 
b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/options/PHPStanOptionsPanel.java
index 3c2bb50..daf4755 100644
--- 
a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/options/PHPStanOptionsPanel.java
+++ 
b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/options/PHPStanOptionsPanel.java
@@ -64,6 +64,9 @@ public class PHPStanOptionsPanel extends 
AnalysisCategoryPanel {
     private void init() {
         phpStanHintLabel.setText(Bundle.PHPStanOptionsPanel_hint(PHPStan.NAME, 
PHPStan.LONG_NAME));
         phpStanLevelComboBox.removeAllItems();
+        // NETBEANS-2974
+        // allow empty level option to use a level of a configuration file
+        phpStanLevelComboBox.addItem(""); // NOI18N
         for (int i = AnalysisOptions.PHPSTAN_MIN_LEVEL; i <= 
AnalysisOptions.PHPSTAN_MAX_LEVEL; i++) {
             phpStanLevelComboBox.addItem(String.valueOf(i));
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists