Merge pull request #2880 from KacerCZ/netbeans-5577-php-cs-fixer-v3-c…

…onfig-files [NETBEANS-5577] Add PHP-CS-Fixer 3.x configuration files
apache · Apr 15, 2021 · a2cdd59 · a2cdd59
2 parents 03773dd + 906d882
commit a2cdd59
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ImportantFilesImpl.java b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ImportantFilesImpl.java
@@ -36,8 +36,10 @@ public final class ImportantFilesImpl implements ImportantFilesImplementation {
             CodeSniffer.DOT_CONFIG_FILE_NAME,
             CodeSniffer.DIST_CONFIG_FILE_NAME,
             CodeSniffer.DIST_DOT_CONFIG_FILE_NAME,
-            CodingStandardsFixer.CONFIG_FILE_NAME,
-            CodingStandardsFixer.DIST_CONFIG_FILE_NAME,
+            CodingStandardsFixer.CONFIG_FILE_NAME_V2,
+            CodingStandardsFixer.DIST_CONFIG_FILE_NAME_V2,
+            CodingStandardsFixer.CONFIG_FILE_NAME_V3,
+            CodingStandardsFixer.DIST_CONFIG_FILE_NAME_V3,
             PHPStan.CONFIG_FILE_NAME,
             PHPStan.DIST_CONFIG_FILE_NAME};
 

diff --git a/...hp.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodingStandardsFixer.java b/...hp.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodingStandardsFixer.java
@@ -87,8 +87,10 @@ public final class CodingStandardsFixer {
             NO_INTERACTION_PARAM);
 
     // configuration files
-    public static final String CONFIG_FILE_NAME = ".php_cs"; // NOI18N
-    public static final String DIST_CONFIG_FILE_NAME = ".php_cs.dist"; // NOI18N
+    public static final String CONFIG_FILE_NAME_V2 = ".php_cs"; // NOI18N
+    public static final String DIST_CONFIG_FILE_NAME_V2 = ".php_cs.dist"; // NOI18N
+    public static final String CONFIG_FILE_NAME_V3 = ".php-cs-fixer.php"; // NOI18N
+    public static final String DIST_CONFIG_FILE_NAME_V3 = ".php-cs-fixer.dist.php"; // NOI18N
 
     @org.netbeans.api.annotations.common.SuppressWarnings(value = "MS_MUTABLE_COLLECTION", justification = "It is immutable") // NOI18N
     public static final List<String> VERSIONS = Arrays.asList(