Update PHP CS Fixer and custom fixers (#24)

kubawerlos · Jan 21, 2022 · c852cb1 · c852cb1
1 parent aa57bd3
commit c852cb1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -10,8 +10,8 @@
     ],
     "require": {
         "php": "^8.0",
-        "friendsofphp/php-cs-fixer": "^3.2.1",
-        "kubawerlos/php-cs-fixer-custom-fixers": "^3.6.0"
+        "friendsofphp/php-cs-fixer": "^3.5.0",
+        "kubawerlos/php-cs-fixer-custom-fixers": "^3.7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.10"

diff --git a/src/Builder/Rules.php b/src/Builder/Rules.php
@@ -20,7 +20,7 @@
 final class Rules
 {
     /** @var array<string, mixed> */
-    private $rules = [];
+    private array $rules = [];
 
     public function __construct()
     {

diff --git a/src/Rules/LibraryRules.php b/src/Rules/LibraryRules.php
@@ -18,8 +18,7 @@
  */
 final class LibraryRules implements RulesInterface
 {
-    /** @var string */
-    private $header;
+    private string $header;
 
     public function __construct(string $name, string $author, int $year)
     {
@@ -114,6 +113,7 @@ public function getRules(): array
             'function_typehint_space' => true,
             'general_phpdoc_annotation_remove' => false,
             'general_phpdoc_tag_rename' => true,
+            'get_class_to_class_keyword' => true,
             'global_namespace_import' => false,
             'group_import' => false,
             'header_comment' => [
@@ -370,6 +370,7 @@ public function getRules(): array
             Fixer\NoSuperfluousConcatenationFixer::name() => [
                 'allow_preventing_trailing_spaces' => true,
             ],
+            Fixer\NoTrailingCommaInSinglelineFixer::name() => true,
             Fixer\NoUselessCommentFixer::name() => true,
             Fixer\NoUselessDirnameCallFixer::name() => true,
             Fixer\NoUselessDoctrineRepositoryCommentFixer::name() => true,

diff --git a/src/Rules/ProjectRules.php b/src/Rules/ProjectRules.php
@@ -94,6 +94,7 @@ public function getRules(): array
             'function_typehint_space' => true,
             'general_phpdoc_annotation_remove' => false,
             'general_phpdoc_tag_rename' => true,
+            'get_class_to_class_keyword' => true,
             'global_namespace_import' => false,
             'group_import' => false,
             'header_comment' => false,
@@ -347,6 +348,7 @@ public function getRules(): array
             Fixer\NoSuperfluousConcatenationFixer::name() => [
                 'allow_preventing_trailing_spaces' => true,
             ],
+            Fixer\NoTrailingCommaInSinglelineFixer::name() => true,
             Fixer\NoUselessCommentFixer::name() => true,
             Fixer\NoUselessDirnameCallFixer::name() => true,
             Fixer\NoUselessDoctrineRepositoryCommentFixer::name() => true,