Add class_definition

realodix · Aug 1, 2024 · 0e4c5d7 · 0e4c5d7
1 parent d9a8b87
commit 0e4c5d7
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 2 deletions.
diff --git a/src/RuleSet/Sets/Relax.php b/src/RuleSet/Sets/Relax.php
@@ -62,6 +62,7 @@ public function mainRules(): array
                 'default' => 'single_space',
                 'operators' => ['=>' => 'at_least_single_space'],
             ],
+            'class_definition' => ['inline_constructor_arguments' => false, 'space_before_parenthesis' => true],
             'braces_position' => ['anonymous_classes_opening_brace' => 'next_line_unless_newline_at_signature_end'],
             'function_declaration' => ['closure_fn_spacing' => 'none'],
             'method_argument_space' => ['on_multiline' => 'ignore', 'after_heredoc' => true],

diff --git a/src/RuleSet/Sets/RelaxPlus.php b/src/RuleSet/Sets/RelaxPlus.php
@@ -35,6 +35,7 @@ public function mainRules(): array
             'ternary_to_null_coalescing' => true,
 
             // Control Structure
+            'class_definition' => ['single_line' => true, 'space_before_parenthesis' => true],
             'no_superfluous_elseif' => true,
 
             // Cleanup

diff --git a/tests/Fixtures/Ruleset/relax-commonbox_actual.php b/tests/Fixtures/Ruleset/relax-commonbox_actual.php
@@ -87,7 +87,13 @@ protected function bar() {}
 class  ClassDefinition  extends  Bar  implements  Baz,  BarBaz  {}
 final  class  ClassDefinitionFinal  extends  Bar  implements  Baz,  BarBaz  {}
 trait  ClassDefinitionTrait  {}
-$foo = new  class  extends  Bar  implements  Baz,  BarBaz {};
+interface Bar extends
+    Bar, BarBaz, FooBarBaz {}
+$space_before_parenthesis = new class{};
+$inline_constructor_arguments= new class(
+    $bar,
+    $baz
+) {};
 
 /**
  * ordered_interfaces

diff --git a/tests/Fixtures/Ruleset/relax-commonbox_expected.php b/tests/Fixtures/Ruleset/relax-commonbox_expected.php
@@ -90,7 +90,13 @@ protected function bar() {}
 class ClassDefinition extends Bar implements BarBaz, Baz {}
 final class ClassDefinitionFinal extends Bar implements BarBaz, Baz {}
 trait ClassDefinitionTrait {}
-$foo = new class extends Bar implements BarBaz, Baz {};
+interface Bar extends
+    Bar, BarBaz, FooBarBaz {}
+$space_before_parenthesis = new class {};
+$inline_constructor_arguments = new class (
+    $bar,
+    $baz,
+) {};
 
 /**
  * ordered_interfaces

diff --git a/tests/Fixtures/Ruleset/relaxplus_actual.php b/tests/Fixtures/Ruleset/relaxplus_actual.php
@@ -81,6 +81,20 @@ public function customFixer__NoDoctrineMigrationsGeneratedCommentFixer()
     public function customFixer__NoPhpStormGeneratedCommentFixer() {}
 }
 
+/**
+ * class_definition
+ */
+class  ClassDefinition  extends  Bar  implements  Baz,  BarBaz  {}
+final  class  ClassDefinitionFinal  extends  Bar  implements  Baz,  BarBaz  {}
+trait  ClassDefinitionTrait  {}
+interface Bar extends
+    Bar, BarBaz, FooBarBaz {}
+$space_before_parenthesis = new class{};
+$inline_constructor_arguments= new class(
+    $bar,
+    $baz
+) {};
+
 class MyTest extends \PhpUnit\FrameWork\TestCase
 {
     /**

diff --git a/tests/Fixtures/Ruleset/relaxplus_expected.php b/tests/Fixtures/Ruleset/relaxplus_expected.php
@@ -75,6 +75,16 @@ public function customFixer__NoDoctrineMigrationsGeneratedCommentFixer()
     public function customFixer__NoPhpStormGeneratedCommentFixer() {}
 }
 
+/**
+ * class_definition
+ */
+class ClassDefinition extends Bar implements BarBaz, Baz {}
+final class ClassDefinitionFinal extends Bar implements BarBaz, Baz {}
+trait ClassDefinitionTrait {}
+interface Bar extends Bar, BarBaz, FooBarBaz {}
+$space_before_parenthesis = new class {};
+$inline_constructor_arguments = new class ($bar, $baz) {};
+
 class MyTest extends \PhpUnit\FrameWork\TestCase
 {
     /**