Skip to content

Commit

Permalink
Merge pull request #35 from nextcloud/chore/release/v1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
provokateurin authored Sep 19, 2024
2 parents e2e6cb1 + 046865f commit e88acb0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog
All notable changes to this project will be documented in this file.

## 1.3.1 - 2024-09-19
### Fixed
* Removed misbehaving `ErickSkrauch/blank_line_before_return` and `ErickSkrauch/line_break_after_statements` rules

## 1.3.0 - 2024-09-18
### Changed
* `trailing_comma_in_multiline`: Add a trailing comma to multline function parameters
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"require": {
"php": "^7.3|^8.0",
"php-cs-fixer/shim": "^3.17",
"kubawerlos/php-cs-fixer-custom-fixers": "^3.22",
"erickskrauch/php-cs-fixer-custom-fixers": "^1.3"
"kubawerlos/php-cs-fixer-custom-fixers": "^3.22"
},
"license": "MIT",
"authors": [
Expand Down
3 changes: 0 additions & 3 deletions src/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ public function __construct($name = 'default') {
parent::__construct($name);
$this->setIndent("\t");
$this->registerCustomFixers(new PhpCsFixerCustomFixers\Fixers());
$this->registerCustomFixers(new \ErickSkrauch\PhpCsFixer\Fixers());
}

public function getRules() : array {
Expand Down Expand Up @@ -79,8 +78,6 @@ public function getRules() : array {
],
'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
PhpCsFixerCustomFixers\Fixer\MultilinePromotedPropertiesFixer::name() => true,
'ErickSkrauch/blank_line_before_return' => true,
'ErickSkrauch/line_break_after_statements' => true,
];
}
}

0 comments on commit e88acb0

Please sign in to comment.