Skip to content

Commit

Permalink
Merge pull request #314 from ergebnis/dependabot/composer/phpunit/php…
Browse files Browse the repository at this point in the history
…unit-7.5.20
  • Loading branch information
dependabot-preview[bot] authored and localheinz committed Jan 9, 2020
2 parents 30b5c19 + f056612 commit a2137b8
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 9 deletions.
23 changes: 21 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

For a full diff see [`2.2.0...master`][2.2.0...master].
For a full diff see [`2.2.1...master`][2.2.1...master].

## [`2.2.1`][2.2.1]

For a full diff see [`2.2.0...2.2.1`][2.2.0...2.2.1].

### Changed

* Removed dependency on `ergebnis/composer-json-normalizer` ([#316]), by [@localheinz]

## [`2.2.0`][2.2.0]

For a full diff see [`2.1.2...2.2.0`][2.1.2...2.2.0].

### Added

* Added `--diff` option ([#303]), by [@localheinz]

## [`2.2.0`][2.2.0]

Expand Down Expand Up @@ -293,6 +309,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.1.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.1.1
[2.1.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.1.2
[2.2.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.2.0
[2.2.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.2.1

[81bc3a8...0.1.0]: https://github.com/ergebnis/composer-normalize/compare/81bc3a8...0.1.0
[0.1.0...0.2.0]: https://github.com/ergebnis/composer-normalize/compare/0.1.0...0.2.0
Expand All @@ -319,7 +336,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.1.0...2.1.1]: https://github.com/ergebnis/composer-normalize/compare/2.1.0...2.1.1
[2.1.1...2.1.2]: https://github.com/ergebnis/composer-normalize/compare/2.1.1...2.1.2
[2.1.2...2.2.0]: https://github.com/ergebnis/composer-normalize/compare/2.1.2...2.2.0
[2.2.0...master]: https://github.com/ergebnis/composer-normalize/compare/2.2.0...master
[2.2.0...2.2.1]: https://github.com/ergebnis/composer-normalize/compare/2.2.0...2.2.1
[2.2.1...master]: https://github.com/ergebnis/composer-normalize/compare/2.2.1...master

[#1]: https://github.com/ergebnis/composer-normalize/pull/1
[#2]: https://github.com/ergebnis/composer-normalize/pull/2
Expand Down Expand Up @@ -360,6 +378,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#297]: https://github.com/ergebnis/composer-normalize/pull/297
[#301]: https://github.com/ergebnis/composer-normalize/pull/301
[#303]: https://github.com/ergebnis/composer-normalize/pull/303
[#316]: https://github.com/ergebnis/composer-normalize/pull/316

[@ergebnis]: https://github.com/ergebnis
[@localheinz]: https://github.com/localheinz
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"phpstan/phpstan-deprecation-rules": "~0.12.1",
"phpstan/phpstan-phpunit": "~0.12.5",
"phpstan/phpstan-strict-rules": "~0.12.1",
"phpunit/phpunit": "^7.5.19",
"phpunit/phpunit": "^7.5.20",
"psalm/plugin-phpunit": "~0.8.0",
"symfony/filesystem": "^4.4.1",
"vimeo/psalm": "^3.8.2"
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a2137b8

Please sign in to comment.