Skip to content

Commit

Permalink
Merge branch 'release/2.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
paulbalandan committed Dec 8, 2020
2 parents 48bc652 + 6b5390d commit 732ca23
Show file tree
Hide file tree
Showing 9 changed files with 784 additions and 251 deletions.
8 changes: 6 additions & 2 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,16 @@ $finder = Finder::create()
->append([__FILE__])
;

$overrides = [
'binary_operator_spaces' => ['default' => 'single_space'],
];

$options = [
'finder' => $finder,
'finder' => $finder,
'cacheFile' => 'build/.php_cs.cache',
];

return Factory::create(new Nexus73(), [], $options)->forLibrary(
return Factory::create(new Nexus73(), $overrides, $options)->forLibrary(
'NexusPHP CS Config',
'John Paul E. Balandan, CPA',
'paulbalandan@gmail.com',
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ All notable changes to this library will be documented in this file:
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v2.1.0](https://github.com/NexusPHP/cs-config/compare/v2.0.2..v2.0.2) - 2020-12-08

### Added

- Added support for new fixers in [v2.17.0 Desert Beast](https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/tag/v2.17.0).
- Added `Nexus74` ruleset for support on `use_arrow_functions` fixer.
- Added testing for deprecated fixers.

### Changed

- `phpdoc_line_span` has been set to single for all classy elements.
- `binary_operator_spaces` has been set to its default `single_space` for use in this library.

## [v2.0.2](https://github.com/NexusPHP/cs-config/compare/v2.0.1..v2.0.2) - 2020-12-01

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion src/Factory.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function forLibrary(string $library, string $author, string $email = '',

return $this->invoke([
'header_comment' => [
'header' => trim($header),
'header' => trim($header),
'comment_type' => 'PHPDoc',
],
]);
Expand Down
16 changes: 4 additions & 12 deletions src/Ruleset/AbstractRuleset.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,33 +43,25 @@ abstract class AbstractRuleset implements RulesetInterface
*/
protected $autoActivateIsRiskyAllowed = false;

/**
* {@inheritdoc}
*/
/** @inheritDoc */
final public function getName(): string
{
return $this->name ?? trim(strrchr(self::class, '\\'), '\\');
}

/**
* {@inheritdoc}
*/
/** @inheritDoc */
final public function getRules(): array
{
return $this->rules;
}

/**
* {@inheritdoc}
*/
/** @inheritDoc */
final public function getRequiredPHPVersion(): int
{
return $this->requiredPHPVersion;
}

/**
* {@inheritdoc}
*/
/** @inheritDoc */
final public function willAutoActivateIsRiskyAllowed(): bool
{
return $this->autoActivateIsRiskyAllowed;
Expand Down
481 changes: 259 additions & 222 deletions src/Ruleset/Nexus73.php

Large diffs are not rendered by default.

Loading

0 comments on commit 732ca23

Please sign in to comment.