From 0315fc9ab68a916b0ce32e3a43c37e551e62a718 Mon Sep 17 00:00:00 2001 From: byrond Date: Wed, 2 Feb 2022 14:37:31 -0500 Subject: [PATCH 1/4] updates defaults.yml --- defaults.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/defaults.yml b/defaults.yml index db2dc04d..81f28fee 100644 --- a/defaults.yml +++ b/defaults.yml @@ -227,7 +227,7 @@ phplint: # @see https://www.drupal.org/project/coder # # These values are used in the defaults/build.xml template: -# $> phpcs --standard=${phpcs.standard} --ignore=${phpcs.ignore} ${phpcs.directories} +# $> phpcs --standard=${phpcs.standard} --extensions=${phpcs.extensions} ${phpcs.directories} phpcs: # Path to a PHP_CodeSniffer standard file. standard: "${build.dir}/vendor/drupal/coder/coder_sniffer/Drupal/ruleset.xml" @@ -235,14 +235,6 @@ phpcs: # Space-separated list of directories to review. directories: "${drupal.root}/modules/custom ${drupal.root}/themes/custom" - # Comma-separated list of patterns for files and directories to exclude from the - # PHP_CodeSniffer review. - # - # This is deprecated and will be removed in 3.0, and build.xml will need to be updated then to - # use the extensions option (below). This option should not be used with Coder >= 8.3.7, which only - # checks php, inc, css, and js by default. - ignore: "*.md" - # Comma-separated list of extensions to check in the PHP_CodeSniffer review. extensions: "php,module,inc,install,test,profile,theme,css,info,txt,yml,js" From 028b51df83e040e22f3f297dc860ec1a0dd83666 Mon Sep 17 00:00:00 2001 From: byrond Date: Wed, 2 Feb 2022 14:56:47 -0500 Subject: [PATCH 2/4] add ignore config for vendor and node_modules directories --- defaults.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/defaults.yml b/defaults.yml index 81f28fee..74aa4c1b 100644 --- a/defaults.yml +++ b/defaults.yml @@ -227,7 +227,7 @@ phplint: # @see https://www.drupal.org/project/coder # # These values are used in the defaults/build.xml template: -# $> phpcs --standard=${phpcs.standard} --extensions=${phpcs.extensions} ${phpcs.directories} +# $> phpcs --standard=${phpcs.standard} --extensions=${phpcs.extensions} --ignore=${phpcs.ignore} ${phpcs.directories} phpcs: # Path to a PHP_CodeSniffer standard file. standard: "${build.dir}/vendor/drupal/coder/coder_sniffer/Drupal/ruleset.xml" @@ -235,6 +235,10 @@ phpcs: # Space-separated list of directories to review. directories: "${drupal.root}/modules/custom ${drupal.root}/themes/custom" + # Comma-separated list of patterns for files and directories to exclude from the + # PHP_CodeSniffer review. + ignore: "*/vendor/*,*/node_modules/*" + # Comma-separated list of extensions to check in the PHP_CodeSniffer review. extensions: "php,module,inc,install,test,profile,theme,css,info,txt,yml,js" From ee48fc1d73162c185b1817bd56e929fa50ae4ac9 Mon Sep 17 00:00:00 2001 From: byrond Date: Wed, 2 Feb 2022 14:59:18 -0500 Subject: [PATCH 3/4] update default installed build.xml with phpcs ignore option --- defaults/install/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/install/build.xml b/defaults/install/build.xml index b74428c3..53f46423 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -117,7 +117,7 @@ - + From 68f5f305639c45b79718faaee8058adfa3195677 Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Wed, 2 Feb 2022 15:06:20 -0500 Subject: [PATCH 4/4] revert 028b51d and ee48fc1 --- defaults.yml | 6 +----- defaults/install/build.xml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/defaults.yml b/defaults.yml index 74aa4c1b..81f28fee 100644 --- a/defaults.yml +++ b/defaults.yml @@ -227,7 +227,7 @@ phplint: # @see https://www.drupal.org/project/coder # # These values are used in the defaults/build.xml template: -# $> phpcs --standard=${phpcs.standard} --extensions=${phpcs.extensions} --ignore=${phpcs.ignore} ${phpcs.directories} +# $> phpcs --standard=${phpcs.standard} --extensions=${phpcs.extensions} ${phpcs.directories} phpcs: # Path to a PHP_CodeSniffer standard file. standard: "${build.dir}/vendor/drupal/coder/coder_sniffer/Drupal/ruleset.xml" @@ -235,10 +235,6 @@ phpcs: # Space-separated list of directories to review. directories: "${drupal.root}/modules/custom ${drupal.root}/themes/custom" - # Comma-separated list of patterns for files and directories to exclude from the - # PHP_CodeSniffer review. - ignore: "*/vendor/*,*/node_modules/*" - # Comma-separated list of extensions to check in the PHP_CodeSniffer review. extensions: "php,module,inc,install,test,profile,theme,css,info,txt,yml,js" diff --git a/defaults/install/build.xml b/defaults/install/build.xml index 53f46423..b74428c3 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -117,7 +117,7 @@ - +