Skip to content

Commit

Permalink
[TASK] Move PHPUnit to Phive
Browse files Browse the repository at this point in the history
Part of #822
  • Loading branch information
oliverklee committed Jun 14, 2020
1 parent 87fbd2d commit 10f176f
Show file tree
Hide file tree
Showing 5 changed files with 70,544 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
## x.y.z

### Added
- Move more development tools to Phive
([#894](https://github.com/MyIntervals/emogrifier/pull/894))

### Changed
- Upgrade to PHPUnit 7.5
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
},
"require-dev": {
"php-parallel-lint/php-parallel-lint": "^1.2.0",
"phpunit/phpunit": "^7.5.20",
"slevomat/coding-standard": "^4.0.0",
"squizlabs/php_codesniffer": "^3.5.1",
"vimeo/psalm": "~3.2.12"
Expand Down Expand Up @@ -74,8 +73,8 @@
"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": "\"./tools/phpmd\" src text config/phpmd.xml",
"ci:php:psalm": "\"vendor/bin/psalm\" --show-info=false",
"ci:tests:unit": "\"vendor/bin/phpunit\" tests/",
"ci:tests:sof": "\"vendor/bin/phpunit\" tests/ --stop-on-failure",
"ci:tests:unit": "\"./tools/phpunit\"",
"ci:tests:sof": "\"./tools/phpunit\" --stop-on-failure",
"ci:tests": [
"@ci:tests:unit"
],
Expand Down
1 change: 1 addition & 0 deletions phive.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
<phive xmlns="https://phar.io/phive">
<phar name="php-cs-fixer" version="^2.16" installed="2.16.3" location="./tools/php-cs-fixer" copy="true"/>
<phar name="phpmd" version="^2.7" installed="2.7.0" location="./tools/phpmd" copy="true"/>
<phar name="phpunit" version="^7.5" installed="7.5.20" location="./tools/phpunit" copy="true"/>
</phive>
12 changes: 12 additions & 0 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
verbose="true">
<testsuites>
<testsuite name="default">
<directory suffix="Test.php">tests</directory>
</testsuite>
</testsuites>
</phpunit>
Loading

0 comments on commit 10f176f

Please sign in to comment.