README.md

@@ -29,13 +29,16 @@
     ```
 2. Add it to your `ecs.php` file:
     ```php
-    use CodelyTv\CodingStyle\CodelyRules;
+    use CodelyTv\CodingStyle;
     use Symplify\EasyCodingStandard\Config\ECSConfig;
 
     return function (ECSConfig $ecsConfig): void {
         $ecsConfig->paths([__DIR__ . '/src',]);
 
-        $ecsConfig->sets([CodelyRules::CODING_STYLE]);
+        $ecsConfig->sets([CodingStyle::DEFAULT]);
+
+        // Or this if you prefer to have the code aligned
+        // $ecsConfig->sets([CodingStyle::ALIGNED]);
     };
     ```
 3. Execute it:

composer.json

@@ -4,9 +4,15 @@
     "type": "library",
     "keywords": ["static analysis", "code style"],
     "license": "AGPL-3.0-or-later",
+    "authors": [
+        {
+            "name": "Codely",
+            "homepage": "https://codely.com"
+        }
+    ],
     "autoload": {
         "psr-4": {
-            "CodelyTv\\CodingStyle\\": "src/"
+            "CodelyTv\\": "src/"
         }
     },
     "require": {

ecs.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-use CodelyTv\CodingStyle\CodelyRules;
+use CodelyTv\CodingStyle;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 
 return function (ECSConfig $ecsConfig): void {
 	$ecsConfig->paths([__DIR__ . '/src',]);
 
-    $ecsConfig->sets([CodelyRules::CODING_STYLE]);
+    $ecsConfig->sets([CodingStyle::DEFAULT]);
 };

src/CodingStyle.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CodelyTv;
+
+final class CodingStyle
+{
+	public const DEFAULT = __DIR__ . '/coding_style.php';
+	public const ALIGNED = __DIR__ . '/coding_style_aligned.php';
+}

src/coding_style.php

@@ -12,7 +12,6 @@
 use PhpCsFixer\Fixer\Casing\NativeFunctionTypeDeclarationCasingFixer;
 use PhpCsFixer\Fixer\CastNotation\CastSpacesFixer;
 use PhpCsFixer\Fixer\ClassNotation\FinalClassFixer;
-use PhpCsFixer\Fixer\ClassNotation\FinalPublicMethodForAbstractClassFixer;
 use PhpCsFixer\Fixer\ClassNotation\NoBlankLinesAfterClassOpeningFixer;
 use PhpCsFixer\Fixer\ClassNotation\NoNullPropertyInitializationFixer;
 use PhpCsFixer\Fixer\ClassNotation\NoUnneededFinalMethodFixer;
@@ -46,6 +45,7 @@
 use PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer;
 use PhpCsFixer\Fixer\Strict\StrictComparisonFixer;
 use PhpCsFixer\Fixer\StringNotation\SingleQuoteFixer;
+use PhpCsFixer\Fixer\Whitespace\ArrayIndentationFixer;
 use PhpCsFixer\Fixer\Whitespace\StatementIndentationFixer;
 use PhpCsFixer\Fixer\Whitespace\TypeDeclarationSpacesFixer;
 use PhpCsFixer\Fixer\Whitespace\TypesSpacesFixer;
@@ -66,14 +66,14 @@
 		NoLeadingImportSlashFixer::class,
 		// Arrays
 		TrimArraySpacesFixer::class,
+		ArrayIndentationFixer::class,
 		// Blank lines
 		BlankLineAfterStrictTypesFixer::class,
 		NoBlankLinesAfterClassOpeningFixer::class,
 		// Spacing
 		SingleLineEmptyBodyFixer::class,
 		CastSpacesFixer::class,
 		TypeDeclarationSpacesFixer::class,
-		TypesSpacesFixer::class,
 		// Casing
 		ClassReferenceNameCasingFixer::class,
 		LowercaseStaticReferenceFixer::class,
@@ -82,7 +82,6 @@
 		NativeFunctionTypeDeclarationCasingFixer::class,
 		// Architecture
 		FinalClassFixer::class,
-		FinalPublicMethodForAbstractClassFixer::class,
 		ProtectedToPrivateFixer::class,
 		VisibilityRequiredFixer::class,
 		DateTimeImmutableFixer::class,
@@ -115,6 +114,7 @@
 		StatementIndentationFixer::class,
 	]);
 
+	$ecsConfig->ruleWithConfiguration(TypesSpacesFixer::class, ['space' => 'single', 'space_multiple_catch' => 'single']);
 	$ecsConfig->ruleWithConfiguration(ArraySyntaxFixer::class, ['syntax' => 'short']);
 	$ecsConfig->ruleWithConfiguration(LineLengthFixer::class, [LineLengthFixer::LINE_LENGTH => 120]);
 	$ecsConfig->ruleWithConfiguration(

src/coding_style_aligned.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Fixer\Operator\BinaryOperatorSpacesFixer;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
+
+return static function (ECSConfig $ecsConfig): void {
+	$ecsConfig->ruleWithConfiguration(
+		BinaryOperatorSpacesFixer::class,
+		[
+			'operators' =>
+			[
+				'=' => 'align',
+				'=>' => 'align',
+			],
+		]
+	);
+
+	$ecsConfig->sets([__DIR__ . '/coding_style.php']);
+};