You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ju...@apache.org on 2021/04/15 10:54:08 UTC
[netbeans] branch master updated: [NETBEANS-5577] Add PHP-CS-Fixer
3.x configuration files
This is an automated email from the ASF dual-hosted git repository.
junichi11 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 906d882 [NETBEANS-5577] Add PHP-CS-Fixer 3.x configuration files
new a2cdd59 Merge pull request #2880 from KacerCZ/netbeans-5577-php-cs-fixer-v3-config-files
906d882 is described below
commit 906d882f430c24f262c48e0a1095b3a0a0fb4829
Author: Tomas Prochazka <ka...@razdva.cz>
AuthorDate: Tue Apr 13 20:02:13 2021 +0200
[NETBEANS-5577] Add PHP-CS-Fixer 3.x configuration files
https://issues.apache.org/jira/browse/NETBEANS-5577
Added configuration files `.php-cs-fixer.php` and `.php-cs-fixer.dist.php` to Important files.
Reference:
- https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/3.0/UPGRADE-v3.md
- https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/5607
---
.../src/org/netbeans/modules/php/analysis/ImportantFilesImpl.java | 6 ++++--
.../modules/php/analysis/commands/CodingStandardsFixer.java | 6 ++++--
2 files changed, 8 insertions(+), 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
index 7be381e..cb55ec9 100644
--- 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/php/php.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodingStandardsFixer.java b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodingStandardsFixer.java
index 7eed8c6..2759977 100644
--- a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodingStandardsFixer.java
+++ b/php/php.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(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists