From 4d9d742f8b7f85b8a7631174809c38ec82d51856 Mon Sep 17 00:00:00 2001 From: Bec White Date: Mon, 24 Oct 2022 10:03:29 -0500 Subject: [PATCH 1/2] Copy the phpmd and phplint configs into the project directory, the same way as the phpcs config. --- defaults.yml | 4 ++-- defaults/{standard => install}/phplint.txt | 0 defaults/{standard => install}/phpmd.xml | 4 +++- targets/install.xml | 12 +++++++++--- 4 files changed, 14 insertions(+), 6 deletions(-) rename defaults/{standard => install}/phplint.txt (100%) rename defaults/{standard => install}/phpmd.xml (97%) diff --git a/defaults.yml b/defaults.yml index 507c204c..f395779d 100644 --- a/defaults.yml +++ b/defaults.yml @@ -216,7 +216,7 @@ acquia: # defaults/build.xml template. phplint: # Path to a file where each line is a pattern matching files to lint. - includesfile: "${build.thebuild.dir}/defaults/standard/phplint.txt" + includesfile: "phplint.txt" # Configuration for using PHP_CodeSniffer to review code according to the Drupal coding @@ -255,7 +255,7 @@ phpmd: # Output format for phpmd. format: text # Comma-separated list of ruleset paths or names. - rulesets: "${build.thebuild.dir}/defaults/standard/phpmd.xml" + rulesets: "phpmd.xml" # File extensions to review. suffixes: php,inc,module,theme,profile,install,test diff --git a/defaults/standard/phplint.txt b/defaults/install/phplint.txt similarity index 100% rename from defaults/standard/phplint.txt rename to defaults/install/phplint.txt diff --git a/defaults/standard/phpmd.xml b/defaults/install/phpmd.xml similarity index 97% rename from defaults/standard/phpmd.xml rename to defaults/install/phpmd.xml index c1a66cfc..b5ac3ddf 100644 --- a/defaults/standard/phpmd.xml +++ b/defaults/install/phpmd.xml @@ -7,6 +7,9 @@ @@ -71,7 +74,6 @@ diff --git a/targets/install.xml b/targets/install.xml index c9491490..382cf85e 100644 --- a/targets/install.xml +++ b/targets/install.xml @@ -200,9 +200,15 @@ - + + + + + + + From 7d4cb29f476e8d3f8b5fba08472fbcbab69a4edf Mon Sep 17 00:00:00 2001 From: byrond Date: Fri, 13 Jan 2023 12:27:18 -0500 Subject: [PATCH 2/2] fix phplint.txt destination filename during install --- targets/install.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/install.xml b/targets/install.xml index 382cf85e..c2f59841 100644 --- a/targets/install.xml +++ b/targets/install.xml @@ -204,7 +204,7 @@ - +