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.

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

[TASK] Move php-cs-fixer to phive #851

Merged
merged 1 commit into from
Mar 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
/.gitignore export-ignore
/CODE_OF_CONDUCT.md export-ignore
/config/ export-ignore
/phive.xml export-ignore
/phpcs.xml.dist export-ignore
/psalm.baseline.xml export-ignore
/psalm.xml export-ignore
/tests/ export-ignore
/tools/ export-ignore
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
([#776](https://github.com/MyIntervals/emogrifier/pull/776))

### Changed
- Move the development tools to Phive
([#850](https://github.com/MyIntervals/emogrifier/pull/850))
- 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
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"symfony/css-selector": "^3.4 || ^4.3 || ^5.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.15.3",
"grogy/php-parallel-lint": "^1.1.0",
"phpmd/phpmd": "^2.7.0",
"phpunit/phpunit": "^6.5.14",
Expand Down Expand Up @@ -71,10 +70,10 @@
},
"scripts": {
"php:version": "php -v | grep -Po 'PHP\\s++\\K(?:\\d++\\.)*+\\d++(?:-\\w++)?+'",
"php:fix": "php-cs-fixer --config=config/php-cs-fixer.php fix config/ src/ tests/",
"php:fix": "./tools/php-cs-fixer --config=config/php-cs-fixer.php fix config/ src/ tests/",
"ci:php:lint": "parallel-lint config src tests",
"ci:php:sniff": "phpcs config src tests",
"ci:php:fixer": "php-cs-fixer --config=config/php-cs-fixer.php fix --dry-run -v --show-progress=dots --diff-format=udiff 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:psalm": "psalm --show-info=false",
"ci:tests:unit": "phpunit tests/",
Expand Down
4 changes: 4 additions & 0 deletions phive.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?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"/>
</phive>
1 change: 0 additions & 1 deletion psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
errorBaseline="./psalm.baseline.xml"
>
<projectFiles>
<directory name="config" />
<directory name="src" />
<directory name="tests" />
<ignoreFiles>
Expand Down
Binary file added tools/php-cs-fixer
Binary file not shown.