Skip to content

Commit

Permalink
[TASK] Move PHPMD to Phive (#852)
Browse files Browse the repository at this point in the history
Also regenerate `phive.xml` to use the default formatting.

Part of #822
  • Loading branch information
oliverklee authored Mar 28, 2020
1 parent f4287e8 commit 88bc3e0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).

### Changed
- Move the development tools to Phive
([#850](https://github.com/MyIntervals/emogrifier/pull/850))
([#850](https://github.com/MyIntervals/emogrifier/pull/850),
[#851](https://github.com/MyIntervals/emogrifier/pull/851))
- Switch the parallel linting to a maintained fork
([#842](https://github.com/MyIntervals/emogrifier/pull/842))
- Move continuous integration from Travis CI to GitHub actions
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
},
"require-dev": {
"grogy/php-parallel-lint": "^1.1.0",
"phpmd/phpmd": "^2.7.0",
"phpunit/phpunit": "^6.5.14",
"psalm/plugin-phpunit": "^0.5.8",
"slevomat/coding-standard": "^4.0.0",
Expand Down Expand Up @@ -74,7 +73,7 @@
"ci:php:lint": "parallel-lint config src tests",
"ci:php:sniff": "phpcs config src tests",
"ci:php:fixer": "./tools/php-cs-fixer --config=config/php-cs-fixer.php fix --dry-run -v --show-progress=dots --diff-format=udiff config/ src/ tests/",
"ci:php:md": "phpmd src text config/phpmd.xml",
"ci:php:md": "./tools/phpmd src text config/phpmd.xml",
"ci:php:psalm": "psalm --show-info=false",
"ci:tests:unit": "phpunit tests/",
"ci:tests:sof": "phpunit tests/ --stop-on-failure",
Expand Down
3 changes: 2 additions & 1 deletion phive.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="php-cs-fixer" version="^2.16" installed="2.16.1" location="./tools/php-cs-fixer" copy="true"/>
<phar name="php-cs-fixer" version="^2.16" installed="2.16.1" location="./tools/php-cs-fixer" copy="true"/>
<phar name="phpmd" version="^2.7" installed="2.7.0" location="./tools/phpmd" copy="true"/>
</phive>
Binary file added tools/phpmd
Binary file not shown.

0 comments on commit 88bc3e0

Please sign in to comment.