Skip to content

Commit 732ca23

Browse files
committed
Merge branch 'release/2.1.0'
2 parents 48bc652 + 6b5390d commit 732ca23

File tree

9 files changed

+784
-251
lines changed

9 files changed

+784
-251
lines changed

.php_cs.dist

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,16 @@ $finder = Finder::create()
2222
->append([__FILE__])
2323
;
2424

25+
$overrides = [
26+
'binary_operator_spaces' => ['default' => 'single_space'],
27+
];
28+
2529
$options = [
26-
'finder' => $finder,
30+
'finder' => $finder,
2731
'cacheFile' => 'build/.php_cs.cache',
2832
];
2933

30-
return Factory::create(new Nexus73(), [], $options)->forLibrary(
34+
return Factory::create(new Nexus73(), $overrides, $options)->forLibrary(
3135
'NexusPHP CS Config',
3236
'John Paul E. Balandan, CPA',
3337

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ All notable changes to this library will be documented in this file:
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [v2.1.0](https://github.com/NexusPHP/cs-config/compare/v2.0.2..v2.0.2) - 2020-12-08
9+
10+
### Added
11+
12+
- Added support for new fixers in [v2.17.0 Desert Beast](https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/tag/v2.17.0).
13+
- Added `Nexus74` ruleset for support on `use_arrow_functions` fixer.
14+
- Added testing for deprecated fixers.
15+
16+
### Changed
17+
18+
- `phpdoc_line_span` has been set to single for all classy elements.
19+
- `binary_operator_spaces` has been set to its default `single_space` for use in this library.
20+
821
## [v2.0.2](https://github.com/NexusPHP/cs-config/compare/v2.0.1..v2.0.2) - 2020-12-01
922

1023
### Fixed

src/Factory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function forLibrary(string $library, string $author, string $email = '',
139139

140140
return $this->invoke([
141141
'header_comment' => [
142-
'header' => trim($header),
142+
'header' => trim($header),
143143
'comment_type' => 'PHPDoc',
144144
],
145145
]);

src/Ruleset/AbstractRuleset.php

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,33 +43,25 @@ abstract class AbstractRuleset implements RulesetInterface
4343
*/
4444
protected $autoActivateIsRiskyAllowed = false;
4545

46-
/**
47-
* {@inheritdoc}
48-
*/
46+
/** @inheritDoc */
4947
final public function getName(): string
5048
{
5149
return $this->name ?? trim(strrchr(self::class, '\\'), '\\');
5250
}
5351

54-
/**
55-
* {@inheritdoc}
56-
*/
52+
/** @inheritDoc */
5753
final public function getRules(): array
5854
{
5955
return $this->rules;
6056
}
6157

62-
/**
63-
* {@inheritdoc}
64-
*/
58+
/** @inheritDoc */
6559
final public function getRequiredPHPVersion(): int
6660
{
6761
return $this->requiredPHPVersion;
6862
}
6963

70-
/**
71-
* {@inheritdoc}
72-
*/
64+
/** @inheritDoc */
7365
final public function willAutoActivateIsRiskyAllowed(): bool
7466
{
7567
return $this->autoActivateIsRiskyAllowed;

src/Ruleset/Nexus73.php

Lines changed: 259 additions & 222 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)