diff --git a/composer.json b/composer.json index 232920b3..aafcec7c 100644 --- a/composer.json +++ b/composer.json @@ -32,8 +32,8 @@ "config": { "sort-packages": true, "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true, - "cweagans/composer-patches": true + "cweagans/composer-patches": true, + "dealerdirect/phpcodesniffer-composer-installer": true } }, "extra": { diff --git a/defaults.yml b/defaults.yml index 00b3f969..507c204c 100644 --- a/defaults.yml +++ b/defaults.yml @@ -222,6 +222,9 @@ phplint: # Configuration for using PHP_CodeSniffer to review code according to the Drupal coding # standards. # +# DEPRECATED - to be removed in the-build 4.2 +# This configuration is replaced by defaults/install/phpcs.xml. +# # @see https://www.drupal.org/docs/develop/standards # @see https://github.com/squizlabs/PHP_CodeSniffer # @see https://www.drupal.org/project/coder @@ -235,14 +238,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" diff --git a/defaults/install/build.xml b/defaults/install/build.xml index 026f1340..fd833ccc 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -117,9 +117,8 @@ - - - + + diff --git a/defaults/install/phpcs.xml b/defaults/install/phpcs.xml new file mode 100644 index 00000000..1ec4b56c --- /dev/null +++ b/defaults/install/phpcs.xml @@ -0,0 +1,39 @@ + + + + + + PHP_CodeSniffer configuration. + + + + + + + + + + + + + + + + + + + + docroot/modules/custom + docroot/themes/custom + + */behat + */node_modules + */vendor + + diff --git a/targets/install.xml b/targets/install.xml index ff4da138..c9491490 100644 --- a/targets/install.xml +++ b/targets/install.xml @@ -189,6 +189,17 @@ + + + + + + + + +