Skip to content

Commit

Permalink
Merge pull request #542 from ergebnis/feature/php74
Browse files Browse the repository at this point in the history
Enhancement: Use `Php74` rule set
  • Loading branch information
localheinz committed Jan 14, 2022
2 parents bb68471 + 1763e8c commit 50d3d6d
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .php-cs-fixer.php
Expand Up @@ -26,7 +26,7 @@

$license->save();

$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php73($license->header()));
$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php74($license->header()));

$config->getFinder()
->exclude([
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Expand Up @@ -12,6 +12,10 @@ For a full diff see [`3.4.0...main`][3.4.0...main].

* Dropped support for PHP 7.3 ([#540]), by [@localheinz]

### Removed

* Removed `Php73` rule set ([#543]), by [@localheinz]

## [`3.4.0`][3.4.0]

For a full diff see [`3.3.0...3.4.0`][3.3.0...3.4.0].
Expand Down Expand Up @@ -550,6 +554,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[#521]: https://github.com/ergebnis/php-cs-fixer-config/pull/521
[#527]: https://github.com/ergebnis/php-cs-fixer-config/pull/527
[#40]: https://github.com/ergebnis/php-cs-fixer-config/pull/540
[#543]: https://github.com/ergebnis/php-cs-fixer-config/pull/543

[@dependabot]: https://github.com/apps/dependabot
[@linuxjuggler]: https://github.com/linuxjuggler
Expand Down
2 changes: 0 additions & 2 deletions src/RuleSet/AbstractRuleSet.php
Expand Up @@ -119,14 +119,12 @@ abstract class AbstractRuleSet implements RuleSet
'var',
'version',
];

protected string $name = '';

/**
* @var array<string, array|bool>
*/
protected array $rules = [];

protected int $targetPhpVersion = 0;

final public function __construct(?string $header = null)
Expand Down
1 change: 0 additions & 1 deletion test/Double/Config/RuleSet/DummyRuleSet.php
Expand Up @@ -23,7 +23,6 @@ final class DummyRuleSet implements Config\RuleSet
* @var array<string, array|bool>
*/
private array $rules;

private int $phpVersion;

/**
Expand Down
3 changes: 0 additions & 3 deletions test/Unit/RuleSet/AbstractRuleSetTestCase.php
Expand Up @@ -123,11 +123,8 @@ abstract class AbstractRuleSetTestCase extends Framework\TestCase
'var',
'version',
];

protected string $name;

protected array $rules;

protected int $targetPhpVersion;

final public function testDefaults(): void
Expand Down

0 comments on commit 50d3d6d

Please sign in to comment.