Merge branch 'release/0.1.4'

CPS-IT · Oct 2, 2023 · c111ca1 · c111ca1
2 parents b6e0858 + 8712bf5
commit c111ca1
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 42 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -25,7 +25,7 @@
 
 $config
     ->setRules([
-        '@PSR2' => true,
+        '@PER-CS' => true,
         '@Symfony' => true,
         'global_namespace_import' => [
             'import_classes' => true,

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -29,6 +29,14 @@ composer lint
 composer lint:composer
 composer lint:editorconfig
 composer lint:php
+
+# Fix all CGL issues
+ddev composer fix
+
+# Fix specific CGL issues
+composer fix:composer
+composer fix:editorconfig
+composer fix:php
 ```
 
 ## Run static code analysis

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
 	"require-dev": {
 		"armin/editorconfig-cli": "^1.5",
 		"ergebnis/composer-normalize": "^2.30",
-		"friendsofphp/php-cs-fixer": "^3.14",
+		"friendsofphp/php-cs-fixer": "^3.29",
 		"phpstan/extension-installer": "^1.2",
 		"phpstan/phpstan": "^1.10",
 		"phpstan/phpstan-phpunit": "^1.3",
@@ -51,15 +51,22 @@
 		"sort-packages": true
 	},
 	"scripts": {
+		"fix": [
+			"@fix:composer",
+			"@fix:editorconfig",
+			"@fix:php"
+		],
+		"fix:composer": "@composer normalize",
+		"fix:editorconfig": "@lint:editorconfig --fix",
+		"fix:php": "php-cs-fixer fix",
 		"lint": [
 			"@lint:composer",
-			"@lint:editorconfig:fix",
+			"@lint:editorconfig",
 			"@lint:php"
 		],
-		"lint:composer": "@composer normalize",
+		"lint:composer": "@fix:composer --dry-run",
 		"lint:editorconfig": "ec",
-		"lint:editorconfig:fix": "@lint:editorconfig --fix",
-		"lint:php": "php-cs-fixer fix",
+		"lint:php": "@fix:php --dry-run",
 		"migration": [
 			"@migration:rector"
 		],

diff --git a/composer.lock b/composer.lock
diff --git a/docs/screenshot.png b/docs/screenshot.png
diff --git a/renovate.json b/renovate.json
@@ -3,5 +3,8 @@
 	"extends": [
 		"local>CPS-IT/renovate-config",
 		"local>CPS-IT/renovate-config:git-flow"
+	],
+	"assignees": [
+		"eliashaeussler"
 	]
 }
diff --git a/src/Diff/DiffObject.php b/src/Diff/DiffObject.php
@@ -41,8 +41,7 @@ public function __construct(
         private readonly ?string $originalPath,
         private readonly ?string $destinationPath,
         private readonly array $chunks,
-    ) {
-    }
+    ) {}
 
     public function getMode(): DiffMode
     {

diff --git a/src/Diff/DiffResult.php b/src/Diff/DiffResult.php
@@ -38,8 +38,7 @@ public function __construct(
         private readonly array $diffObjects,
         private readonly string $patch,
         private readonly Outcome $outcome,
-    ) {
-    }
+    ) {}
 
     /**
      * @return list<DiffObject>

diff --git a/src/Diff/Outcome.php b/src/Diff/Outcome.php
@@ -34,8 +34,7 @@ final class Outcome
     private function __construct(
         private readonly bool $successful,
         private readonly ?string $message = null,
-    ) {
-    }
+    ) {}
 
     public static function successful(): self
     {

diff --git a/src/Exception/Exception.php b/src/Exception/Exception.php
@@ -29,6 +29,4 @@
  * @author Elias Häußler <e.haeussler@familie-redlich.de>
  * @license GPL-3.0-or-later
  */
-abstract class Exception extends \Exception
-{
-}
+abstract class Exception extends \Exception {}
diff --git a/src/Migrator.php b/src/Migrator.php
@@ -34,8 +34,7 @@ final class Migrator
     public function __construct(
         private readonly Diff\Differ\Differ $differ = new Diff\Differ\GitDiffer(),
         private bool $performMigrations = true,
-    ) {
-    }
+    ) {}
 
     /**
      * @throws Exception\PatchFailureException

diff --git a/src/Resource/Collector/ArrayCollector.php b/src/Resource/Collector/ArrayCollector.php
@@ -39,8 +39,7 @@ final class ArrayCollector implements CollectorInterface
      */
     public function __construct(
         private readonly array $collection,
-    ) {
-    }
+    ) {}
 
     public function collect(): array
     {