Merge pull request #35 from nextcloud/chore/release/v1.3.1

nextcloud · Sep 19, 2024 · e88acb0 · e88acb0
2 parents e2e6cb1 + 046865f
commit e88acb0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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 - 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

diff --git 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
@@ -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,
 		];
 	}
 }