From acbb837b526bbd604e206fdf11a597ca81a502d7 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Thu, 19 Sep 2024 10:51:49 +0200 Subject: [PATCH 1/2] Revert "feat: Add blank lines before returns and after control statements" This reverts commit abb6d364e5afcc6951d9af0ee8394b85da013b33. Signed-off-by: provokateurin --- CHANGELOG.md | 4 ++++ composer.json | 3 +-- src/Config.php | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1c17d5..730ee57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this project will be documented in this file. +## 1.3.1 - TBA +### 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 diff --git a/composer.json b/composer.json index f8ac7ca..f0e2091 100644 --- a/composer.json +++ b/composer.json @@ -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": [ diff --git a/src/Config.php b/src/Config.php index 9bf8947..8acf85d 100644 --- a/src/Config.php +++ b/src/Config.php @@ -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 { @@ -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, ]; } } From 046865f0b91e4ff5784a189a51050857450aad30 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Thu, 19 Sep 2024 10:53:55 +0200 Subject: [PATCH 2/2] chore(release): v1.3.1 Signed-off-by: provokateurin --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 730ee57..62c2a85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog All notable changes to this project will be documented in this file. -## 1.3.1 - TBA +## 1.3.1 - 2024-09-19 ### Fixed * Removed misbehaving `ErickSkrauch/blank_line_before_return` and `ErickSkrauch/line_break_after_statements` rules