Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unpin phpmd version #232

Merged
merged 5 commits into from
Nov 29, 2023
Merged

unpin phpmd version #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a9731e
unpin phpmd version
byrond Nov 17, 2023
74a6e62
update phpmd command in circleci config
byrond Nov 17, 2023
08de578
update phpmd command in installed build.xml
byrond Nov 17, 2023
e7c9965
update phpmd command in code-review.sh
byrond Nov 17, 2023
8672bd3
fix phpmd command in comment
byrond Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ jobs:
echo "phpcs for modules"
vendor/bin/phpcs defaults/standard/modules --standard="Drupal,DrupalPractice" -n --extensions="php,module,inc,install,test,profile,theme"
echo "phpmd for modules"
vendor/bin/phpmd defaults/standard/modules text defaults/standard/phpmd.xml "php,inc,module,theme,profile,install,test"
vendor/bin/phpmd defaults/standard/modules text defaults/standard/phpmd.xml --suffixes php,inc,module,theme,profile,install,test
echo "phpstan for modules"
vendor/bin/phpstan analyse defaults/standard/modules --level=2
echo "phpcs for tasks"
vendor/bin/phpcs src --standard="Drupal,DrupalPractice" -n --extensions="php,module,inc,install,test,profile,theme"
echo "phpmd for tasks"
vendor/bin/phpmd src text defaults/standard/phpmd.xml "php,inc,module,theme,profile,install,test"
vendor/bin/phpmd src text defaults/standard/phpmd.xml --suffixes php,inc,module,theme,profile,install,test
echo "phpstan for tasks"
vendor/bin/phpstan analyse src --level=2

Expand Down
4 changes: 2 additions & 2 deletions code-review.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ echo "-------------"
vendor/bin/phpcs defaults/standard/modules --standard="Drupal,DrupalPractice" -n --extensions="php,module,inc,install,test,profile,theme"
echo "Running PHPMD on modules"
echo "-------------"
vendor/bin/phpmd defaults/standard/modules text defaults/standard/phpmd.xml "php,inc,module,theme,profile,install,test"
vendor/bin/phpmd defaults/standard/modules text defaults/standard/phpmd.xml --suffixes php,inc,module,theme,profile,install,test
echo "Running PHPStan on modules"
echo "---------------"
vendor/bin/phpstan analyse defaults/standard/modules --level=2
Expand All @@ -24,7 +24,7 @@ echo "-------------"
vendor/bin/phpcs src --standard="Drupal,DrupalPractice" -n --extensions="php,module,inc,install,test,profile,theme"
echo "Running PHPMD on tasks"
echo "-------------"
vendor/bin/phpmd src text defaults/standard/phpmd.xml "php,inc,module,theme,profile,install,test"
vendor/bin/phpmd src text defaults/standard/phpmd.xml --suffixes php,inc,module,theme,profile,install,test
echo "Running PHPStan on tasks"
echo "---------------"
vendor/bin/phpstan analyse src --level=2
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"pear/http_request2": "^2.3",
"pear/versioncontrol_git": "@dev",
"phing/phing": "^2.14",
"phpmd/phpmd": "2.13",
"phpmd/phpmd": "^2.13",
"phpspec/prophecy-phpunit": "^2"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ phpcs:
# @see https://phpmd.org/
#
# These values are used in the defaults/build.xml template:
# $> phpmd ${phpmd.directories} ${phpmd.format} ${phpmd.rulesets} --suffixes=${phpmd.suffixes}
# $> phpmd ${phpmd.directories} ${phpmd.format} ${phpmd.rulesets} --suffixes ${phpmd.suffixes}
phpmd:
# Comma-separated list of directories to review.
directories: "${drupal.root}/modules/custom/,${drupal.root}/themes/custom/"
Expand Down
2 changes: 1 addition & 1 deletion defaults/install/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<exec command="vendor/bin/phpcs" logoutput="true" checkreturn="true" />

<!-- Run PHP Mess Detector. -->
<property name="phpmd.command" value="vendor/bin/phpmd ${phpmd.directories} ${phpmd.format} ${phpmd.rulesets} --suffixes=${phpmd.suffixes}" />
<property name="phpmd.command" value="vendor/bin/phpmd ${phpmd.directories} ${phpmd.format} ${phpmd.rulesets} --suffixes ${phpmd.suffixes}" />
<echo msg="$> ${phpmd.command}" />
<exec command="${phpmd.command}" logoutput="true" checkreturn="true" />

Expand Down