Skip to content

Commit

Permalink
Merge pull request #14 from ergebnis/fix/replace
Browse files Browse the repository at this point in the history
Fix: Remove inappropriate replace configuration
  • Loading branch information
localheinz committed Dec 15, 2019
2 parents 6c2151c + 80d73a2 commit 4f679ed
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
18 changes: 15 additions & 3 deletions CHANGELOG.md
Expand Up @@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`1.1.0...master`][1.1.0...master].
For a full diff see [`1.1.1...master`][1.1.1...master].

## [`1.1.1`][1.1.1]

For a full diff see [`1.1.0...1.1.1`][1.1.0...1.1.1].

### Fixed

* Removed an inappropriate `replace` configuration from `composer.json` ([#14]), by [@localheinz]

## [`1.1.0`][1.1.0]

Expand All @@ -21,12 +29,16 @@ For a full diff see [`1.0.0...1.1.0`][1.0.0...1.1.0].
For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].

[1.0.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/1.0.0
[1.1.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/1.2.0
[1.1.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/1.1.0
[1.1.1]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/1.1.1

[d899e77...1.0.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/d899e77...1.0.0
[1.0.0...1.1.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.0.0...1.1.0
[1.1.0...master]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.1.0...master
[1.1.0...1.1.1]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.1.0...1.1.1
[1.1.1...master]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.1.1...master

[#3]: https://github.com/ergebnis/php-cs-fixer-config/pull/3
[#14]: https://github.com/ergebnis/php-cs-fixer-config/pull/14

[@linuxjuggler]: https://github.com/linuxjuggler
[@localheinz]: https://github.com/localheinz
3 changes: 0 additions & 3 deletions composer.json
Expand Up @@ -14,9 +14,6 @@
"php": "^7.2",
"friendsofphp/php-cs-fixer": "~2.16.0"
},
"replace": {
"localheinz/php-cs-fixer-config": "*"
},
"require-dev": {
"ergebnis/phpstan-rules": "~0.14.0",
"ergebnis/test-util": "~0.9.0",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

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

0 comments on commit 4f679ed

Please sign in to comment.