Skip to content

Commit

Permalink
Merge pull request #320 from ergebnis/fix/option
Browse files Browse the repository at this point in the history
Fix: Configure rules in implementations of ExplicitRuleSet using every non-deprecated configuration option
  • Loading branch information
ergebnis-bot committed Dec 26, 2020
2 parents 8754af0 + d5e1113 commit 1806810
Show file tree
Hide file tree
Showing 11 changed files with 1,784 additions and 65 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`2.9.0...main`][2.9.0...main].
For a full diff see [`2.10.0...main`][2.10.0...main].

## [`2.10.0`][2.10.0]

For a full diff see [`2.9.0...2.10.0`][2.9.0...2.10.0].

### Added

Expand All @@ -16,6 +20,7 @@ For a full diff see [`2.9.0...main`][2.9.0...main].

* Required only implementations of `Config\RuleSet\ExplicitRuleSet` not to configure any rules for rule sets ([#313]), by [@localheinz]
* Required implementations of `Config\RuleSet\ExplicitRuleSet` to configure non-deprecated rules that are configurable with an explicit configuration when enabled ([#314]), by [@localheinz]
* Required implementations of `Config\RuleSet\ExplicitRuleSet` to configure non-deprecated rules that are configurable with all non-deprecated configuration options when enabled ([#320]), by [@localheinz]

### Fixed

Expand Down Expand Up @@ -236,6 +241,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[2.7.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.7.0
[2.8.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.8.0
[2.9.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.9.0
[2.10.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.10.0

[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
Expand All @@ -258,7 +264,8 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[2.6.1...2.7.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.6.1...2.7.0
[2.7.0...2.8.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.7.0...2.8.0
[2.8.0...2.9.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.8.0...2.9.0
[2.9.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.9.0...main
[2.9.0...2.10.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.9.0...2.10.0
[2.10.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.10.0...main

[#3]: https://github.com/ergebnis/php-cs-fixer-config/pull/3
[#14]: https://github.com/ergebnis/php-cs-fixer-config/pull/14
Expand Down Expand Up @@ -311,6 +318,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[#313]: https://github.com/ergebnis/php-cs-fixer-config/pull/313
[#314]: https://github.com/ergebnis/php-cs-fixer-config/pull/314
[#319]: https://github.com/ergebnis/php-cs-fixer-config/pull/319
[#320]: https://github.com/ergebnis/php-cs-fixer-config/pull/320

[@dependabot]: https://github.com/apps/dependabot
[@linuxjuggler]: https://github.com/linuxjuggler
Expand Down
10 changes: 10 additions & 0 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,13 @@ parameters:
count: 1
path: test/Unit/RuleSet/AbstractRuleSetTestCase.php

-
message: "#^Parameter \\#1 \\$data of static method Ergebnis\\\\PhpCsFixer\\\\Config\\\\Test\\\\Unit\\\\RuleSet\\\\AbstractRuleSetTestCase\\:\\:sort\\(\\) expects array, array\\|false given\\.$#"
count: 1
path: test/Unit/RuleSet/ExplicitRuleSetTestCase.php

-
message: "#^Parameter \\#1 \\$arr1 of function array_diff_key expects array, array\\|false given\\.$#"
count: 1
path: test/Unit/RuleSet/ExplicitRuleSetTestCase.php

5 changes: 5 additions & 0 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,9 @@
<code>registerBuiltInFixers</code>
</InternalMethod>
</file>
<file src="test/Unit/RuleSet/ExplicitRuleSetTestCase.php">
<MissingClosureReturnType occurrences="1">
<code>static function (FixerConfiguration\FixerOptionInterface $fixerOption) {</code>
</MissingClosureReturnType>
</file>
</files>
Loading

0 comments on commit 1806810

Please sign in to comment.